diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-11-07 12:43:48 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-11-07 12:43:48 +0000 |
| commit | cbd2b4a616348e7505fdc2e566b4a6b2c523bb54 (patch) | |
| tree | df865f05f04c3871febbdea2a114f7320ff6dec8 | |
| parent | ff0f5b27d1654bbcc2a4c760dbfd5bb8809c48e9 (diff) | |
| download | ATCD-cbd2b4a616348e7505fdc2e566b4a6b2c523bb54.tar.gz | |
Tue Nov 7 13:43:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
| -rw-r--r-- | TAO/tests/Two_Objects/server.cpp | 8 | ||||
| -rw-r--r-- | TAO/tests/Two_Objects/worker.cpp | 6 | ||||
| -rw-r--r-- | TAO/tests/Two_Objects/worker.h | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/TAO/tests/Two_Objects/server.cpp b/TAO/tests/Two_Objects/server.cpp index 639cb344ab8..0e6d5a8e9f2 100644 --- a/TAO/tests/Two_Objects/server.cpp +++ b/TAO/tests/Two_Objects/server.cpp @@ -10,7 +10,7 @@ ACE_RCSID(Test, server, "$Id$") int msglen = 100; //default length of reply message is 100 bytes int nthreads = 2; const char *ior_output_file = "test.ior"; -int timeout = 30; //default timeout for ORB is 30 sec +int orb_timeout = 30; //default timeout for ORB is 30 sec int @@ -35,7 +35,7 @@ parse_args (int argc, char *argv[]) break; case 't': - timeout = ACE_OS::atoi (get_opts.opt_arg ()); + orb_timeout = ACE_OS::atoi (get_opts.opt_arg ()); break; case '?': @@ -90,7 +90,7 @@ main (int argc, char *argv[]) ACE_DEBUG(( LM_DEBUG, "ior file = %s\t#threads = %d\t" "msglen = %d\tORB timeout = %d sec\n", - ior_output_file, nthreads, msglen, timeout )); + ior_output_file, nthreads, msglen, orb_timeout )); // Create the factory servant Object_Factory_i *factory_impl; @@ -127,7 +127,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // Instantiate the specified # of worker threads - Worker worker (orb.in (), timeout); + Worker worker (orb.in (), orb_timeout); if (worker.activate (THR_NEW_LWP | THR_JOINABLE, nthreads) != 0) diff --git a/TAO/tests/Two_Objects/worker.cpp b/TAO/tests/Two_Objects/worker.cpp index b1581d8baa9..ae0889a419a 100644 --- a/TAO/tests/Two_Objects/worker.cpp +++ b/TAO/tests/Two_Objects/worker.cpp @@ -6,7 +6,7 @@ Worker::Worker (CORBA::ORB_ptr orb, int time) : orb_ (CORBA::ORB::_duplicate (orb)), - timeout_(time) + orb_timeout_(time) { } @@ -17,9 +17,9 @@ Worker::svc (void) ACE_TRY { - ACE_Time_Value tv (timeout_); + ACE_Time_Value tv (orb_timeout_); - ///orb times out after <timeout> seconds + // orb times out after <timeout> seconds this->orb_->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } diff --git a/TAO/tests/Two_Objects/worker.h b/TAO/tests/Two_Objects/worker.h index 42ed1fe0cb9..1e2a5a3b54e 100644 --- a/TAO/tests/Two_Objects/worker.h +++ b/TAO/tests/Two_Objects/worker.h @@ -25,7 +25,7 @@ private: // The orb CORBA::ORB_var orb_; - int timeout_; + int orb_timeout_; }; #endif /* TAO_TWO_OBJECTS_WORKER_H */ |