ChangeLogTag:Wed Apr 21 09:12:20 1999 Carlos O'Ryan <coryan@cs.wustl.edu>

3 files changed, 20 insertions, 12 deletions

diff --git a/TAO/ChangeLog-99c b/TAO/ChangeLog-99c
index f9e9ba0871d..8ba292f42bc 100644
--- a/TAO/ChangeLog-99c
+++ b/TAO/ChangeLog-99c
@@ -1,3 +1,11 @@
+Wed Apr 21 09:12:20 1999  Carlos O'Ryan  <coryan@cs.wustl.edu>
+
+	* performance-tests/Cubit/TAO/MT_Cubit/client.cpp:
+	* performance-tests/Cubit/TAO/MT_Cubit/server.cpp:
+	  The activate() function was called with the wrong flag,
+	  ACE_SCHED_FIFO was used, but THR_SCHED_FIFO is the Right
+	  Thing[tm]
+
 Wed Apr 21 03:41:51 1999  Douglas C. Schmidt  <schmidt@cs.wustl.edu>
 
         * TAO version 0.3.20 released.
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
index d10d0615de5..f302b31c151 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp
@@ -322,7 +322,7 @@ Client_i::activate_high_client (void)
   ACE_DEBUG ((LM_DEBUG,
               "Creating 1 client with high priority of %d\n",
               this->high_priority_));
-  if (this->high_priority_client_->activate (THR_BOUND | ACE_SCHED_FIFO,
+  if (this->high_priority_client_->activate (THR_BOUND | THR_SCHED_FIFO,
                                              1,
                                              0,
                                              this->high_priority_,
@@ -330,7 +330,7 @@ Client_i::activate_high_client (void)
                                              0,
                                              0,
                                              0,
-                                             0,           //  size_t stack_size[] = 0,
+                                             0,
                                              (ACE_thread_t *) &this->task_id_) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p; priority is %d\n",
@@ -391,7 +391,7 @@ Client_i::activate_low_client (void)
       // The first thread starts at the lowest priority of all the low
       // priority clients.
       if (this->low_priority_client_[i - 1]->activate
-          (THR_BOUND | ACE_SCHED_FIFO,
+          (THR_BOUND | THR_SCHED_FIFO,
            1,
            0,
            this->low_priority_, // These are constructor defaults.
@@ -449,7 +449,7 @@ Client_i::activate_util_thread (void)
       // Activate the Utilization thread.  It will wait until all
       // threads have finished binding.
       this->util_thread_->activate
-        (THR_BOUND | ACE_SCHED_FIFO,
+        (THR_BOUND | THR_SCHED_FIFO,
          1,
          0,
          this->low_priority_);
@@ -605,7 +605,7 @@ Client_i::start_servant (void)
 
   // Make the high priority task an active object.
    if (high_priority_task->activate
-       (THR_BOUND | ACE_SCHED_FIFO,
+       (THR_BOUND | THR_SCHED_FIFO,
         1,
         0,
         this->high_priority_) == -1)
@@ -739,7 +739,7 @@ Client_i::do_thread_per_rate_test (void)
               "Creating 20 Hz client with priority %d\n",
               priority));
 
-  if (CB_20Hz_client.activate (THR_BOUND | ACE_SCHED_FIFO,
+  if (CB_20Hz_client.activate (THR_BOUND | THR_SCHED_FIFO,
                                1,
                                1,
                                priority) == -1)
@@ -768,7 +768,7 @@ Client_i::do_thread_per_rate_test (void)
               "Creating 10 Hz client with priority %d\n",
               priority));
 
-  if (CB_10Hz_client.activate (THR_BOUND | ACE_SCHED_FIFO,
+  if (CB_10Hz_client.activate (THR_BOUND | THR_SCHED_FIFO,
                                1,
                                1,
                                priority) == -1)
@@ -782,7 +782,7 @@ Client_i::do_thread_per_rate_test (void)
               "Creating 5 Hz client with priority %d\n",
               priority));
 
-  if (CB_5Hz_client.activate (THR_BOUND | ACE_SCHED_FIFO,
+  if (CB_5Hz_client.activate (THR_BOUND | THR_SCHED_FIFO,
                               1,
                               1,
                               priority) == -1)
@@ -796,7 +796,7 @@ Client_i::do_thread_per_rate_test (void)
               "Creating 1 Hz client with priority %d\n",
               priority));
 
-  if (CB_1Hz_client.activate (THR_BOUND | ACE_SCHED_FIFO,
+  if (CB_1Hz_client.activate (THR_BOUND | THR_SCHED_FIFO,
                               1,
                               1,
                               priority) == -1)
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
index c8229136215..17e744c6b0e 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp
@@ -199,12 +199,12 @@ Server::activate_high_servant (void)
 
   // Make the high priority task an active object.
   if (this->high_priority_task_->activate
-      (THR_BOUND | ACE_SCHED_FIFO,
+      (THR_BOUND | THR_SCHED_FIFO,
        1,
        0,
        this->high_priority_) == -1)
     ACE_ERROR ((LM_ERROR,
-                "(%P|%t) %p\n"
+                "(%P|%t) %p\n",
                 "\thigh_priority_task->activate failed"));
 
   ACE_MT (ACE_GUARD_RETURN (ACE_Thread_Mutex,
@@ -270,7 +270,7 @@ Server::activate_low_servants (void)
 
       // Make the low priority task an active object.
       if (this->low_priority_tasks_ [i - 1]->activate
-          (THR_BOUND | ACE_SCHED_FIFO,
+          (THR_BOUND | THR_SCHED_FIFO,
            1,
            0,
            this->low_priority_) == -1)