diff options
author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2001-09-11 01:54:48 +0000 |
---|---|---|
committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2001-09-11 01:54:48 +0000 |
commit | 24662bcab45cdff410c7082c5c8247b67df5c9f5 (patch) | |
tree | 788b8b21ee0c13cb07e57a1ad2fef646db00b55e | |
parent | 0fd2bdc23d5a69c00d914d92bacfaec83bb509c9 (diff) | |
download | ATCD-24662bcab45cdff410c7082c5c8247b67df5c9f5.tar.gz |
ChangeLogTag:Mon Sep 10 18:59:24 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu>
-rw-r--r-- | ChangeLog | 8 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-01a | 2 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-02a | 8 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-03a | 8 | ||||
-rw-r--r-- | TAO/examples/Simple/fullname/README | 2 | ||||
-rw-r--r-- | THANKS | 1 | ||||
-rw-r--r-- | apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp | 27 | ||||
-rw-r--r-- | apps/Gateway/Peer/Peer.cpp | 12 | ||||
-rw-r--r-- | examples/ASX/Event_Server/Transceiver/transceiver.cpp | 1 |
9 files changed, 49 insertions, 20 deletions
diff --git a/ChangeLog b/ChangeLog index 8359fd4faad..a0c7fec298f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +Mon Sep 10 18:59:24 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * apps/Gateway/Peer/Peer.cpp (nonblk_put): + * apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp (nonblk_put): + Reverted Bala's changes below since the original code was + correct. Also, added comments to clarify things to prevent + confusion in the future. + Mon Sep 10 17:31:11 2001 Balachandran Natarajan <bala@cs.wustl.edu> * ACE-INSTALL.html: Added a new platform to the list. diff --git a/ChangeLogs/ChangeLog-01a b/ChangeLogs/ChangeLog-01a index c3d0232492f..a9f48028148 100644 --- a/ChangeLogs/ChangeLog-01a +++ b/ChangeLogs/ChangeLog-01a @@ -1054,7 +1054,7 @@ Sat Jun 2 13:05:20 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu> accept() fails. A check is done to make sure address reuse is set. So this fix will only work in case where it is set. Thanks to Dominic Hughes <dominic@aersoft.ie> for this fix and to Irfan - for recognizing that it ought to be added to ACE_Accpt_Strategy. + for recognizing that it ought to be added to ACE_Accept_Strategy. * ace/Strategies_T.cpp (open): Fixed the strategy acceptor so that it uses non-blocking semantics to handle certain failure cases diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 8359fd4faad..a0c7fec298f 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,11 @@ +Mon Sep 10 18:59:24 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * apps/Gateway/Peer/Peer.cpp (nonblk_put): + * apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp (nonblk_put): + Reverted Bala's changes below since the original code was + correct. Also, added comments to clarify things to prevent + confusion in the future. + Mon Sep 10 17:31:11 2001 Balachandran Natarajan <bala@cs.wustl.edu> * ACE-INSTALL.html: Added a new platform to the list. diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 8359fd4faad..a0c7fec298f 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,11 @@ +Mon Sep 10 18:59:24 2001 Douglas C. Schmidt <schmidt@macarena.cs.wustl.edu> + + * apps/Gateway/Peer/Peer.cpp (nonblk_put): + * apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp (nonblk_put): + Reverted Bala's changes below since the original code was + correct. Also, added comments to clarify things to prevent + confusion in the future. + Mon Sep 10 17:31:11 2001 Balachandran Natarajan <bala@cs.wustl.edu> * ACE-INSTALL.html: Added a new platform to the list. diff --git a/TAO/examples/Simple/fullname/README b/TAO/examples/Simple/fullname/README index cb43bbcbda1..ec922a86286 100644 --- a/TAO/examples/Simple/fullname/README +++ b/TAO/examples/Simple/fullname/README @@ -1,3 +1,3 @@ This is a simple example that would take the first name and the last name of a person and return the full name of the individual through -the "out" argument in the operation signature of the IDL.
\ No newline at end of file +the "out" argument in the operation signature of the IDL. @@ -1325,6 +1325,7 @@ Daniel Manfis <dany_100@yahoo.com> Massimo Pichini <massimo@webbridges.it> Eyal Neuman <eyal@tradertools.com> Peter Phillips <pphillip@opentext.com> +Dave Hale <d.hale@rane.net> I would particularly like to thank Paul Stephenson, who worked with me at Ericsson in the early 1990's. Paul devised the recursive Makefile diff --git a/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp b/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp index 26a794c9902..826a7331f05 100644 --- a/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp +++ b/apps/Gateway/Gateway/Concrete_Connection_Handlers.cpp @@ -70,9 +70,20 @@ Consumer_Handler::nonblk_put (ACE_Message_Block *event) ssize_t n = this->send (event); - - if (n == -1 && errno == EWOULDBLOCK) // Didn't manage to send everything. + if (n == -1) { + // -1 is returned only when things have really gone wrong (i.e., + // not when flow control occurs). Thus, let's try to close down + // and set up a new reconnection by calling handle_close(). + this->state (Connection_Handler::FAILED); + this->handle_close (); + return -1; + } + eise if (errno == EWOULDBLOCK) + { + // We didn't manage to send everything, so we need to queue + // things up. + ACE_DEBUG ((LM_DEBUG, "(%t) queueing activated on handle %d to routing id %d\n", this->get_handle (), @@ -95,16 +106,8 @@ Consumer_Handler::nonblk_put (ACE_Message_Block *event) -1); return 0; } - else if (n == -1) - { - // Things have gone wrong, let's try to close down and set up a - // new reconnection by calling handle_close(). - this->state (Connection_Handler::FAILED); - this->handle_close (); - return -1; - } - - return n; + else + return n; } ssize_t diff --git a/apps/Gateway/Peer/Peer.cpp b/apps/Gateway/Peer/Peer.cpp index 6f6bc8f9f4f..1198e4b15a7 100644 --- a/apps/Gateway/Peer/Peer.cpp +++ b/apps/Gateway/Peer/Peer.cpp @@ -185,7 +185,11 @@ Peer_Handler::nonblk_put (ACE_Message_Block *mb) ssize_t n = this->send (mb); - if (n == -1 && errno == EWOULDBLOCK) + if (n == -1) + // -1 is returned only when things have really gone wrong (i.e., + // not when flow control occurs). + return -1; + else if (errno == EWOULDBLOCK) { // We didn't manage to send everything, so requeue. ACE_DEBUG ((LM_DEBUG, @@ -210,10 +214,8 @@ Peer_Handler::nonblk_put (ACE_Message_Block *mb) -1); return 0; } - else if (n == -1) - return -1; - - return n; + else + return n; } // Finish sending a event when flow control conditions abate. This diff --git a/examples/ASX/Event_Server/Transceiver/transceiver.cpp b/examples/ASX/Event_Server/Transceiver/transceiver.cpp index d2d753f4b18..b9c1f7ab33c 100644 --- a/examples/ASX/Event_Server/Transceiver/transceiver.cpp +++ b/examples/ASX/Event_Server/Transceiver/transceiver.cpp @@ -13,7 +13,6 @@ ACE_RCSID(Transceiver, transceiver, "$Id$") - // Handle the command-line arguments. int |