summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschmidt <douglascraigschmidt@users.noreply.github.com>1998-06-21 01:02:25 +0000
committerschmidt <douglascraigschmidt@users.noreply.github.com>1998-06-21 01:02:25 +0000
commitccd25fefe4bac76684b583faa121bfaeab0dfdfe (patch)
tree229bd5a1d81106f9b07c7f7c4bab2a21eff904fa
parent7a9132cb59255b380d1fca6e320a5a3995451d35 (diff)
downloadATCD-ccd25fefe4bac76684b583faa121bfaeab0dfdfe.tar.gz
*** empty log message ***
-rw-r--r--ChangeLog-98b9
-rw-r--r--README2
-rw-r--r--ace/Reactor_Impl.h6
-rw-r--r--ace/Select_Reactor.cpp4
-rw-r--r--ace/Select_Reactor.h7
5 files changed, 20 insertions, 8 deletions
diff --git a/ChangeLog-98b b/ChangeLog-98b
index bdc14cb1f45..d0612007c8e 100644
--- a/ChangeLog-98b
+++ b/ChangeLog-98b
@@ -1,5 +1,14 @@
Sat Jun 20 16:51:39 1998 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>
+ * ace/Reactor*: Made a slew of changes to the Reactor and it's
+ associated implementations so that we can integrate it
+ seamlessly with Chorus ClassiX IPC. Thanks to Wei Chiang for
+ these changes.
+
+ * ace/Acceptor.cpp: Added a flag that keeps track of whether we should
+ use select() in the Acceptor. This makes it easier to integrate
+ this stuff with Chorus IPC. Thanks to Wei Chiang for this.
+
* examples/IPC_SAP/SOCK_SAP/CPP-inclient.cpp: Removed the trailing
0 to the send() operation to (1) avoid overload ambiguity and
(2) to use write() rather than send()! Thanks to Chris Healey
diff --git a/README b/README
index 2b40a64f7e3..4c29d8b8eaf 100644
--- a/README
+++ b/README
@@ -359,7 +359,7 @@ William L. Gerecke <gerecke@rayva.org>
Craig Johnston <johnston@tortilla.ds.boeing.com>
Pierre-Yves Duval <duval@cppm.in2p3.fr>
Rochi Febo Dommarco <rocky@alter.it>
-Jonathan Biggar <jon@sems.com>
+Jonathan Biggar <jon@floorboard.com>
Scott Shupe <shupes@mitre.org>
Chuck Gehr <gehr@sweng.stortek.com>
Avraham Nash <Avraham_Nash@praxisint.com>
diff --git a/ace/Reactor_Impl.h b/ace/Reactor_Impl.h
index 3c094e8a815..a47bea9aa5d 100644
--- a/ace/Reactor_Impl.h
+++ b/ace/Reactor_Impl.h
@@ -36,7 +36,8 @@ class ACE_Reactor_Impl;
class ACE_Export ACE_Reactor_Notify : public ACE_Event_Handler
{
// = TITLE
- // Unblock an <ACE_Reactor_Impl> from its event loop.
+ // Abstract class for unblocking an <ACE_Reactor_Impl> from its
+ // event loop.
public:
// = Initialization and termination methods.
virtual int open (ACE_Reactor_Impl *,
@@ -74,7 +75,8 @@ public:
int restart = 0,
ACE_Sig_Handler * = 0,
ACE_Timer_Queue * = 0,
- int disable_notify_pipe = 0) = 0;
+ int disable_notify_pipe = 0,
+ ACE_Reactor_Notify * = 0) = 0;
// Initialization.
virtual int current_info (ACE_HANDLE, size_t & /* size */) = 0;
diff --git a/ace/Select_Reactor.cpp b/ace/Select_Reactor.cpp
index 6dfdec76b06..21c08c9de28 100644
--- a/ace/Select_Reactor.cpp
+++ b/ace/Select_Reactor.cpp
@@ -647,7 +647,7 @@ ACE_Select_Reactor_Notify::open (ACE_Reactor_Impl *r,
if (disable_notify_pipe == 0)
{
- this->select_reactor_ = ACE_dynamic_cast (ACE_Select_Reactor, r);
+ this->select_reactor_ = ACE_dynamic_cast (ACE_Select_Reactor *, r);
if (select_reactor_ == 0)
{
@@ -968,7 +968,7 @@ ACE_Select_Reactor::open (size_t size,
ACE_Sig_Handler *sh,
ACE_Timer_Queue *tq,
int disable_notify_pipe,
- ACE_Select_Reactor_Notify *notify)
+ ACE_Reactor_Notify *notify)
{
ACE_TRACE ("ACE_Select_Reactor::open");
ACE_MT (ACE_GUARD_RETURN (ACE_SELECT_REACTOR_MUTEX, ace_mon, this->token_, -1));
diff --git a/ace/Select_Reactor.h b/ace/Select_Reactor.h
index 71b556f0c55..3bc153ad374 100644
--- a/ace/Select_Reactor.h
+++ b/ace/Select_Reactor.h
@@ -390,7 +390,7 @@ public:
ACE_Select_Reactor (ACE_Sig_Handler * = 0,
ACE_Timer_Queue * = 0,
int disable_notify_pipe = 0,
- ACE_Select_Reactor *notify = 0);
+ ACE_Reactor_Notify *notify = 0);
// Initialize <ACE_Select_Reactor> with the default size.
ACE_Select_Reactor (size_t size,
@@ -398,14 +398,15 @@ public:
ACE_Sig_Handler * = 0,
ACE_Timer_Queue * = 0,
int disable_notify_pipe = 0,
- ACE_Select_Reactor *notify = 0);
+ ACE_Reactor_Notify *notify = 0);
// Initialize <ACE_Select_Reactor> with size <size>.
virtual int open (size_t size = DEFAULT_SIZE,
int restart = 0,
ACE_Sig_Handler * = 0,
ACE_Timer_Queue * = 0,
- int disable_notify_pipe = 0);
+ int disable_notify_pipe = 0,
+ ACE_Reactor_Notify * = 0);
// Initialize <ACE_Select_Reactor> with size <size>.
virtual int current_info (ACE_HANDLE, size_t & /* size */);