diff options
author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-11-10 04:36:54 +0000 |
---|---|---|
committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 1998-11-10 04:36:54 +0000 |
commit | a4481b36a444100148f190f8684194d0553e149d (patch) | |
tree | 2675f9156fc46edf993a9cca4e80a82d94ae52a4 | |
parent | 67b4fd7d9586a020b5395516fe517ec416da5fed (diff) | |
download | ATCD-a4481b36a444100148f190f8684194d0553e149d.tar.gz |
changed Log_Priority of "not supported" messages to LM_INFO
32 files changed, 160 insertions, 149 deletions
diff --git a/tests/Atomic_Op_Test.cpp b/tests/Atomic_Op_Test.cpp index 80c3b6cadda..847841d2941 100644 --- a/tests/Atomic_Op_Test.cpp +++ b/tests/Atomic_Op_Test.cpp @@ -15,7 +15,7 @@ // these operations. // // = AUTHOR -// Irfan Pyarali +// Irfan Pyarali // // ============================================================================ @@ -71,11 +71,10 @@ main (int, ASYS_TCHAR *[]) { ACE_START_TEST (ASYS_TEXT ("Atomic_Op_Test")); - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("threads not supported on this platform\n"))); + ACE_ERROR ((LM_INFO, + ASYS_TEXT ("threads not supported on this platform\n"))); ACE_END_TEST; return 0; } #endif /* ACE_HAS_THREADS */ - - diff --git a/tests/Barrier_Test.cpp b/tests/Barrier_Test.cpp index fb0065cd010..d18250d1948 100644 --- a/tests/Barrier_Test.cpp +++ b/tests/Barrier_Test.cpp @@ -102,7 +102,7 @@ main (int, ASYS_TCHAR *[]) ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("test done\n"))); #else - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_INFO, ASYS_TEXT ("threads not supported on this platform\n"))); #endif /* ACE_HAS_THREADS */ ACE_END_TEST; diff --git a/tests/Buffer_Stream_Test.cpp b/tests/Buffer_Stream_Test.cpp index 0e787e47846..44d333389f8 100644 --- a/tests/Buffer_Stream_Test.cpp +++ b/tests/Buffer_Stream_Test.cpp @@ -227,7 +227,7 @@ main (int, ASYS_TCHAR *[]) // ourselves. ACE_Thread_Manager::instance ()->wait (); #else - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_INFO, ASYS_TEXT ("threads not supported on this platform\n"))); #endif /* ACE_HAS_THREADS */ ACE_END_TEST; diff --git a/tests/Future_Test.cpp b/tests/Future_Test.cpp index d267d7f2300..4f61f5c56bc 100644 --- a/tests/Future_Test.cpp +++ b/tests/Future_Test.cpp @@ -155,7 +155,7 @@ Method_Request_work::call (void) { // Dispatch the Servant's operation and store the result into the // Future. - return this->future_result_.set (this->scheduler_->work_i + return this->future_result_.set (this->scheduler_->work_i (this->param_, this->count_)); } @@ -214,7 +214,7 @@ private: }; Method_Request_end::Method_Request_end (Prime_Scheduler *scheduler) - : scheduler_ (scheduler) + : scheduler_ (scheduler) { } @@ -222,8 +222,8 @@ Method_Request_end::~Method_Request_end (void) { } -int -Method_Request_end::call (void) +int +Method_Request_end::call (void) { // Shut down the scheduler. this->scheduler_->close (); @@ -345,7 +345,7 @@ Prime_Scheduler::name (void) } ACE_Future<u_long> -Prime_Scheduler::work (u_long newparam, +Prime_Scheduler::work (u_long newparam, int newcount) { if (this->scheduler_) { @@ -528,7 +528,7 @@ main (int, ASYS_TCHAR *[]) ACE_Time_Value timeout (1); int value = 0; - if (f1.get (value, &timeout) == 0 + if (f1.get (value, &timeout) == 0 && value == 100) ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("Ace_Future<T>::Set followed by Ace_Future<T>::Get works.\n"))); @@ -544,7 +544,7 @@ main (int, ASYS_TCHAR *[]) ACE_Future<int> f1; { // To ensure that a rep object is created. - ACE_Future<int> f2 (f1); + ACE_Future<int> f2 (f1); } // Now it is one ACE_Future<int> referencing the rep instance @@ -568,7 +568,7 @@ main (int, ASYS_TCHAR *[]) ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("1.\n"))); - { + { // Might delete the same data a couple of times. ACE_Future<int> f2 (f1); f1.set (100); @@ -616,7 +616,8 @@ main (int, ASYS_TCHAR *[]) delete matias; #else - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("threads not supported on this platform\n"))); + ACE_ERROR ((LM_INFO, + ASYS_TEXT ("threads not supported on this platform\n"))); #endif /* ACE_HAS_THREADS */ ACE_END_TEST; return 0; diff --git a/tests/IOStream_Test.cpp b/tests/IOStream_Test.cpp index 45ff4c83ace..856442c7436 100644 --- a/tests/IOStream_Test.cpp +++ b/tests/IOStream_Test.cpp @@ -440,7 +440,7 @@ spawn (void) break; } #else - ACE_ERROR_RETURN ((LM_ERROR, + ACE_ERROR_RETURN ((LM_INFO, "threads *and* processes not supported on this platform\n"), -1); #endif /* ACE_HAS_THREADS */ @@ -460,7 +460,7 @@ main (int, char *[]) ACE_INIT_LOG ("IOStream_Test-children"); spawn (); #else - ACE_ERROR ((LM_ERROR, "ACE_IOSTREAM not supported on this platform\n")); + ACE_ERROR ((LM_INFO, "ACE_IOSTREAM not supported on this platform\n")); #endif /* !ACE_LACKS_ACE_IOSTREAM */ ACE_END_TEST; return 0; diff --git a/tests/MT_Reactor_Timer_Test.cpp b/tests/MT_Reactor_Timer_Test.cpp index 7cae1bc18cb..810fde7add5 100644 --- a/tests/MT_Reactor_Timer_Test.cpp +++ b/tests/MT_Reactor_Timer_Test.cpp @@ -292,7 +292,7 @@ main (int, ASYS_TCHAR *[]) result = other_thread.wait (); ACE_ASSERT (result != -1); #else - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_INFO, ASYS_TEXT ("threads not supported on this platform\n"))); #endif /* ACE_HAS_THREADS */ diff --git a/tests/Map_Manager_Test.cpp b/tests/Map_Manager_Test.cpp index 406bb7e586c..f6a10c7f9ae 100644 --- a/tests/Map_Manager_Test.cpp +++ b/tests/Map_Manager_Test.cpp @@ -184,7 +184,7 @@ test_hash_map_manager (size_t table_size, size_t iterations) ACE_ASSERT (i == iterations); } { - i = 0; + i = 0; HASH_MAP_MANAGER::ENTRY *entry = 0; for (HASH_MAP_MANAGER::ITERATOR iterator (map); @@ -332,7 +332,7 @@ test_map_manager (size_t table_size, size_t iterations) ACE_ASSERT (k == -1); } { - + k = iterations - 1; ENTRY *entry = 0; @@ -542,7 +542,8 @@ main (int argc, ASYS_TCHAR *argv[]) ACE_UNUSED_ARG (argc); ACE_UNUSED_ARG (argv); - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("Template specializations not supported on this platform\n"))); + ACE_ERROR ((LM_INFO, + ASYS_TEXT ("Template specializations not supported on this platform\n"))); ACE_END_TEST; return 0; diff --git a/tests/Message_Block_Test.cpp b/tests/Message_Block_Test.cpp index 49f71a5c20d..70161c33c94 100644 --- a/tests/Message_Block_Test.cpp +++ b/tests/Message_Block_Test.cpp @@ -329,7 +329,8 @@ main (int, ASYS_TCHAR *[]) ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) Exiting...\n"))); #else - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("threads not supported on this platform\n"))); + ACE_ERROR ((LM_INFO, + ASYS_TEXT ("threads not supported on this platform\n"))); #endif /* ACE_HAS_THREADS */ ACE_END_TEST; return 0; diff --git a/tests/Message_Queue_Notifications_Test.cpp b/tests/Message_Queue_Notifications_Test.cpp index a4ae96fd744..92986a73e67 100644 --- a/tests/Message_Queue_Notifications_Test.cpp +++ b/tests/Message_Queue_Notifications_Test.cpp @@ -342,7 +342,7 @@ main (int, ASYS_TCHAR *[]) ACE_Thread_Manager::instance ()->wait (); #else - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_INFO, ASYS_TEXT ("Message queue watermark test not performed because threads are not supported\n"))); #endif /* ACE_HAS_THREADS */ diff --git a/tests/Notify_Performance_Test.cpp b/tests/Notify_Performance_Test.cpp index b6c62e8b024..1eb354eee3b 100644 --- a/tests/Notify_Performance_Test.cpp +++ b/tests/Notify_Performance_Test.cpp @@ -136,10 +136,10 @@ print_results (ACE_Profile_Timer::ACE_Elapsed_Time &et) ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("\n\tTiming results notify() call:\n"))); ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("\t\treal time = %f secs \n\t\tuser time = %f secs \n\t\tsystem time = %f secs\n\n"), - et.real_time, - et.user_time, - et.system_time)); + ASYS_TEXT ("\t\treal time = %f secs \n\t\tuser time = %f secs \n\t\tsystem time = %f secs\n\n"), + et.real_time, + et.user_time, + et.system_time)); } int @@ -152,20 +152,20 @@ main (int argc, ASYS_TCHAR *argv[]) switch (c) { case 's': - opt_select_reactor = 1; - break; + opt_select_reactor = 1; + break; case 'w': - opt_wfmo_reactor = 1; - break; + opt_wfmo_reactor = 1; + break; case 'c': - opt_nthreads = ACE_OS::atoi (getopt.optarg); - break; + opt_nthreads = ACE_OS::atoi (getopt.optarg); + break; case 'l': - opt_nloops = ACE_OS::atoi (getopt.optarg); - break; + opt_nloops = ACE_OS::atoi (getopt.optarg); + break; case 'd': - opt_pass_notify_data = 1; - break; + opt_pass_notify_data = 1; + break; } // Sets up the correct reactor (based on platform and options) @@ -235,7 +235,8 @@ main (int, ASYS_TCHAR *[]) { ACE_START_TEST (ASYS_TEXT ("Notify_Performance_Test")); - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("threads not supported on this platform\n"))); + ACE_ERROR ((LM_INFO, + ASYS_TEXT ("threads not supported on this platform\n"))); ACE_END_TEST; return 0; diff --git a/tests/Pipe_Test.cpp b/tests/Pipe_Test.cpp index 8de9809fa02..07971699d08 100644 --- a/tests/Pipe_Test.cpp +++ b/tests/Pipe_Test.cpp @@ -37,7 +37,7 @@ static void print_usage_and_die (void) { ACE_DEBUG ((LM_DEBUG, - "usage: %n [-d (don't close pipes)] [-c (child process)] [-i (iterations)] \n")); + "usage: %n [-d (don't close pipes)] [-c (child process)] [-i (iterations)] \n")); ACE_OS::exit (1); } @@ -74,7 +74,7 @@ open (ACE_Pipe &pipe, ACE_DEBUG ((LM_DEBUG, "opening %s\n", name)); ACE_ASSERT (pipe.open () != -1); ACE_ASSERT (pipe.read_handle () != ACE_INVALID_HANDLE - && pipe.write_handle () != ACE_INVALID_HANDLE); + && pipe.write_handle () != ACE_INVALID_HANDLE); if (close_pipe) pipe.close (); @@ -85,7 +85,7 @@ main (int argc, char *argv[]) { #if defined (ACE_LACKS_FORK) ACE_START_TEST ("Pipe_Test"); - ACE_ERROR ((LM_ERROR, "fork is not supported on this platform\n")); + ACE_ERROR ((LM_INFO, "fork is not supported on this platform\n")); ACE_END_TEST; #else /* ! ACE_LACKS_FORK */ parse_args (argc, argv); @@ -110,23 +110,23 @@ main (int argc, char *argv[]) ACE_Process_Options options; if (close_pipe == 0) - options.command_line (ACE_TEXT ("Pipe_Test") ACE_PLATFORM_EXE_SUFFIX ACE_TEXT (" -c -d")); + options.command_line (ACE_TEXT ("Pipe_Test") ACE_PLATFORM_EXE_SUFFIX ACE_TEXT (" -c -d")); else - options.command_line (ACE_TEXT ("Pipe_Test") ACE_PLATFORM_EXE_SUFFIX ACE_TEXT (" -c")); + options.command_line (ACE_TEXT ("Pipe_Test") ACE_PLATFORM_EXE_SUFFIX ACE_TEXT (" -c")); for (int i = 0; i < ::iterations; i++) - { - ACE_Process server; + { + ACE_Process server; - ACE_ASSERT (server.spawn (options) != -1); + ACE_ASSERT (server.spawn (options) != -1); - ACE_DEBUG ((LM_DEBUG, "Server forked with pid = %d.\n", + ACE_DEBUG ((LM_DEBUG, "Server forked with pid = %d.\n", server.getpid ())); - // Wait for the process we just created to exit. - server.wait (); - ACE_DEBUG ((LM_DEBUG, "Server %d finished\n", server.getpid ())); - } + // Wait for the process we just created to exit. + server.wait (); + ACE_DEBUG ((LM_DEBUG, "Server %d finished\n", server.getpid ())); + } ACE_END_TEST; } #endif /* ! ACE_LACKS_FORK */ diff --git a/tests/Priority_Buffer_Test.cpp b/tests/Priority_Buffer_Test.cpp index d3c7b7e6522..229733b06f5 100644 --- a/tests/Priority_Buffer_Test.cpp +++ b/tests/Priority_Buffer_Test.cpp @@ -154,7 +154,8 @@ main (int, ASYS_TCHAR *[]) // Wait for producer and consumer threads to exit. ACE_Thread_Manager::instance ()->wait (); #else - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("threads not supported on this platform\n"))); + ACE_ERROR ((LM_INFO, + ASYS_TEXT ("threads not supported on this platform\n"))); #endif /* ACE_HAS_THREADS */ ACE_END_TEST; return 0; diff --git a/tests/Priority_Task_Test.cpp b/tests/Priority_Task_Test.cpp index ff0b81a8d9d..6b258d43f70 100644 --- a/tests/Priority_Task_Test.cpp +++ b/tests/Priority_Task_Test.cpp @@ -151,7 +151,7 @@ main (int argc, ASYS_TCHAR *argv[]) if (argc <= 1) // Disable LM_DEBUG messages. - ACE_Log_Msg::instance ()->priority_mask + ACE_Log_Msg::instance ()->priority_mask (ACE_Log_Msg::instance ()->priority_mask () & ~ LM_DEBUG); else if (argc == 2) { @@ -208,7 +208,8 @@ main (int argc, ASYS_TCHAR *argv[]) } #else - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("threads not supported on this platform\n"))); + ACE_ERROR ((LM_INFO, + ASYS_TEXT ("threads not supported on this platform\n"))); #endif /* ACE_HAS_THREADS */ // Re-enable LM_DEBUG messages. diff --git a/tests/Process_Mutex_Test.cpp b/tests/Process_Mutex_Test.cpp index 21c06793c04..21fc819e509 100644 --- a/tests/Process_Mutex_Test.cpp +++ b/tests/Process_Mutex_Test.cpp @@ -92,7 +92,7 @@ main (int argc, char *argv[]) { #if defined (ACE_LACKS_FORK) ACE_START_TEST ("Process_Mutex_Test"); - ACE_ERROR ((LM_ERROR, "fork is not supported on this platform\n")); + ACE_ERROR ((LM_INFO, "fork is not supported on this platform\n")); ACE_END_TEST; #else /* ! ACE_LACKS_FORK */ diff --git a/tests/Reactor_Exceptions_Test.cpp b/tests/Reactor_Exceptions_Test.cpp index 04080ccf19f..5572af19749 100644 --- a/tests/Reactor_Exceptions_Test.cpp +++ b/tests/Reactor_Exceptions_Test.cpp @@ -178,7 +178,7 @@ main (int argc, ASYS_TCHAR *argv[]) thr_mgr->spawn (ACE_THR_FUNC (worker)); #else // Need to figure out how to implement this test. - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_INFO, ASYS_TEXT ("threads not supported on this platform\n"))); #endif /* ACE_HAS_THREADS */ @@ -199,7 +199,7 @@ main (int argc, ASYS_TCHAR *argv[]) #else ACE_UNUSED_ARG (argc); ACE_UNUSED_ARG (argv); - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_INFO, ASYS_TEXT ("C++ exceptions not supported on this platform\n"))); #endif /* ACE_HAS_EXCEPTIONS */ diff --git a/tests/Reactor_Notify_Test.cpp b/tests/Reactor_Notify_Test.cpp index d3a8020664f..b00202452ac 100644 --- a/tests/Reactor_Notify_Test.cpp +++ b/tests/Reactor_Notify_Test.cpp @@ -291,7 +291,7 @@ main (int, ASYS_TCHAR *[]) ASYS_TEXT ("(%t) running tests with notify pipe disabled\n"))); run_test (1); #else - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_INFO, ASYS_TEXT ("threads not supported on this platform\n"))); #endif /* ACE_HAS_THREADS */ ACE_END_TEST; diff --git a/tests/Reactor_Performance_Test.cpp b/tests/Reactor_Performance_Test.cpp index bedf2818827..00fbf89613e 100644 --- a/tests/Reactor_Performance_Test.cpp +++ b/tests/Reactor_Performance_Test.cpp @@ -426,7 +426,7 @@ main (int, ASYS_TCHAR *[]) { ACE_START_TEST (ASYS_TEXT ("Reactor_Performance_Test")); - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_INFO, ASYS_TEXT ("threads not supported on this platform\n"))); ACE_END_TEST; diff --git a/tests/Reactors_Test.cpp b/tests/Reactors_Test.cpp index 69a30e1ac3d..457ab3ae234 100644 --- a/tests/Reactors_Test.cpp +++ b/tests/Reactors_Test.cpp @@ -93,7 +93,7 @@ Test_Task::~Test_Task (void) int Test_Task::open (void *args) { - this->reactor (ACE_reinterpret_cast (ACE_Reactor *, + this->reactor (ACE_reinterpret_cast (ACE_Reactor *, args)); return this->activate (THR_NEW_LWP); } @@ -173,7 +173,7 @@ Test_Task::handle_input (ACE_HANDLE) static void * worker (void *args) { - ACE_Reactor *reactor = ACE_reinterpret_cast (ACE_Reactor *, + ACE_Reactor *reactor = ACE_reinterpret_cast (ACE_Reactor *, args); // Make this thread the owner of the Reactor's event loop. @@ -262,7 +262,7 @@ main (int, ASYS_TCHAR *[]) ASYS_TEXT ("(%t) all threads are finished \n"))); #else - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_INFO, ASYS_TEXT ("threads not supported on this platform\n"))); #endif /* ACE_HAS_THREADS */ ACE_END_TEST; diff --git a/tests/Reader_Writer_Test.cpp b/tests/Reader_Writer_Test.cpp index d7350cd5eec..8004972f6cb 100644 --- a/tests/Reader_Writer_Test.cpp +++ b/tests/Reader_Writer_Test.cpp @@ -138,7 +138,7 @@ reader (void *) ASYS_TEXT ("(%t) upgraded to write lock!\n"))); ACE_thread_t self = ACE_Thread::self (); - + shared_data = self; data = self; @@ -199,11 +199,11 @@ writer (void *) current_writers++; if (current_writers > 1) - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (%t) other writers found!!!\n"))); if (current_readers > 0) - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (%t) readers found!!!\n"))); ACE_thread_t self = ACE_Thread::self (); @@ -221,7 +221,7 @@ writer (void *) } current_writers--; - + ACE_DEBUG((LM_DEBUG, ASYS_TEXT (" (%t) write %d done at %T\n"), iterations)); } return 0; @@ -254,32 +254,32 @@ int main (int argc, ASYS_TCHAR *argv[]) current_readers = 0; // Possibly already done current_writers = 0; // Possibly already done - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (%t) main thread starting\n"))); if (ACE_Thread_Manager::instance ()->spawn_n (n_readers, ACE_THR_FUNC (reader), 0, THR_NEW_LWP) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), + ACE_ERROR_RETURN ((LM_ERROR, + ASYS_TEXT ("%p\n"), ASYS_TEXT ("spawn_n")), 1); else if (ACE_Thread_Manager::instance ()->spawn_n (n_writers, ACE_THR_FUNC (writer), 0, THR_NEW_LWP) == -1) - ACE_ERROR_RETURN ((LM_ERROR, - ASYS_TEXT ("%p\n"), + ACE_ERROR_RETURN ((LM_ERROR, + ASYS_TEXT ("%p\n"), ASYS_TEXT ("spawn_n")), 1); ACE_Thread_Manager::instance ()->wait (); - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_DEBUG, ASYS_TEXT (" (%t) exiting main thread\n"))); #else ACE_UNUSED_ARG (argc); ACE_UNUSED_ARG (argv); - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_INFO, ASYS_TEXT ("threads not supported on this platform\n"))); #endif /* ACE_HAS_THREADS */ ACE_END_TEST; diff --git a/tests/SPIPE_Test.cpp b/tests/SPIPE_Test.cpp index 329578cf040..0fdcb2c56d7 100644 --- a/tests/SPIPE_Test.cpp +++ b/tests/SPIPE_Test.cpp @@ -131,7 +131,7 @@ main (int, char *[]) ACE_Thread_Manager::instance ()->wait (); #endif /* !ACE_LACKS_EXEC */ #else - ACE_DEBUG ((LM_DEBUG, + ACE_DEBUG ((LM_INFO, "SPIPE is not supported on this platform\n")); #endif /* ACE_HAS_STREAM_PIPES || ACE_WIN32 */ ACE_END_TEST; diff --git a/tests/SV_Shared_Memory_Test.cpp b/tests/SV_Shared_Memory_Test.cpp index 772510a7bd1..a4efe1967c2 100644 --- a/tests/SV_Shared_Memory_Test.cpp +++ b/tests/SV_Shared_Memory_Test.cpp @@ -147,7 +147,7 @@ main (int, char *[]) break; } #else - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_INFO, "SYSV IPC and fork are not supported on this platform\n")); #endif /* ACE_HAS_SYSV_IPC */ ACE_END_TEST; diff --git a/tests/Semaphore_Test.cpp b/tests/Semaphore_Test.cpp index 705fa10a861..ed8e19d9a56 100644 --- a/tests/Semaphore_Test.cpp +++ b/tests/Semaphore_Test.cpp @@ -231,7 +231,8 @@ int main (int argc, ASYS_TCHAR *argv[]) #else ACE_UNUSED_ARG (argc); ACE_UNUSED_ARG (argv); - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("Threads not supported on this platform\n"))); + ACE_ERROR ((LM_INFO, + ASYS_TEXT ("Threads not supported on this platform\n"))); #endif /* ACE_HAS_THREADS */ ACE_END_TEST; return test_result; diff --git a/tests/TSS_Test.cpp b/tests/TSS_Test.cpp index bfb6e79a27a..676b9a27600 100644 --- a/tests/TSS_Test.cpp +++ b/tests/TSS_Test.cpp @@ -287,7 +287,7 @@ main (int, ASYS_TCHAR *[]) Errno::deallocate_lock (); #else - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_INFO, ASYS_TEXT ("threads are not supported on this platform\n"))); #endif /* ACE_HAS_THREADS */ diff --git a/tests/Task_Test.cpp b/tests/Task_Test.cpp index 8834a68c5a8..a0232058859 100644 --- a/tests/Task_Test.cpp +++ b/tests/Task_Test.cpp @@ -4,7 +4,7 @@ // // = LIBRARY // tests -// +// // = FILENAME // Task_Test.cpp // @@ -15,7 +15,7 @@ // // = AUTHOR // Prashant Jain and Doug C. Schmidt -// +// // ============================================================================ #include "test_config.h" @@ -34,9 +34,9 @@ class Barrier_Task : public ACE_Task<ACE_MT_SYNCH> { public: Barrier_Task (ACE_Thread_Manager *thr_mgr, - int n_threads, - int n_iterations); - + int n_threads, + int n_iterations); + virtual int svc (void); // Iterate <n_iterations> time printing off a message and "waiting" // for all other threads to complete this iteration. @@ -50,25 +50,25 @@ private: // Number of iterations to run. }; -Barrier_Task::Barrier_Task (ACE_Thread_Manager *thr_mgr, - int n_threads, - int n_iterations) - : ACE_Task<ACE_MT_SYNCH> (thr_mgr), - barrier_ (n_threads), - n_iterations_ (n_iterations) +Barrier_Task::Barrier_Task (ACE_Thread_Manager *thr_mgr, + int n_threads, + int n_iterations) + : ACE_Task<ACE_MT_SYNCH> (thr_mgr), + barrier_ (n_threads), + n_iterations_ (n_iterations) { // Create worker threads. if (this->activate (THR_NEW_LWP, n_threads) == -1) ACE_ERROR ((LM_ERROR, ASYS_TEXT ("%p\n"), ASYS_TEXT ("activate failed"))); } - + // Iterate <n_iterations> time printing off a message and "waiting" // for all other threads to complete this iteration. -int -Barrier_Task::svc (void) -{ - for (int iterations = 1; +int +Barrier_Task::svc (void) +{ + for (int iterations = 1; iterations <= this->n_iterations_; iterations++) { @@ -86,7 +86,7 @@ Barrier_Task::svc (void) #endif /* ACE_HAS_THREADS */ -int +int main (int, ASYS_TCHAR *[]) { ACE_START_TEST (ASYS_TEXT ("Task_Test")); @@ -95,14 +95,15 @@ main (int, ASYS_TCHAR *[]) int n_threads = ACE_MAX_THREADS; int n_iterations = ACE_MAX_ITERATIONS; - Barrier_Task barrier_task (ACE_Thread_Manager::instance (), - n_threads, - n_iterations); + Barrier_Task barrier_task (ACE_Thread_Manager::instance (), + n_threads, + n_iterations); ACE_Thread_Manager::instance ()->wait (); #else - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("threads not supported on this platform\n"))); + ACE_ERROR ((LM_INFO, + ASYS_TEXT ("threads not supported on this platform\n"))); #endif /* ACE_HAS_THREADS */ ACE_END_TEST; return 0; diff --git a/tests/Thread_Manager_Test.cpp b/tests/Thread_Manager_Test.cpp index 754ee431c56..59ca9d841f8 100644 --- a/tests/Thread_Manager_Test.cpp +++ b/tests/Thread_Manager_Test.cpp @@ -267,7 +267,8 @@ main (int, ASYS_TCHAR *[]) signal_catcher = 0; #else - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("threads not supported on this platform\n"))); + ACE_ERROR ((LM_INFO, + ASYS_TEXT ("threads not supported on this platform\n"))); #endif /* ACE_HAS_THREADS */ ACE_END_TEST; diff --git a/tests/Thread_Mutex_Test.cpp b/tests/Thread_Mutex_Test.cpp index b37cf748722..e65de696341 100644 --- a/tests/Thread_Mutex_Test.cpp +++ b/tests/Thread_Mutex_Test.cpp @@ -72,7 +72,8 @@ spawn (void) ACE_Thread_Manager::instance ()->wait (); #else - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("threads not supported on this platform\n"))); + ACE_ERROR ((LM_INFO, + ASYS_TEXT ("threads not supported on this platform\n"))); #endif /* ACE_HAS_THREADS */ } diff --git a/tests/Thread_Pool_Reactor_Test.cpp b/tests/Thread_Pool_Reactor_Test.cpp index 73681e97408..50bab02466f 100644 --- a/tests/Thread_Pool_Reactor_Test.cpp +++ b/tests/Thread_Pool_Reactor_Test.cpp @@ -373,7 +373,8 @@ main (int, ASYS_TCHAR *[]) { ACE_START_TEST (ASYS_TEXT ("Thread_Pool_Reactor_Test")); - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("threads not supported on this platform\n"))); + ACE_ERROR ((LM_INFO, + ASYS_TEXT ("threads not supported on this platform\n"))); ACE_END_TEST; return 0; diff --git a/tests/Thread_Pool_Test.cpp b/tests/Thread_Pool_Test.cpp index 0b8a5e73eb0..f87f8df8036 100644 --- a/tests/Thread_Pool_Test.cpp +++ b/tests/Thread_Pool_Test.cpp @@ -111,21 +111,21 @@ Thread_Pool::svc (void) int length = mb->length (); if (length > 0) - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) in iteration %d, queue len = %d, length = %d, text = \"%*s\"\n"), - count, this->msg_queue ()->message_count (), - length, length - 1, mb->rd_ptr ())); + ACE_DEBUG ((LM_DEBUG, + ASYS_TEXT ("(%t) in iteration %d, queue len = %d, length = %d, text = \"%*s\"\n"), + count, this->msg_queue ()->message_count (), + length, length - 1, mb->rd_ptr ())); // We're responsible for deallocating this. mb->release (); if (length == 0) - { - ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) in iteration %d, queue len = %d, got NULL message, exiting\n"), - count, this->msg_queue ()->message_count ())); - break; - } + { + ACE_DEBUG ((LM_DEBUG, + ASYS_TEXT ("(%t) in iteration %d, queue len = %d, got NULL message, exiting\n"), + count, this->msg_queue ()->message_count ())); + break; + } } // Note that the ACE_Task::svc_run () method automatically removes @@ -137,7 +137,7 @@ int Thread_Pool::open (void *) { ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) producer start, dumping the Thread_Pool\n"))); + ASYS_TEXT ("(%t) producer start, dumping the Thread_Pool\n"))); this->dump (); // Create a pool of worker threads. @@ -150,15 +150,15 @@ Thread_Pool::open (void *) // Allocate a new message. ACE_NEW_RETURN (mb, - ACE_Message_Block (BUFSIZ, ACE_Message_Block::MB_DATA, - 0, 0, 0, &this->lock_adapter_), - -1); + ACE_Message_Block (BUFSIZ, ACE_Message_Block::MB_DATA, + 0, 0, 0, &this->lock_adapter_), + -1); ACE_OS::sprintf ((ASYS_TCHAR *) mb->rd_ptr (), ASYS_TEXT ("%d\n"), count); int n = ACE_OS::strlen ((ASYS_TCHAR *)mb->rd_ptr ()); if (count == 0 || (count % 20 == 0)) - ACE_OS::sleep (1); + ACE_OS::sleep (1); // Send a normal message to the waiting threads and continue // producing. @@ -166,27 +166,27 @@ Thread_Pool::open (void *) // Pass the message to the Thread_Pool. if (this->put (mb) == -1) - ACE_ERROR ((LM_ERROR, ASYS_TEXT (" (%t) %p\n"), ASYS_TEXT ("put"))); + ACE_ERROR ((LM_ERROR, ASYS_TEXT (" (%t) %p\n"), ASYS_TEXT ("put"))); } // Send a shutdown message to the waiting threads and exit. ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("\n(%t) sending shutdown message to %d threads, dump of task:\n"), - this->thr_count ())); + ASYS_TEXT ("\n(%t) sending shutdown message to %d threads, dump of task:\n"), + this->thr_count ())); this->dump (); ACE_Message_Block *mb; ACE_NEW_RETURN (mb, - ACE_Message_Block (0, ACE_Message_Block::MB_DATA, - 0, 0, 0, &this->lock_adapter_), - -1); + ACE_Message_Block (0, ACE_Message_Block::MB_DATA, + 0, 0, 0, &this->lock_adapter_), + -1); for (int i = this->thr_count (); i > 0; i--) { ACE_DEBUG ((LM_DEBUG, - ASYS_TEXT ("(%t) EOF, enqueueing NULL block for thread = %d\n"), - i)); + ASYS_TEXT ("(%t) EOF, enqueueing NULL block for thread = %d\n"), + i)); // Enqueue an empty message to flag each consumer to shutdown. // Note that we use reference counting to avoid having to copy @@ -194,7 +194,7 @@ Thread_Pool::open (void *) ACE_Message_Block *dup = mb->duplicate (); if (this->put (dup) == -1) - ACE_ERROR ((LM_ERROR, ASYS_TEXT (" (%t) %p\n"), ASYS_TEXT ("put"))); + ACE_ERROR ((LM_ERROR, ASYS_TEXT (" (%t) %p\n"), ASYS_TEXT ("put"))); } mb->release (); @@ -240,7 +240,8 @@ main (int, ASYS_TCHAR *[]) ACE_DEBUG ((LM_DEBUG, ASYS_TEXT ("(%t) destroying worker tasks and exiting...\n"))); #else - ACE_ERROR ((LM_ERROR, ASYS_TEXT ("threads not supported on this platform\n"))); + ACE_ERROR ((LM_INFO, + ASYS_TEXT ("threads not supported on this platform\n"))); #endif /* ACE_HAS_THREADS */ ACE_END_TEST; return 0; diff --git a/tests/Tokens_Test.cpp b/tests/Tokens_Test.cpp index 82388662c68..b4b75cb6c7d 100644 --- a/tests/Tokens_Test.cpp +++ b/tests/Tokens_Test.cpp @@ -253,7 +253,7 @@ main (int, char *[]) ACE_DEBUG ((LM_DEBUG, "(%t) main thread exiting.\n")); #else - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_INFO, "threads not supported on this platform\n")); #endif /* ACE_HAS_THREADS */ ACE_END_TEST; diff --git a/tests/UPIPE_SAP_Test.cpp b/tests/UPIPE_SAP_Test.cpp index b7f1cdb68ff..f7135d3c44e 100644 --- a/tests/UPIPE_SAP_Test.cpp +++ b/tests/UPIPE_SAP_Test.cpp @@ -171,10 +171,10 @@ main (int, char *[]) #else #if !defined (ACE_HAS_THREADS) - ACE_ERROR ((LM_ERROR, "threads not supported on this platform\n")); + ACE_ERROR ((LM_INFO, "threads not supported on this platform\n")); #else #if !defined (ACE_HAS_STREAM_PIPES) && !defined (ACE_WIN32) - ACE_ERROR ((LM_ERROR, "UPIPE is not supported on this platform\n")); + ACE_ERROR ((LM_INFO, "UPIPE is not supported on this platform\n")); #endif /* !defined (ACE_HAS_STREAM_PIPES) && ! defined (ACE_WIN32) */ #endif /* !defined (ACE_HAS_THREADS) */ #endif /* defined (ACE_HAS_THREADS) && (defined (ACE_HAS_STREAM_PIPES) || defined (ACE_WIN32)) */ diff --git a/tests/Upgradable_RW_Test.cpp b/tests/Upgradable_RW_Test.cpp index 1311eb314ab..0433b3f9250 100644 --- a/tests/Upgradable_RW_Test.cpp +++ b/tests/Upgradable_RW_Test.cpp @@ -175,7 +175,7 @@ Reader_Task::svc (void) find_last (); #if defined (RW_MUTEX) if (use_try_upgrade) - result = + result = rw_mutex.tryacquire_write_upgrade (); #endif /* RW_MUTEX */ @@ -469,7 +469,7 @@ main (int argc, ASYS_TCHAR *argv[]) #else ACE_UNUSED_ARG (argc); ACE_UNUSED_ARG (argv); - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_INFO, ASYS_TEXT ("threads not supported on this platform\n"))); #endif /* ACE_HAS_THREADS */ diff --git a/tests/XtReactor_Test.cpp b/tests/XtReactor_Test.cpp index a3b90b84c31..dd40820c6a0 100644 --- a/tests/XtReactor_Test.cpp +++ b/tests/XtReactor_Test.cpp @@ -57,10 +57,10 @@ USELIB("..\ace\aced.lib"); static void set_label(Widget w, const char *p) { - XtVaSetValues (w, - XmNlabelString, - XmStringCreateLocalized( (char*) p), - NULL); + XtVaSetValues (w, + XmNlabelString, + XmStringCreateLocalized( (char*) p), + NULL); } #define LABEL_WIDGET xmLabelWidgetClass #define BUTTON_WIDGET xmPushButtonWidgetClass @@ -289,25 +289,25 @@ main (int argc, char *argv[]) //"Stop Test" button. goodbye = XtCreateWidget ( (char *) "goodbye", - BUTTON_WIDGET, - digits_rc, - NULL, - 0); + BUTTON_WIDGET, + digits_rc, + NULL, + 0); set_label(goodbye, "Stop Test"); //"Press Me" button PressMe = XtCreateWidget ((char *) "PressMe", - BUTTON_WIDGET, - digits_rc, - NULL, - 0); + BUTTON_WIDGET, + digits_rc, + NULL, + 0); //Display for event counter - lbl = XtCreateWidget ((char *) "label_for_event_one", - LABEL_WIDGET, - digits_rc, - NULL, - 0); + lbl = XtCreateWidget ((char *) "label_for_event_one", + LABEL_WIDGET, + digits_rc, + NULL, + 0); set_label(lbl, "label_for_all_events"); int ac = 0; children[ac++] = goodbye; @@ -366,7 +366,7 @@ main (int argc, char *argv[]) #else ACE_UNUSED_ARG (argc); ACE_UNUSED_ARG (argv); - ACE_ERROR ((LM_ERROR, + ACE_ERROR ((LM_INFO, "Xt not supported on this platform\n")); #endif /* ACE_HAS_XT */ ACE_END_TEST; |