summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaga <naga@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-31 20:25:57 +0000
committernaga <naga@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-31 20:25:57 +0000
commit586b3ed1257ace406cebc9543849754256f1be84 (patch)
tree7d55a06a891af636c093eea639e250314f4a6389
parentad3bb50890827d4bba7b224ddec2fe753afb5228 (diff)
downloadATCD-586b3ed1257ace406cebc9543849754256f1be84.tar.gz
Made sure that we add signal_occurred to indicate that the handle_signal
before returning from dispatch (..).
-rw-r--r--ace/Select_Reactor_T.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/ace/Select_Reactor_T.cpp b/ace/Select_Reactor_T.cpp
index 639598c191c..722098e8923 100644
--- a/ace/Select_Reactor_T.cpp
+++ b/ace/Select_Reactor_T.cpp
@@ -1031,7 +1031,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dispatch
int io_handlers_dispatched = 0;
int other_handlers_dispatched = 0;
-
+ int signal_occurred = 0;
// The following do/while loop keeps dispatching as long as there
// are still active handles. Note that the only way we should ever
// iterate more than once through this loop is if signals occur
@@ -1055,8 +1055,6 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dispatch
// Perform the Template Method for dispatching all the handlers.
- int signal_occurred = 0;
-
// First check for interrupts.
if (active_handle_count == -1)
{
@@ -1113,7 +1111,7 @@ ACE_Select_Reactor_T<ACE_SELECT_REACTOR_TOKEN>::dispatch
}
while (active_handle_count > 0);
- return io_handlers_dispatched + other_handlers_dispatched;
+ return io_handlers_dispatched + other_handlers_dispatched+signal_occurred;
}
template <class ACE_SELECT_REACTOR_TOKEN> int