ChangeLogTag:Fri Sep 24 08:59:13 1999 Douglas C. Schmidt <schmidt@tango.cs.wustl.edu>

3 files changed, 56 insertions, 25 deletions

diff --git a/ChangeLog-99b b/ChangeLog-99b
index 60881987a06..ae9e2556469 100644
--- a/ChangeLog-99b
+++ b/ChangeLog-99b
@@ -1,3 +1,8 @@
+Fri Sep 24 08:59:13 1999  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
+
+	* examples/Connection/blocking/SPIPE-{acceptor,connector}.cpp: 
+	  Reformatted some of the code.
+
 Fri Sep 24 08:27:28 1999  David L. Levine  <levine@cs.wustl.edu>
 
         * ace/OS.*,Synch.cpp: reverted changes of:
diff --git a/examples/Connection/blocking/SPIPE-acceptor.cpp b/examples/Connection/blocking/SPIPE-acceptor.cpp
index 9d0728144d9..a94e9cb441b 100644
--- a/examples/Connection/blocking/SPIPE-acceptor.cpp
+++ b/examples/Connection/blocking/SPIPE-acceptor.cpp
@@ -25,11 +25,14 @@ Svc_Handler::~Svc_Handler (void)
 int
 Svc_Handler::open (void *)
 {
-  ACE_DEBUG ((LM_DEBUG, "client connected on handle %d\n",
+  ACE_DEBUG ((LM_DEBUG,
+              "client connected on handle %d\n",
 	      this->peer ().get_handle ()));
-  if (this->ar_.open (*this, this->peer ().get_handle ()) == -1)
+  if (this->ar_.open (*this,
+                      this->peer ().get_handle ()) == -1)
     return -1;
-  return this->ar_.read (this->mb_, this->mb_.size ());
+  return this->ar_.read (this->mb_,
+                         this->mb_.size ());
 }
 
 void
@@ -40,10 +43,15 @@ Svc_Handler::handle_read_stream (const ACE_Asynch_Read_Stream::Result &result)
       result.message_block ().rd_ptr ()[result.message_block ().length ()] = '\0';
 
       // Print out the message received from the server.
-      ACE_DEBUG ((LM_DEBUG, "(%t) message size %d.\n", result.message_block ().length ()));
-      ACE_DEBUG ((LM_DEBUG, "%s", result.message_block ().rd_ptr ()));
-
-      this->ar_.read (this->mb_, this->mb_.size ());
+      ACE_DEBUG ((LM_DEBUG,
+                  "(%t) message size %d.\n",
+                  result.message_block ().length ()));
+      ACE_DEBUG ((LM_DEBUG,
+                  "%s",
+                  result.message_block ().rd_ptr ()));
+
+      this->ar_.read (this->mb_,
+                      this->mb_.size ());
     }
   else
     ACE_Proactor::end_event_loop();
@@ -63,18 +71,24 @@ IPC_Server::~IPC_Server (void)
 int
 IPC_Server::init (int argc, char *argv[])
 {
-  if (this->parse_args (argc, argv) == -1)
+  if (this->parse_args (argc,
+                        argv) == -1)
     return -1;
 
-  ACE_DEBUG ((LM_DEBUG, "Opening %s\n", ACE_MULTIBYTE_STRING (rendezvous_)));
+  ACE_DEBUG ((LM_DEBUG,
+              "Opening %s\n",
+              ACE_MULTIBYTE_STRING (rendezvous_)));
 
   // Initialize named pipe listener.
   if (this->open (ACE_SPIPE_Addr (rendezvous_)) == -1)
-    ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "open"), 1);
+    ACE_ERROR_RETURN ((LM_ERROR,
+                       "%p\n",
+                       "open"), 1);
 
   // Register to receive shutdowns.
   else if (ACE_Reactor::instance ()->register_handler
-      (SIGINT, &this->done_handler_) == -1)
+      (SIGINT,
+       &this->done_handler_) == -1)
     return -1;
   else
     return 0;
