*** empty log message ***

6 files changed, 21 insertions, 18 deletions

diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index 7c2b4784289..d2fe43c3d9c 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -1,5 +1,8 @@
 Tue Sep 22 02:40:33 1998  Douglas C. Schmidt  <schmidt@lambada.cs.wustl.edu>
 
+	* examples/Simple/grid: Printout the process id and thread id
+	  for the client and server.
+
 	* examples/Simple/Makefile (DIRS): Enabled all the "Simple" test
  	  examples in the Makefile so we can see if they compile on other
  	  platforms.
diff --git a/TAO/examples/Simple/grid/Client_i.cpp b/TAO/examples/Simple/grid/Client_i.cpp
index 4ee6d2c0f3c..a6d969c3d79 100644
--- a/TAO/examples/Simple/grid/Client_i.cpp
+++ b/TAO/examples/Simple/grid/Client_i.cpp
@@ -29,7 +29,7 @@ Client_i::read_ior (char *filename)
 
   if (f_handle == ACE_INVALID_HANDLE)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to open %s for writing: %p\n",
+                       "(%P|%t) Unable to open %s for writing: %p\n",
                        filename),
                       -1);
 
@@ -38,7 +38,7 @@ Client_i::read_ior (char *filename)
 
   if (data == 0)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "Unable to read ior: %p\n"),
+                       "(%P|%t) Unable to read ior: %p\n"),
                       -1);
 
   this->ior_ = ACE_OS::strdup (data);
@@ -74,7 +74,7 @@ Client_i::parse_args (void)
         result = this->read_ior (get_opts.optarg);
         if (result < 0)
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to read ior from %s : %p\n",
+                             "(%P|%t) Unable to read ior from %s : %p\n",
                              get_opts.optarg),
                             -1);
         break;
@@ -139,7 +139,7 @@ Client_i::test_grid (void)
                                               this->env_);
       TAO_CHECK_ENV;
       ACE_DEBUG ((LM_DEBUG,
-                  "\nMade the grid succesfully\n"));
+                  "(%P|%t) Made the grid succesfully\n"));
       // Set a value for a grid.
       this->grid_->set (setx_, 
                         sety_, 
@@ -147,7 +147,7 @@ Client_i::test_grid (void)
                         TAO_TRY_ENV);
       TAO_CHECK_ENV;
       ACE_DEBUG ((LM_DEBUG,
-                  "\n\t Setting a value for the grid"));
+                  "(%P|%t) Setting a value for the grid\n"));
        
       // Get the value of the grid
       CORBA::Long ret_val = this->grid_->get (setx_, 
@@ -159,7 +159,7 @@ Client_i::test_grid (void)
   TAO_CATCH (CORBA::UserException, range_ex)
     {
       ACE_UNUSED_ARG (range_ex);
-      TAO_TRY_ENV.print_exception (" From set  and get grid ");
+      TAO_TRY_ENV.print_exception (" From set and get grid ");
     }
   TAO_CATCH (CORBA::SystemException, memex)
     {
@@ -213,7 +213,7 @@ Client_i::init (int argc, char **argv)
 
       if (this->ior_ == 0)
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "%s: no ior specified\n",
+                           "(%P|%t) %s: no ior specified\n",
                            this->argv_[0]),
                           -1);
 
@@ -224,7 +224,7 @@ Client_i::init (int argc, char **argv)
 
       if (CORBA::is_nil (server_object.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
-                           "invalid ior <%s>\n",
+                           "(%P|%t) invalid ior <%s>\n",
                            this->ior_),
                           -1);
       this->server_ = Grid_Factory::_narrow (server_object.in (),
diff --git a/TAO/examples/Simple/grid/Grid_i.cpp b/TAO/examples/Simple/grid/Grid_i.cpp
index 97b5bca6669..938c4bb85af 100644
--- a/TAO/examples/Simple/grid/Grid_i.cpp
+++ b/TAO/examples/Simple/grid/Grid_i.cpp
@@ -115,7 +115,7 @@ Grid_i::destroy (CORBA::Environment &_env)
   delete [] array_;
 
   ACE_DEBUG ((LM_DEBUG,
-              "%s\n",
+              "(%P|%t) %s\n",
               "Grid has been destroyed"));
 }
 
