diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2005-12-13 17:03:20 +0000 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2005-12-13 17:03:20 +0000 |
| commit | 60858a33bbce82f8af38fa70d26fc46d771aece4 (patch) | |
| tree | ccd38b1dd37803de6dffbf889053fe894db62188 /cppe/src/IceE/Instance.cpp | |
| parent | Added replica group tests (diff) | |
| download | ice-60858a33bbce82f8af38fa70d26fc46d771aece4.tar.bz2 ice-60858a33bbce82f8af38fa70d26fc46d771aece4.tar.xz ice-60858a33bbce82f8af38fa70d26fc46d771aece4.zip | |
Removed sync from Outgoing for blocking sends
Diffstat (limited to 'cppe/src/IceE/Instance.cpp')
| -rw-r--r-- | cppe/src/IceE/Instance.cpp | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/cppe/src/IceE/Instance.cpp b/cppe/src/IceE/Instance.cpp index 0f3f59a89a2..c30b41df662 100644 --- a/cppe/src/IceE/Instance.cpp +++ b/cppe/src/IceE/Instance.cpp @@ -202,20 +202,14 @@ IceInternal::Instance::objectAdapterFactory() const } #endif -#if defined(ICEE_BLOCKING_CLIENT) && !defined(ICEE_PURE_BLOCKING_CLIENT) -bool -IceInternal::Instance::blocking() const -{ - return _blocking; -} -#endif - +#ifndef ICEE_PURE_BLOCKING_CLIENT size_t IceInternal::Instance::threadPerConnectionStackSize() const { // No mutex lock, immutable. return _threadPerConnectionStackSize; } +#endif EndpointFactoryPtr IceInternal::Instance::endpointFactory() const @@ -298,10 +292,9 @@ IceInternal::Instance::getDefaultContext() const IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const PropertiesPtr& properties) : _state(StateActive), _properties(properties), - _messageSizeMax(0), - _threadPerConnectionStackSize(0) -#if defined(ICEE_BLOCKING_CLIENT) && !defined(ICEE_PURE_BLOCKING_CLIENT) - , _blocking(false) + _messageSizeMax(0) +#ifndef ICEE_PURE_BLOCKING_CLIENT + , _threadPerConnectionStackSize(0) #endif { try @@ -450,10 +443,6 @@ IceInternal::Instance::Instance(const CommunicatorPtr& communicator, const Prope } #ifndef ICEE_PURE_BLOCKING_CLIENT -# ifdef ICEE_BLOCKING_CLIENT - const_cast<bool&>(_blocking) = _properties->getPropertyAsInt("Ice.Blocking") > 0; -# endif - { Int stackSize = _properties->getPropertyAsInt("Ice.ThreadPerConnection.StackSize"); if(stackSize < 0) |