@@ -144,7 +158,10 @@ IPC_Server::svc (void)
       // its open() method (note no automatic restart if errno ==
       // EINTR).
       if (this->accept (&sh, 0) == -1)
-	ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "accept"), 1);
+	ACE_ERROR_RETURN ((LM_ERROR,
+                           "%p\n",
+                           "accept"),
+                          1);
 
       // SH's destructor closes the stream implicitly but the
       // listening endpoint stays open.
@@ -153,17 +170,22 @@ IPC_Server::svc (void)
 	  // Run single-threaded.
 	  if (n_threads_ <= 1)
 	    run_reactor_event_loop (0);
-	  else if (ACE_Thread_Manager::instance ()->spawn_n (n_threads_,
-							     run_reactor_event_loop,
-							     0,
-							     THR_NEW_LWP) == -1)
+	  else if (ACE_Thread_Manager::instance ()->spawn_n 
+                   (n_threads_,
+                    run_reactor_event_loop,
+                    0,
+                    THR_NEW_LWP) == -1)
 	    {
-	      ACE_ERROR_RETURN ((LM_ERROR, "%p\n", "spawn_n"), 1);
+	      ACE_ERROR_RETURN ((LM_ERROR,
+                                 "%p\n",
+                                 "spawn_n"),
+                                1);
 
 	      ACE_Thread_Manager::instance ()->wait ();
 	    }
 
-	  ACE_DEBUG ((LM_DEBUG, "(%t) main thread exiting.\n"));
+	  ACE_DEBUG ((LM_DEBUG, 
+                      "(%t) main thread exiting.\n"));
 	}
     }
 
@@ -173,7 +195,6 @@ IPC_Server::svc (void)
 
 #endif /* SPIPE_ACCEPTOR_C */
 
-
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
 template class ACE_Concurrency_Strategy<Svc_Handler>;
 template class ACE_Oneshot_Acceptor<Svc_Handler, ACE_SPIPE_ACCEPTOR>;
diff --git a/examples/Connection/blocking/SPIPE-connector.cpp b/examples/Connection/blocking/SPIPE-connector.cpp
index a3e61e90e33..bd0956354a5 100644
--- a/examples/Connection/blocking/SPIPE-connector.cpp
+++ b/examples/Connection/blocking/SPIPE-connector.cpp
@@ -32,9 +32,10 @@ Peer_Handler::open (void *)
   if (iterations_ == 0)
     {
       this->display_menu ();
-      if (ACE_Event_Handler::register_stdin_handler (this,
-						     ACE_Reactor::instance (),
-						     ACE_Thread_Manager::instance ()) == -1)
+      if (ACE_Event_Handler::register_stdin_handler 
+          (this,
+           ACE_Reactor::instance (),
+           ACE_Thread_Manager::instance ()) == -1)
 	ACE_ERROR_RETURN ((LM_ERROR,
                            "%p\n",
                            "register_stdin_handler"),
@@ -54,7 +55,8 @@ Peer_Handler::open (void *)
       int length = ACE_OS::strlen (buffer);
 
       while (iterations_-- > 0
-	     && this->peer ().send_n (buffer, length) == length)
+	     && this->peer ().send_n (buffer,
+                                      length) == length)
 	continue;
 
       this->peer ().close ();
@@ -68,7 +70,9 @@ Peer_Handler::handle_input (ACE_HANDLE)
 {
   char buf[BUFSIZ];
 
-  ssize_t n = ACE_OS::read (ACE_STDIN, buf, sizeof buf);
+  ssize_t n = ACE_OS::read (ACE_STDIN,
+                            buf,
+                            sizeof buf);
 
   if (n > 0)
     if (this->peer ().send (buf, n) != n)
@@ -133,7 +137,8 @@ IPC_Client::init (int argc, char *argv[])
     return -1;
   // Handle signals through the ACE_Reactor.
   else if (ACE_Reactor::instance ()->register_handler
-	   (SIGINT, &this->done_handler_) == -1)
+	   (SIGINT,
+            &this->done_handler_) == -1)
     return -1;
 
   ACE_DEBUG ((LM_DEBUG,