diff options
Diffstat (limited to 'TAO')
| -rw-r--r-- | TAO/ChangeLog | 12 | ||||
| -rw-r--r-- | TAO/tao/Connection_Handler.cpp | 5 | ||||
| -rw-r--r-- | TAO/tao/Resume_Handle.cpp | 47 | ||||
| -rw-r--r-- | TAO/tao/Resume_Handle.h | 6 |
4 files changed, 70 insertions, 0 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 35828ea2731..9fdc0780451 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,15 @@ +Tue Apr 11 16:26:47 UTC 2006 Wallace Zhang <zhangw@ociweb.com> + + * tao/Connection_Handler.cpp: + * tao/Resume_Handle.h: + * tao/Resume_Handle.cpp: + + Reapply the fix a week ago with a correction. + Before, I mistakenly put a new operation into a + wrong place. It should be in the right place now. + Thanks to Frank Rehberger for correcting this. + Mon Mar 27 18:55:51 UTC 2006 Wallace Zhang <zhangw@ociweb.com> + Tue Apr 11 13:13:27 UTC 2006 Simon McQueen <sm@prismtech.com> * tao/Utils/Servant_Var.h: diff --git a/TAO/tao/Connection_Handler.cpp b/TAO/tao/Connection_Handler.cpp index 82452d015f5..2da87ae7413 100644 --- a/TAO/tao/Connection_Handler.cpp +++ b/TAO/tao/Connection_Handler.cpp @@ -203,6 +203,7 @@ TAO_Connection_Handler::handle_output_eh ( return_value = this->transport ()->handle_output (); this->pos_io_hook (return_value); + if (return_value != 0) { resume_handle.set_flag (TAO_Resume_Handle::TAO_HANDLE_LEAVE_SUSPENDED); @@ -273,6 +274,10 @@ TAO_Connection_Handler::handle_input_internal ( this->pos_io_hook (return_value); + // Bug 1647; might need to change resume_handle's flag or + // change handle_input return value. + resume_handle.handle_input_return_value_hook(return_value); + if (TAO_debug_level > 6) { ACE_HANDLE handle = eh->get_handle (); diff --git a/TAO/tao/Resume_Handle.cpp b/TAO/tao/Resume_Handle.cpp index 6d86cf027e1..6ce7297a70f 100644 --- a/TAO/tao/Resume_Handle.cpp +++ b/TAO/tao/Resume_Handle.cpp @@ -1,5 +1,6 @@ #include "tao/Resume_Handle.h" #include "tao/ORB_Core.h" +#include "debug.h" #include "ace/Reactor.h" @@ -31,4 +32,50 @@ TAO_Resume_Handle::resume_handle (void) this->flag_ = TAO_HANDLE_ALREADY_RESUMED; } +void +TAO_Resume_Handle::handle_input_return_value_hook (int& return_value) +{ + // RT8248: The return value is only changed from 1 to 0 if: + // 1) the handle_input return value wants an immediate callback + // on the handle (i.e. will return "1") + // 2) this->resume_handle was already called + // 3) reactor->resume_handler was called by this->resume_handle + // The value is changed because you can't ask for an immediate callback + // on a handle that you have already given up ownership of. (RT8248) + if ( return_value == 1 && + this->flag_ == TAO_HANDLE_ALREADY_RESUMED && + this->orb_core_ && + this->orb_core_->reactor ()->resumable_handler () && + this->handle_ != ACE_INVALID_HANDLE) + { + // a return value of "1" means "call me back immediately; + // but we can't "call me back immediately" on an + // already-resumed handle + return_value = 0; + + if (TAO_debug_level > 6) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - Resume_Handle::handle_input_return_value_hook, " + "overriding return value of 1 with retval = %d\n", + return_value)); + } + } + else if ( return_value == -1 ) + { + // this covers the "connection close" case, where you want + // to leave the handle suspended if you're return -1 to + // remove the handle from the Reactor. (See ChangeLog entry + // Fri Dec 16 14:40:54 2005) + this->flag_ = TAO_HANDLE_LEAVE_SUSPENDED; + + if (TAO_debug_level > 6) + { + ACE_DEBUG ((LM_DEBUG, + "TAO (%P|%t) - Resume_Handle::handle_input_return_value_hook, " + "handle_input returning -1, so handle is not resumed.\n")); + } + } +} + TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/tao/Resume_Handle.h b/TAO/tao/Resume_Handle.h index d028c4108f0..9fd1f4949e9 100644 --- a/TAO/tao/Resume_Handle.h +++ b/TAO/tao/Resume_Handle.h @@ -73,6 +73,12 @@ public: /// reactor. Else we don't resume the handle. void resume_handle (void); + // Hook method called at the end of a connection handler's + // handle_input function. Might override the handle_input + // return value or change the resume_handler's flag_ value. + void handle_input_return_value_hook (int& return_value); + + private: /// Our ORB Core. |