diff options
| -rw-r--r-- | ChangeLog-97a | 7 | ||||
| -rw-r--r-- | ace/Future.h | 20 | ||||
| -rw-r--r-- | ace/Reactor.cpp | 1 | ||||
| -rw-r--r-- | ace/Thread_Manager.cpp | 2 | ||||
| -rw-r--r-- | ace/Thread_Manager.h | 5 | ||||
| -rw-r--r-- | apps/Gateway/Gateway/Gateway.cpp | 8 |
6 files changed, 31 insertions, 12 deletions
diff --git a/ChangeLog-97a b/ChangeLog-97a index 3af77234ad5..49947a7ddd8 100644 --- a/ChangeLog-97a +++ b/ChangeLog-97a @@ -30,6 +30,13 @@ Tue Jan 21 09:19:44 1997 David L. Levine <levine@cs.wustl.edu> * tests/Thread_Pool_Test.cpp (open): added return 0 at end. +Tue Jan 21 11:00:12 1997 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu> + + * apps/Gateway/Gateway/Gateway.cpp (parse_args): There was a small + bug in parse_args (latest beta), it mixed proxy and consumer + conf files. Thanks to Per Andersson + <Per.Andersson@hfera.ericsson.se> for reporting this. + Mon Jan 20 13:29:28 1997 David L. Levine <levine@cs.wustl.edu> * ace/OS.i, ace/Task.h, and ace/Thread_Manager.h: changed a few diff --git a/ace/Future.h b/ace/Future.h index 1d0a13e057d..a296a91c632 100644 --- a/ace/Future.h +++ b/ace/Future.h @@ -47,9 +47,14 @@ private: int get (T &value, ACE_Time_Value *tv); // Wait up to <tv> time to get the <value>. - operator T(); - // Type conversion. will block forever until the - // result is available. + operator T (); + // Type conversion. will block forever until the result is + // available. Note that this method is going away in a subsequent + // release since it doesn't distinguish between failure results and + // success results (exceptions should be used, but they aren't + // portable...). The <get> method should be used instead since it + // separates the error value from the result, and also permits + // timeouts. void dump (void) const; // Dump the state of an object. @@ -123,8 +128,13 @@ public: // Wait up to <tv> time to get the <value>. operator T (); - // type conversion. obtain the result of the asynchronous method - // invocation. will block forever. + // Type conversion, which obtains the result of the asynchronous + // method invocation. Will block forever. Note that this method is + // going away in a subsequent release since it doesn't distinguish + // between failure results and success results (exceptions should be + // used, but they aren't portable...). The <get> method should be + // used instead since it separates the error value from the result, + // and also permits timeouts. int ready (void); // Check if the result is available. diff --git a/ace/Reactor.cpp b/ace/Reactor.cpp index e4ba0046a38..0a6c982c99d 100644 --- a/ace/Reactor.cpp +++ b/ace/Reactor.cpp @@ -1433,6 +1433,7 @@ ACE_Reactor::handle_events (ACE_Time_Value *max_wait_time) #if defined (ACE_MT_SAFE) ACE_GUARD_RETURN (ACE_REACTOR_MUTEX, ace_mon, this->token_, -1); + if (ACE_OS::thr_equal (ACE_Thread::self (), this->owner_) == 0) return -1; diff --git a/ace/Thread_Manager.cpp b/ace/Thread_Manager.cpp index 71b0198cda2..39ceaa773e3 100644 --- a/ace/Thread_Manager.cpp +++ b/ace/Thread_Manager.cpp @@ -730,7 +730,7 @@ ACE_Thread_Manager::wait (const ACE_Time_Value *timeout) if (this->zero_cond_.wait (timeout) == -1) return -1; #else - timeout = timeout; + ACE_UNUSED_ARG (timeout); #endif /* ACE_HAS_THREADS */ return 0; diff --git a/ace/Thread_Manager.h b/ace/Thread_Manager.h index 6202bbd4ccc..701115dbb9e 100644 --- a/ace/Thread_Manager.h +++ b/ace/Thread_Manager.h @@ -145,8 +145,9 @@ public: int wait (const ACE_Time_Value *timeout = 0); // Block until there are no more threads running in the - // <Thread_Manager> or <timeout> expires. Returns 0 on success and - // -1 on failure. + // <Thread_Manager> or <timeout> expires. Note that <timeout> is + // treated as "absolute" time. Returns 0 on success and -1 on + // failure. // = Accessors for ACE_Thread_Descriptors. int thread_descriptor (ACE_thread_t, ACE_Thread_Descriptor &); diff --git a/apps/Gateway/Gateway/Gateway.cpp b/apps/Gateway/Gateway/Gateway.cpp index fd4524036f4..f9d505a5733 100644 --- a/apps/Gateway/Gateway/Gateway.cpp +++ b/apps/Gateway/Gateway/Gateway.cpp @@ -112,9 +112,9 @@ Gateway::parse_args (int argc, char *argv[]) this->event_channel_.options ().blocking_semantics_ = 0; break; case 'C': // Use a different proxy config filename. - ACE_OS::strncpy (this->proxy_config_file_, + ACE_OS::strncpy (this->consumer_config_file_, get_opt.optarg, - sizeof this->proxy_config_file_); + sizeof this->consumer_config_file_); break; case 'c': // We are (also?) playing the Connector role. this->event_channel_.options ().connector_role_ = 1; @@ -123,9 +123,9 @@ Gateway::parse_args (int argc, char *argv[]) this->debug_ = 1; break; case 'P': // Use a different consumer config filename. - ACE_OS::strncpy (this->consumer_config_file_, + ACE_OS::strncpy (this->proxy_config_file_, get_opt.optarg, - sizeof this->consumer_config_file_); + sizeof this->proxy_config_file_); break; case 'p': // Use a different acceptor port. this->event_channel_.options ().acceptor_port_ = |