*** empty log message ***

2 files changed, 23 insertions, 24 deletions

diff --git a/ChangeLog-98a b/ChangeLog-98a
index fb0bb4bea59..eea9dd5f2f1 100644
--- a/ChangeLog-98a
+++ b/ChangeLog-98a
@@ -1,10 +1,3 @@
-Sun Jan 04 12:37:02 1998  David L. Levine  <levine@cs.wustl.edu>
-
-        * tests/Env_Value_Test.cpp: hacked to work with
-          ACE_HAS_NONSTATIC_OBJECT_MANAGER.  With that, it uses ::putenv (),
-          which we should wrap in ACE_OS.  Also, expanded TEST_THIS to
-          provide a more helpful log message than just the ASSERT output.
-
 Sun Jan  4 10:11:53 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
 	* apps/Gateway/Gateway/Event_Channel.cpp (put): Uncommented the
@@ -24,14 +17,12 @@ Sun Jan  4 10:11:53 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
  	  some minor problems.  Thanks to David Levine for showing the
  	  way...
 
-Sun Jan 04 09:51:59 1998  Nanbor Wang  <nw1@cs.wustl.edu>
-
-	* apps/Gateway/Gateway/Options.{h,cpp}: Removed macros to export
- 	  this class out of DLL.  They are no longer needed.
-
-	* apps/Gateway/Gateway/Gateway.dsp:  Updated source file listings.
+Sun Jan 04 12:37:02 1998  David L. Levine  <levine@cs.wustl.edu>
 
-Sun Jan 04 07:43:10 1998  David L. Levine  <levine@cs.wustl.edu>
+        * tests/Env_Value_Test.cpp: hacked to work with
+          ACE_HAS_NONSTATIC_OBJECT_MANAGER.  With that, it uses ::putenv (),
+          which we should wrap in ACE_OS.  Also, expanded TEST_THIS to
+          provide a more helpful log message than just the ASSERT output.
 
         * ace/config-vxworks5.x-g++.h: removed
           ACE_HAS_TEMPLATE_SPECIALIZATION.
@@ -40,6 +31,13 @@ Sun Jan 04 07:43:10 1998  David L. Levine  <levine@cs.wustl.edu>
           and i->int_id_ to (char *) to force g++/VxWorks to apply the
           conversion from Dumb_String to char *.
 
+Sun Jan 04 09:51:59 1998  Nanbor Wang  <nw1@cs.wustl.edu>
+
+	* apps/Gateway/Gateway/Options.{h,cpp}: Removed macros to export
+ 	  this class out of DLL.  They are no longer needed.
+
+	* apps/Gateway/Gateway/Gateway.dsp:  Updated source file listings.
+
 Sat Jan  3 22:25:15 1998  Douglas C. Schmidt  <schmidt@tango.cs.wustl.edu>
 
 	* apps/Gateway/Gateway: Changed the name of the ACE_Event_Channel
diff --git a/tests/Reader_Writer_Test.cpp b/tests/Reader_Writer_Test.cpp
index 4b85fdabf5a..623a3d487a2 100644
--- a/tests/Reader_Writer_Test.cpp
+++ b/tests/Reader_Writer_Test.cpp
@@ -104,7 +104,7 @@ reader (void *)
 
       if (current_writers > 0)
         ACE_DEBUG ((LM_DEBUG,
-                    "(%t) writers found!!!\n"));
+                    "(%t) reader error: writers found!!!\n"));
 
       ACE_thread_t data = shared_data;
 
@@ -114,12 +114,12 @@ reader (void *)
 
           if (ACE_OS::thr_equal (shared_data, data) == 0)
             ACE_DEBUG ((LM_DEBUG,
-                        "(%t) somebody changed %d to %d\n",
+                        "(%t) reader error: somebody changed %d to %d\n",
                         data,
                         shared_data));
         }
 
-      if (rw_mutex.tryacquire_write_upgrade () == 0)
+      if (rw_mutex.tryacquire_write_upgrade () != -1)
         {
           current_writers++;
 
@@ -129,12 +129,13 @@ reader (void *)
           ACE_thread_t self = ACE_Thread::self ();
           
           shared_data = self;
+          data = self;
 
           for (size_t loop = 1; loop <= n_loops; loop++)
             {
               if (ACE_OS::thr_equal (shared_data, data) == 0)
                 ACE_DEBUG ((LM_DEBUG,
-                            "(%t) somebody changed %d to %d\n",
+                            "(%t) upgraded writer error: somebody changed %d to %d\n",
                             data,
                             shared_data));
             }
@@ -145,7 +146,7 @@ reader (void *)
       --current_readers;
 
       ACE_DEBUG ((LM_DEBUG,
-                  "(%t) read %d done at %T\n",
+                  "(%t) reader finished %d iterations at %T\n",
                   iterations));
     }
   return 0;
@@ -160,7 +161,7 @@ writer (void *)
   ACE_DEBUG ((LM_DEBUG, 
               "(%t) writer starting\n"));
 
-  // We use a random pause, around 2msec with 1msec jittering.
+  // We use a random pause, around 2 msec with 1 msec jittering.
   int usecs = 1000 + ACE_OS::rand () % 2000;
   ACE_Time_Value pause (0, usecs);
 
@@ -179,11 +180,11 @@ writer (void *)
 
         if (current_writers > 1)
           ACE_DEBUG ((LM_DEBUG,
-                      "(%t) other writers found!!!\n"));
+                      "(%t) writer error: other writers found!!!\n"));
 
         if (current_readers > 0)
           ACE_DEBUG ((LM_DEBUG,
-                      "(%t) readers found!!!\n"));
+                      "(%t) writer error: readers found!!!\n"));
 
         ACE_thread_t self = ACE_Thread::self ();
 
@@ -197,7 +198,7 @@ writer (void *)
 
             if (ACE_OS::thr_equal (shared_data, self) == 0)
               ACE_DEBUG ((LM_DEBUG,
-                          "(%t) somebody wrote on my data %d\n",
+                          "(%t) writer error: somebody wrote on my data %d\n",
                           shared_data));
           }
 
@@ -205,7 +206,7 @@ writer (void *)
       }
 
       ACE_DEBUG ((LM_DEBUG,
-                  "(%t) write %d done at %T\n",
+                  "(%t) writer done after %d iterations at %T\n",
                   iterations));
     }