diff options
author | oci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-12-20 22:00:33 +0000 |
---|---|---|
committer | oci <oci@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-12-20 22:00:33 +0000 |
commit | 74fd6f1f6308aa3e7e5b4d3c7450e5aa16db7e7e (patch) | |
tree | 6997deaedd1f3b6329af6e663be3d6d5eac91f3f | |
parent | 2cee5268c3065e12639a91737f5ae0230d9e15ed (diff) | |
download | ATCD-74fd6f1f6308aa3e7e5b4d3c7450e5aa16db7e7e.tar.gz |
Changelog tag Wed Dec 20 15:57:32 2000 Phil Mesnier <mesnier_p@ociweb.com>
-rw-r--r-- | ChangeLog | 23 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-02a | 23 | ||||
-rw-r--r-- | ChangeLogs/ChangeLog-03a | 23 | ||||
-rw-r--r-- | ace/RMCast/RMCast_IO_UDP.cpp | 39 | ||||
-rw-r--r-- | ace/RMCast/RMCast_IO_UDP.h | 4 | ||||
-rw-r--r-- | ace/RMCast/RMCast_IO_UDP.i | 12 | ||||
-rw-r--r-- | protocols/ace/RMCast/RMCast_IO_UDP.cpp | 39 | ||||
-rw-r--r-- | protocols/ace/RMCast/RMCast_IO_UDP.h | 4 | ||||
-rw-r--r-- | protocols/ace/RMCast/RMCast_IO_UDP.i | 12 |
9 files changed, 99 insertions, 80 deletions
diff --git a/ChangeLog b/ChangeLog index d732869078f..b839ca76a75 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Wed Dec 20 15:57:32 2000 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/RMCast/RMCast_IO_UDP.cpp + * ace/RMCast?RMCast_IO_UDP.h + * ace/RMCast/RMCast_IO_UDP.i : cleaned up tabs and trailing ws from + last submission... + Wed Dec 20 16:18:49 2000 Steve Huston <shuston@riverace.com> * examples/Reactor/Proactor/simple_test_proactor.cpp: Removed unused @@ -11,14 +18,14 @@ Wed Dec 20 16:18:49 2000 Steve Huston <shuston@riverace.com> Wed Dec 20 15:42:36 2000 Phil Mesnier <mesnier_p@ociweb.com> - * ace/RMCast/RMCast_IO_UDP.cpp - * ace/RMCast?RMCast_IO_UDP.h - * ace/RMCast/RMCast_IO_UDP.i : The g++ cross compiler 2.9-gnupro-98r2 - for target Lynx 3.0.1 host Solaris 2.6 was breaking with an internal - error at the end of handle_input(). Replacing a couple of lines of - code with the private, inline method allocate_and_bind_proxy() gets - around the problem. - + * ace/RMCast/RMCast_IO_UDP.cpp + * ace/RMCast?RMCast_IO_UDP.h + * ace/RMCast/RMCast_IO_UDP.i : The g++ cross compiler 2.9-gnupro-98r2 + for target Lynx 3.0.1 host Solaris 2.6 was breaking with an internal + error at the end of handle_input(). Replacing a couple of lines of + code with the private, inline method allocate_and_bind_proxy() gets + around the problem. + Wed Dec 20 15:32:44 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> * examples/Threads/wfmo.cpp: Move the function calls etc. out of diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index d732869078f..b839ca76a75 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,10 @@ +Wed Dec 20 15:57:32 2000 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/RMCast/RMCast_IO_UDP.cpp + * ace/RMCast?RMCast_IO_UDP.h + * ace/RMCast/RMCast_IO_UDP.i : cleaned up tabs and trailing ws from + last submission... + Wed Dec 20 16:18:49 2000 Steve Huston <shuston@riverace.com> * examples/Reactor/Proactor/simple_test_proactor.cpp: Removed unused @@ -11,14 +18,14 @@ Wed Dec 20 16:18:49 2000 Steve Huston <shuston@riverace.com> Wed Dec 20 15:42:36 2000 Phil Mesnier <mesnier_p@ociweb.com> - * ace/RMCast/RMCast_IO_UDP.cpp - * ace/RMCast?RMCast_IO_UDP.h - * ace/RMCast/RMCast_IO_UDP.i : The g++ cross compiler 2.9-gnupro-98r2 - for target Lynx 3.0.1 host Solaris 2.6 was breaking with an internal - error at the end of handle_input(). Replacing a couple of lines of - code with the private, inline method allocate_and_bind_proxy() gets - around the problem. - + * ace/RMCast/RMCast_IO_UDP.cpp + * ace/RMCast?RMCast_IO_UDP.h + * ace/RMCast/RMCast_IO_UDP.i : The g++ cross compiler 2.9-gnupro-98r2 + for target Lynx 3.0.1 host Solaris 2.6 was breaking with an internal + error at the end of handle_input(). Replacing a couple of lines of + code with the private, inline method allocate_and_bind_proxy() gets + around the problem. + Wed Dec 20 15:32:44 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> * examples/Threads/wfmo.cpp: Move the function calls etc. out of diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index d732869078f..b839ca76a75 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,10 @@ +Wed Dec 20 15:57:32 2000 Phil Mesnier <mesnier_p@ociweb.com> + + * ace/RMCast/RMCast_IO_UDP.cpp + * ace/RMCast?RMCast_IO_UDP.h + * ace/RMCast/RMCast_IO_UDP.i : cleaned up tabs and trailing ws from + last submission... + Wed Dec 20 16:18:49 2000 Steve Huston <shuston@riverace.com> * examples/Reactor/Proactor/simple_test_proactor.cpp: Removed unused @@ -11,14 +18,14 @@ Wed Dec 20 16:18:49 2000 Steve Huston <shuston@riverace.com> Wed Dec 20 15:42:36 2000 Phil Mesnier <mesnier_p@ociweb.com> - * ace/RMCast/RMCast_IO_UDP.cpp - * ace/RMCast?RMCast_IO_UDP.h - * ace/RMCast/RMCast_IO_UDP.i : The g++ cross compiler 2.9-gnupro-98r2 - for target Lynx 3.0.1 host Solaris 2.6 was breaking with an internal - error at the end of handle_input(). Replacing a couple of lines of - code with the private, inline method allocate_and_bind_proxy() gets - around the problem. - + * ace/RMCast/RMCast_IO_UDP.cpp + * ace/RMCast?RMCast_IO_UDP.h + * ace/RMCast/RMCast_IO_UDP.i : The g++ cross compiler 2.9-gnupro-98r2 + for target Lynx 3.0.1 host Solaris 2.6 was breaking with an internal + error at the end of handle_input(). Replacing a couple of lines of + code with the private, inline method allocate_and_bind_proxy() gets + around the problem. + Wed Dec 20 15:32:44 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu> * examples/Threads/wfmo.cpp: Move the function calls etc. out of diff --git a/ace/RMCast/RMCast_IO_UDP.cpp b/ace/RMCast/RMCast_IO_UDP.cpp index e01e9b07cbd..1a2f00c1eca 100644 --- a/ace/RMCast/RMCast_IO_UDP.cpp +++ b/ace/RMCast/RMCast_IO_UDP.cpp @@ -140,26 +140,24 @@ ACE_RMCast_IO_UDP::handle_input (ACE_HANDLE) #if 0 if (type == ACE_RMCast::MT_ACK - || type == ACE_RMCast::MT_JOIN - || type == ACE_RMCast::MT_LEAVE - || type == ACE_RMCast::MT_ACK_LEAVE) - { - // All these message types indicate a problem, the should be - // generated by receivers, not received by them. - return 0; - } + || type == ACE_RMCast::MT_JOIN + || type == ACE_RMCast::MT_LEAVE + || type == ACE_RMCast::MT_ACK_LEAVE) + { + // All these message types indicate a problem, the should be + // generated by receivers, not received by them. + return 0; + } #endif /* 0 */ - ACE_RMCast_Module *module = this->factory_->create (); if (module == 0) - { - // @@ LOG?? - // Try to continue working, maybe the module can be created - // later. - return 0; - } - - // This is necessary to satisfy the stupid xgcc for Lynx on Solaris + { + // @@ LOG?? + // Try to continue working, maybe the module can be created + // later. + return 0; + } + // This is necessary to satisfy the xgcc for Lynx on Solaris // by including the code directly causes : // RMCast_IO_UDP.cpp:202: error: internal error--unrecognizable insn: // (insn 1510 1507 524 (set (mem:SI (plus:SI (reg:SI 28 r28) @@ -169,10 +167,9 @@ ACE_RMCast_IO_UDP::handle_input (ACE_HANDLE) // /usr/lynx/home2/jose/98r2/src/gcc/toplev.c:1489: Internal compiler error in function fatal_insn // to be thrown at the end of the function. if ((proxy = allocate_and_bind_proxy(module,from_address)) == 0) - return 0; - - } - + return 0; + } + // Have the proxy process the message and do the right thing. if (proxy->receive_message (buffer, r) != 0) { diff --git a/ace/RMCast/RMCast_IO_UDP.h b/ace/RMCast/RMCast_IO_UDP.h index 2748a4d3050..7b9d2440517 100644 --- a/ace/RMCast/RMCast_IO_UDP.h +++ b/ace/RMCast/RMCast_IO_UDP.h @@ -110,8 +110,10 @@ public: private: + // This is necessary to satisfy the stupid xgcc for Lynx on Solaris + // The compiler barfs up lisp code errors ACE_RMCast_UDP_Proxy *allocate_and_bind_proxy (ACE_RMCast_Module *module, - const ACE_INET_Addr &); + const ACE_INET_Addr &); //! The factory used to create the modules attached to each proxy ACE_RMCast_Module_Factory *factory_; diff --git a/ace/RMCast/RMCast_IO_UDP.i b/ace/RMCast/RMCast_IO_UDP.i index c39a203e994..99c1524d3a6 100644 --- a/ace/RMCast/RMCast_IO_UDP.i +++ b/ace/RMCast/RMCast_IO_UDP.i @@ -15,21 +15,21 @@ ACE_RMCast_IO_UDP:: // see ACE_RMCast_IO_UDP::handle_input() for more details ACE_INLINE ACE_RMCast_UDP_Proxy * ACE_RMCast_IO_UDP::allocate_and_bind_proxy (ACE_RMCast_Module *module, - const ACE_INET_Addr& from_address) + const ACE_INET_Addr& from_address) { ACE_RMCast_UDP_Proxy *proxy; ACE_NEW_RETURN (proxy, - ACE_RMCast_UDP_Proxy(this, - from_address), - 0); + ACE_RMCast_UDP_Proxy(this, + from_address), + 0); proxy->next (module); - + if (this->map_.bind (from_address, proxy) != 0) { // @@ LOG?? return 0; } - + return proxy; } diff --git a/protocols/ace/RMCast/RMCast_IO_UDP.cpp b/protocols/ace/RMCast/RMCast_IO_UDP.cpp index e01e9b07cbd..1a2f00c1eca 100644 --- a/protocols/ace/RMCast/RMCast_IO_UDP.cpp +++ b/protocols/ace/RMCast/RMCast_IO_UDP.cpp @@ -140,26 +140,24 @@ ACE_RMCast_IO_UDP::handle_input (ACE_HANDLE) #if 0 if (type == ACE_RMCast::MT_ACK - || type == ACE_RMCast::MT_JOIN - || type == ACE_RMCast::MT_LEAVE - || type == ACE_RMCast::MT_ACK_LEAVE) - { - // All these message types indicate a problem, the should be - // generated by receivers, not received by them. - return 0; - } + || type == ACE_RMCast::MT_JOIN + || type == ACE_RMCast::MT_LEAVE + || type == ACE_RMCast::MT_ACK_LEAVE) + { + // All these message types indicate a problem, the should be + // generated by receivers, not received by them. + return 0; + } #endif /* 0 */ - ACE_RMCast_Module *module = this->factory_->create (); if (module == 0) - { - // @@ LOG?? - // Try to continue working, maybe the module can be created - // later. - return 0; - } - - // This is necessary to satisfy the stupid xgcc for Lynx on Solaris + { + // @@ LOG?? + // Try to continue working, maybe the module can be created + // later. + return 0; + } + // This is necessary to satisfy the xgcc for Lynx on Solaris // by including the code directly causes : // RMCast_IO_UDP.cpp:202: error: internal error--unrecognizable insn: // (insn 1510 1507 524 (set (mem:SI (plus:SI (reg:SI 28 r28) @@ -169,10 +167,9 @@ ACE_RMCast_IO_UDP::handle_input (ACE_HANDLE) // /usr/lynx/home2/jose/98r2/src/gcc/toplev.c:1489: Internal compiler error in function fatal_insn // to be thrown at the end of the function. if ((proxy = allocate_and_bind_proxy(module,from_address)) == 0) - return 0; - - } - + return 0; + } + // Have the proxy process the message and do the right thing. if (proxy->receive_message (buffer, r) != 0) { diff --git a/protocols/ace/RMCast/RMCast_IO_UDP.h b/protocols/ace/RMCast/RMCast_IO_UDP.h index 2748a4d3050..7b9d2440517 100644 --- a/protocols/ace/RMCast/RMCast_IO_UDP.h +++ b/protocols/ace/RMCast/RMCast_IO_UDP.h @@ -110,8 +110,10 @@ public: private: + // This is necessary to satisfy the stupid xgcc for Lynx on Solaris + // The compiler barfs up lisp code errors ACE_RMCast_UDP_Proxy *allocate_and_bind_proxy (ACE_RMCast_Module *module, - const ACE_INET_Addr &); + const ACE_INET_Addr &); //! The factory used to create the modules attached to each proxy ACE_RMCast_Module_Factory *factory_; diff --git a/protocols/ace/RMCast/RMCast_IO_UDP.i b/protocols/ace/RMCast/RMCast_IO_UDP.i index c39a203e994..99c1524d3a6 100644 --- a/protocols/ace/RMCast/RMCast_IO_UDP.i +++ b/protocols/ace/RMCast/RMCast_IO_UDP.i @@ -15,21 +15,21 @@ ACE_RMCast_IO_UDP:: // see ACE_RMCast_IO_UDP::handle_input() for more details ACE_INLINE ACE_RMCast_UDP_Proxy * ACE_RMCast_IO_UDP::allocate_and_bind_proxy (ACE_RMCast_Module *module, - const ACE_INET_Addr& from_address) + const ACE_INET_Addr& from_address) { ACE_RMCast_UDP_Proxy *proxy; ACE_NEW_RETURN (proxy, - ACE_RMCast_UDP_Proxy(this, - from_address), - 0); + ACE_RMCast_UDP_Proxy(this, + from_address), + 0); proxy->next (module); - + if (this->map_.bind (from_address, proxy) != 0) { // @@ LOG?? return 0; } - + return proxy; } |