summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog-97b13
-rw-r--r--VERSION2
-rw-r--r--tests/Priority_Reactor_Test.cpp15
-rw-r--r--tests/Priority_Reactor_Test.h34
4 files changed, 39 insertions, 25 deletions
diff --git a/ChangeLog-97b b/ChangeLog-97b
index 15d563367f7..fd4f69c2b3d 100644
--- a/ChangeLog-97b
+++ b/ChangeLog-97b
@@ -1,3 +1,16 @@
+Thu Oct 16 02:07:54 1997 Douglas C. Schmidt <schmidt@flamenco.cs.wustl.edu>
+
+ * tests/Priority_Reactor_Test.h: Changed
+
+ class Read_Handler : public ACE_Svc_Handler<<ACE_SOCK_Stream, ACE_INET_Addr, ACE_SYNCH>
+
+ to
+
+ class Read_Handler : public ACE_Svc_Handler<<ACE_SOCK_STREAM, ACE_SYNCH>
+
+ and the same for the Write_Handler. Thanks to the ever vigilant
+ Stephen Coy <stevec@magna.com.au> for reporting this.
+
Thu Oct 16 01:18:48 1997 Nanbor Wang <nw1@cumbia.cs.wustl.edu>
* ace/SV_Semaphore_Simple.cpp (name_2_key): Explicitly cast the
diff --git a/VERSION b/VERSION
index e3e04dfbf32..e4ec0400f5a 100644
--- a/VERSION
+++ b/VERSION
@@ -1,4 +1,4 @@
-This is ACE version 4.3.18, released Thu Oct 16 00:12:56 1997.
+This is ACE version 4.3.18, released Thu Oct 16 01:42:25 1997.
If you have any problems with ACE, please send email to Douglas
C. Schmidt (schmidt@cs.wustl.edu).
diff --git a/tests/Priority_Reactor_Test.cpp b/tests/Priority_Reactor_Test.cpp
index 9e6867d9cc8..7e7fa5cc48f 100644
--- a/tests/Priority_Reactor_Test.cpp
+++ b/tests/Priority_Reactor_Test.cpp
@@ -36,20 +36,22 @@
#include "ace/Priority_Reactor.h"
#include "Priority_Reactor_Test.h"
-static int opt_nchildren = 20;
// The number of children to run, it can be changed using the -c
// option.
+static int opt_nchildren = 20;
-static int opt_nloops = 200;
// The number of loops per children, it can be changed using the -l
// option.
+static int opt_nloops = 200;
-static int opt_priority_reactor = 1;
// If not set use the normal reactor, it can be changed using the -d
// option.
+static int opt_priority_reactor = 1;
-typedef ACE_Connector<Write_Handler, ACE_SOCK_CONNECTOR> CONNECTOR;
-typedef ACE_Acceptor<Read_Handler, ACE_SOCK_ACCEPTOR> ACCEPTOR;
+typedef ACE_Connector<Write_Handler, ACE_SOCK_CONNECTOR>
+ CONNECTOR;
+typedef ACE_Acceptor<Read_Handler, ACE_SOCK_ACCEPTOR>
+ ACCEPTOR;
int Read_Handler::waiting_ = 0;
int Read_Handler::started_ = 0;
@@ -231,7 +233,8 @@ main (int argc, char *argv[])
ACE_DEBUG ((LM_DEBUG, "(%P|%t) starting server at port %d\n",
server_addr.get_port_number ()));
- ACE_INET_Addr connection_addr (server_addr.get_port_number (), "localhost");
+ ACE_INET_Addr connection_addr (server_addr.get_port_number (),
+ "localhost");
int i;
diff --git a/tests/Priority_Reactor_Test.h b/tests/Priority_Reactor_Test.h
index 900dbc73375..68becbcb47c 100644
--- a/tests/Priority_Reactor_Test.h
+++ b/tests/Priority_Reactor_Test.h
@@ -24,16 +24,15 @@
#include "ace/Service_Config.h"
#include "ace/Svc_Handler.h"
-class Read_Handler : public ACE_Svc_Handler<ACE_SOCK_Stream, ACE_INET_Addr, ACE_SYNCH>
-// = TITLE
-// A Svc_Handler with a priority twist.
-//
-// = DESCRIPTION
-// This Svc_Handler receives the data sent by the childs or writer
-// threads; each one sets it own priority to a new level, in a
-// cyclic manner.
-// The main point is test and exercise the priority dispatching
-// features of ACE_Priority_Reactor.
+class Read_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_SYNCH>
+ // = TITLE
+ // A Svc_Handler with a priority twist.
+ //
+ // = DESCRIPTION
+ // This Svc_Handler receives the data sent by the childs or writer
+ // threads; each one sets it own priority to a new level, in a
+ // cyclic manner. The main point is test and exercise the
+ // priority dispatching features of ACE_Priority_Reactor.
{
public:
static void set_countdown (int nchildren);
@@ -52,14 +51,13 @@ private:
// How many readers have started.
};
-class Write_Handler : public ACE_Svc_Handler<ACE_SOCK_Stream, ACE_INET_Addr, ACE_SYNCH>
-// = TITLE
-// A simple writer.
-//
-// = DESCRIPTION
-// This Svc_Handler simply connects to a server and sends some
-// output to it.
-// Its purpose is to feed the test.
+class Write_Handler : public ACE_Svc_Handler<ACE_SOCK_STREAM, ACE_SYNCH>
+ // = TITLE
+ // A simple writer.
+ //
+ // = DESCRIPTION
+ // This Svc_Handler simply connects to a server and sends some
+ // output to it. Its purpose is to feed the test.
{
public:
virtual int open (void *);