diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2001-06-24 22:32:23 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2001-06-24 22:32:23 +0000 |
| commit | dd993905403a0122fe1d0f3082704bae016e634b (patch) | |
| tree | 6f74db3afb2f8dc36944aedba7fe7ddfc145040b | |
| parent | 29ac9e95ac97a74bda68c5c0c2c3ae68ff2808d7 (diff) | |
| download | ATCD-dd993905403a0122fe1d0f3082704bae016e634b.tar.gz | |
ChangeLogTag: Sun Jun 24 17:26:17 2001 Balachandran Natarajan <bala@cs.wustl.edu>
| -rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 8 | ||||
| -rw-r--r-- | TAO/tao/default_resource.cpp | 26 |
2 files changed, 31 insertions, 3 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index 950fae615ba..35a43d9d9b4 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Sun Jun 24 17:26:17 2001 Balachandran Natarajan <bala@cs.wustl.edu> + + * tao/default_resource.cpp (init): Disabled the lock that is used + by the data_blocks during reference counting for single threaded + builds. This is now sort of hacked. We disable the lock if the + transport cache lock is disabled. The right way to do this would + be to revisit this when we fix bug #940. + Sun Jun 24 16:48:54 2001 Balachandran Natarajan <bala@cs.wustl.edu> * tao/ORB_Core.h: diff --git a/TAO/tao/default_resource.cpp b/TAO/tao/default_resource.cpp index de07700d0e8..521e6fc8218 100644 --- a/TAO/tao/default_resource.cpp +++ b/TAO/tao/default_resource.cpp @@ -26,6 +26,8 @@ ACE_RCSID(tao, default_resource, "$Id$") + + TAO_Default_Resource_Factory::TAO_Default_Resource_Factory (void) : use_tss_resources_ (0), use_locked_data_blocks_ (1), @@ -243,7 +245,13 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) this->cached_connection_lock_type_ = TAO_THREAD_LOCK; else if (ACE_OS::strcasecmp (name, "null") == 0) - this->cached_connection_lock_type_ = TAO_NULL_LOCK; + { + // @@ Bug 940 :This is a sort of hack now. We need to put + // this in a common place once we get teh common + // switch that is documented in bug 940... + this->use_locked_data_blocks_ = 0; + this->cached_connection_lock_type_ = TAO_NULL_LOCK; + } } } @@ -264,7 +272,13 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) this->cached_connection_lock_type_ = TAO_THREAD_LOCK; else if (ACE_OS::strcasecmp (name, "null") == 0) - this->cached_connection_lock_type_ = TAO_NULL_LOCK; + { + // @@ Bug 940 :This is a sort of hack now. We need to put + // this in a common place once we get teh common + // switch that is documented in bug 940... + this->use_locked_data_blocks_ = 0; + this->cached_connection_lock_type_ = TAO_NULL_LOCK; + } } } @@ -285,7 +299,13 @@ TAO_Default_Resource_Factory::init (int argc, char **argv) this->cached_connection_lock_type_ = TAO_THREAD_LOCK; else if (ACE_OS::strcasecmp (name, "null") == 0) - this->cached_connection_lock_type_ = TAO_NULL_LOCK; + { + // @@ Bug 940 :This is a sort of hack now. We need to put + // this in a common place once we get teh common + // switch that is documented in bug 940... + this->use_locked_data_blocks_ = 0; + this->cached_connection_lock_type_ = TAO_NULL_LOCK; + } } } |