diff options
-rw-r--r-- | ChangeLog | 11 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-02a | 11 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-03a | 11 | ||||
-rw-r--r-- | tests/Proactor_Test.cpp | 8 | ||||
-rw-r--r-- | tests/TP_Reactor_Test.cpp | 6 |
5 files changed, 43 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 53035c3b765..7e7dfb5c4b3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Tue May 14 19:14:11 2002 Priyanka Gontla <pgontla@ece.uci.edu> + + * tests/TP_Reactor_Test.cpp (Connector): + Fixed the warnings by removing the check condition + 'size_t index_ >= 0' which is always going to be true. + + * tests/Proactor_Test.cpp: + Integrated the changes sent by Alex Libman + <AlexL@rumblegroup.com>to fix the test on + linux and other platforms that has a weak AIO implementation. + Mon May 13 16:43:34 2002 Krishnakumar B <kitty@cs.wustl.edu> * ACEXML/parser/parser/Parser.cpp (parse_xml_prolog): diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 53035c3b765..7e7dfb5c4b3 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,14 @@ +Tue May 14 19:14:11 2002 Priyanka Gontla <pgontla@ece.uci.edu> + + * tests/TP_Reactor_Test.cpp (Connector): + Fixed the warnings by removing the check condition + 'size_t index_ >= 0' which is always going to be true. + + * tests/Proactor_Test.cpp: + Integrated the changes sent by Alex Libman + <AlexL@rumblegroup.com>to fix the test on + linux and other platforms that has a weak AIO implementation. + Mon May 13 16:43:34 2002 Krishnakumar B <kitty@cs.wustl.edu> * ACEXML/parser/parser/Parser.cpp (parse_xml_prolog): diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 53035c3b765..7e7dfb5c4b3 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,14 @@ +Tue May 14 19:14:11 2002 Priyanka Gontla <pgontla@ece.uci.edu> + + * tests/TP_Reactor_Test.cpp (Connector): + Fixed the warnings by removing the check condition + 'size_t index_ >= 0' which is always going to be true. + + * tests/Proactor_Test.cpp: + Integrated the changes sent by Alex Libman + <AlexL@rumblegroup.com>to fix the test on + linux and other platforms that has a weak AIO implementation. + Mon May 13 16:43:34 2002 Krishnakumar B <kitty@cs.wustl.edu> * ACEXML/parser/parser/Parser.cpp (parse_xml_prolog): diff --git a/tests/Proactor_Test.cpp b/tests/Proactor_Test.cpp index 6ca4ce243c5..e8ec1e49567 100644 --- a/tests/Proactor_Test.cpp +++ b/tests/Proactor_Test.cpp @@ -1599,7 +1599,15 @@ parse_args (int argc, ACE_TCHAR *argv[]) proactor_type = DEFAULT; // Proactor type = default #endif threads = 3; // size of Proactor thread pool + +#if defined(__sgi) || defined (ACE_LINUX_COMMON_H) + ACE_DEBUG (( LM_DEBUG, + "Weak AIO implementation, test will work with 1 client")); + senders = 1; // number of senders +#else senders = 20; // number of senders +#endif + loglevel = 1; // log level : 0 full/ 1 only errors seconds = 20; // time to run in seconds return 0; diff --git a/tests/TP_Reactor_Test.cpp b/tests/TP_Reactor_Test.cpp index cbea833a088..ab0e355edb3 100644 --- a/tests/TP_Reactor_Test.cpp +++ b/tests/TP_Reactor_Test.cpp @@ -313,8 +313,7 @@ Acceptor::on_delete_receiver (Receiver &rcvr) this->total_w_ += rcvr.get_total_w (); this->total_r_ += rcvr.get_total_r (); - if (rcvr.index_ >= 0 - && rcvr.index_ < MAX_RECEIVERS + if (rcvr.index_ < MAX_RECEIVERS && this->list_receivers_[rcvr.index_] == &rcvr) this->list_receivers_[rcvr.index_] = 0; @@ -674,8 +673,7 @@ Connector::on_delete_sender (Sender & sndr) this->total_w_ += sndr.get_total_w(); this->total_r_ += sndr.get_total_r(); - if (sndr.index_ >= 0 - && sndr.index_ < MAX_SENDERS + if (sndr.index_ < MAX_SENDERS && this->list_senders_[sndr.index_] == &sndr) this->list_senders_[sndr.index_] = 0; |