@@ -133,8 +133,8 @@ void
 Grid_Factory_i::shutdown (CORBA::Environment &)
 {
   ACE_DEBUG ((LM_DEBUG,
-              "%s\n",
-              "Grid Factory  is shutting down"));
+              "(%P|%t) %s\n",
+              "Grid Factory is shutting down"));
 
   // Instruct the ORB to shutdown.
   this->orb_->shutdown ();
@@ -162,7 +162,7 @@ Grid_Factory_i::make_grid (CORBA::Short width,
   Grid_i *grid_ptr = 0;
  
   ACE_DEBUG ((LM_DEBUG,
-              "\n\tMaking a new Grid"));
+              "(%P|%t) Making a new Grid\n"));
 
   // Set a default value for width.
   if (width <= 0)
diff --git a/TAO/examples/Simple/grid/Server_i.cpp b/TAO/examples/Simple/grid/Server_i.cpp
index cd0685e4f90..ac3d114e60a 100644
--- a/TAO/examples/Simple/grid/Server_i.cpp
+++ b/TAO/examples/Simple/grid/Server_i.cpp
@@ -33,7 +33,7 @@ Server_i::parse_args (void)
         this->ior_output_file_ = ACE_OS::fopen (get_opts.optarg, "w");
         if (this->ior_output_file_ == 0)
           ACE_ERROR_RETURN ((LM_ERROR,
-                             "Unable to open %s for writing: %p\n",
+                             "(%P|%t) Unable to open %s for writing: %p\n",
                              get_opts.optarg), -1);
         break;
       case '?':  // display help for use of the server.
@@ -63,7 +63,7 @@ Server_i::init (int argc, char *argv[], CORBA::Environment &env)
                                          "child_poa",
                                          env) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "%p\n",
+                       "(%P|%t) %p\n",
                        "init_child_poa"),
                       -1);
   TAO_CHECK_ENV_RETURN (env, -1);
@@ -87,7 +87,7 @@ Server_i::init (int argc, char *argv[], CORBA::Environment &env)
                                                  &this->servant_,
                                                  env);
   ACE_DEBUG ((LM_DEBUG,
-              "The IOR is: <%s>\n",
+              "(%P|%t) The IOR is: <%s>\n",
               str.in ()));
 
   if (this->ior_output_file_)
@@ -107,7 +107,7 @@ Server_i::run (CORBA::Environment &env)
   // Run the main event loop for the ORB.
   if (this->orb_manager_.run (env) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
-                       "Server_i::run"),
+                       "(%P|%t) Server_i::run"),
                       -1);
   return 0;
 }
diff --git a/TAO/examples/Simple/grid/client.cpp b/TAO/examples/Simple/grid/client.cpp
index 6dcfbf5d7e1..e7fb37beba2 100644
--- a/TAO/examples/Simple/grid/client.cpp
+++ b/TAO/examples/Simple/grid/client.cpp
@@ -10,7 +10,7 @@ main (int argc, char **argv)
   Client_i client;
 
   ACE_DEBUG ((LM_DEBUG,
-              "\n\tGrid client\n\n"));
+              "(%P|%t) Grid client\n"));
 
   if (client.init (argc, argv) == -1)
     return -1;
diff --git a/TAO/examples/Simple/grid/server.cpp b/TAO/examples/Simple/grid/server.cpp
index 1a3974ee9bc..542a1222105 100644
--- a/TAO/examples/Simple/grid/server.cpp
+++ b/TAO/examples/Simple/grid/server.cpp
@@ -10,7 +10,7 @@ main (int argc, char *argv[])
   Server_i server;
 
   ACE_DEBUG ((LM_DEBUG,
-              "\nGrid server\n"));
+              "(%P|%t) Grid server\n"));
 
   TAO_TRY
     {