diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2002-11-28 20:46:55 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2002-11-28 20:46:55 +0000 |
| commit | 5f131f71b5f0c5112426c923c53cbedc9c69df6b (patch) | |
| tree | 60e2199afab1a5a3610736147d78634339b683d7 | |
| parent | 8a529c40bf8df188111e5f92d79d3e4ebb744f39 (diff) | |
| download | ATCD-5f131f71b5f0c5112426c923c53cbedc9c69df6b.tar.gz | |
ChangeLogTag: Thu Nov 28 14:45:43 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
| -rw-r--r-- | TAO/ChangeLog | 7 | ||||
| -rw-r--r-- | TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp | 64 | ||||
| -rw-r--r-- | TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h | 3 | ||||
| -rw-r--r-- | TAO/tests/Bug_1361_Regression/shutdown.cpp | 2 |
4 files changed, 46 insertions, 30 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index 8e35b9be4be..d1058b08bce 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,10 @@ +Thu Nov 28 14:45:43 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> + + * tests/Bug_1361_Regression/Server_Thread_Pool.cpp (svc): + * tests/Bug_1361_Regression/Server_Thread_Pool.h: + * tests/Bug_1361_Regression/shutdown.cpp: Fixed warnings and + compile errors. + Thu Nov 28 07:57:12 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu> * orbsvcs/orbsvcs/Notify/Admin.h: diff --git a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp index fb4f3108206..0eb5cd39547 100644 --- a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp +++ b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.cpp @@ -11,7 +11,7 @@ Thread_Pool::close (u_long) } Thread_Pool::Thread_Pool (ACE_Thread_Manager *thr_mgr, - int n_threads) + int n_threads) : ACE_Task<ACE_SYNCH> (thr_mgr), nt_(n_threads) { @@ -98,21 +98,21 @@ Thread_Pool::svc (void) #endif if (this->getq (mb) == -1) - { - ACE_ERROR ((LM_ERROR, - "(%t) in iteration %d, got result -1, exiting\n", + { + ACE_ERROR ((LM_ERROR, + "(%t) in iteration %d, got result -1, exiting\n", count)); break; - } + } #if 0 if (mb->length() == 0) - { - ACE_DEBUG ((LM_DEBUG, - "(%t) in iteration %d, got NULL message, exiting\n", - count)); - break; - } + { + ACE_DEBUG ((LM_DEBUG, + "(%t) in iteration %d, got NULL message, exiting\n", + count)); + break; + } #endif Test::Echo_var echo = (Test::Echo_ptr)mb->base(); @@ -121,28 +121,38 @@ Thread_Pool::svc (void) // mb->release (); if (CORBA::is_nil(echo.in())) - { - ACE_DEBUG ((LM_DEBUG, - "(%t) in iteration %d, got NULL message, exiting\n", - count)); - break; - } + { + ACE_DEBUG ((LM_DEBUG, + "(%t) in iteration %d, got NULL message, exiting\n", + count)); + break; + } // Keep calling a few times after receiving exceptions - for(int exception_count = 50; exception_count; --exception_count) { + for(int exception_count = 50; exception_count; --exception_count) + { + ACE_TRY_NEW_ENV { // keep calling until get an exception - while(true) { - if (0) { - Test::Payload pload(10); pload.length(10); - ACE_OS::memset(pload.get_buffer(), pload.length(), 0); - echo->echo_payload(pload); - } else { - Test::Payload_var pout; - echo->echo_payload_out(pout.out()); + while(true) + { + if (0) + { + Test::Payload pload(10); + pload.length(10); + ACE_OS::memset(pload.get_buffer(), pload.length(), 0); + echo->echo_payload (pload + ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; + + } + else + { + Test::Payload_var pout; + echo->echo_payload_out(pout.out()); + } } - } } ACE_CATCHANY { diff --git a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h index e38c872c096..cc51a771f4e 100644 --- a/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h +++ b/TAO/tests/Bug_1361_Regression/Server_Thread_Pool.h @@ -33,7 +33,7 @@ public: virtual int svc (void); - virtual int Thread_Pool::put (Test::Echo_ptr echoptr); + virtual int put (Test::Echo_ptr echoptr); virtual int put (ACE_Message_Block *mb, ACE_Time_Value *tv = 0); @@ -44,4 +44,3 @@ private: int nt_; // number of threads // Close hook. }; - diff --git a/TAO/tests/Bug_1361_Regression/shutdown.cpp b/TAO/tests/Bug_1361_Regression/shutdown.cpp index a3187d8d0ad..bb933fea5ca 100644 --- a/TAO/tests/Bug_1361_Regression/shutdown.cpp +++ b/TAO/tests/Bug_1361_Regression/shutdown.cpp @@ -42,7 +42,7 @@ main (int argc, char *argv[]) 1); } - server->shutdown(ACE_ENV_ARG_PARAMETER); + server->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); |