summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaga <naga@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-16 02:15:31 +0000
committernaga <naga@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-16 02:15:31 +0000
commitdd0ecce2520de3372ed6eb58f3e7dd3fb4252baa (patch)
tree066e842031a204e0509dcfc69d755a3e00b55e1a
parent9f9998bd492ae457eb8658254cecd7a65467c7da (diff)
downloadATCD-dd0ecce2520de3372ed6eb58f3e7dd3fb4252baa.tar.gz
*** empty log message ***
-rw-r--r--TAO/ChangeLog-98c3
-rwxr-xr-xTAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit_Test6
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp6
-rw-r--r--TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h3
4 files changed, 7 insertions, 11 deletions
diff --git a/TAO/ChangeLog-98c b/TAO/ChangeLog-98c
index a6a984eb2fd..904468dabfd 100644
--- a/TAO/ChangeLog-98c
+++ b/TAO/ChangeLog-98c
@@ -11,6 +11,9 @@ Thu Oct 15 20:08:36 1998 Nagarajan Surendran <naga@cs.wustl.edu>
* performance-tests/Cubit/TAO/MT_Cubit/Makefile:
Removed liborbsvcs from the LD_LIBS.
+
+ * performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit_Test:
+ Removed -s option for server and client.
Thu Oct 15 17:29:42 1998 Nanbor Wang <nanbor@cs.wustl.edu>
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit_Test b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit_Test
index a66ecc0d236..dd08914f44b 100755
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit_Test
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit_Test
@@ -56,7 +56,7 @@ trap 'kill -15 $server_pid; /bin/rm -f $ior_file' 0 1 2 15
########
######## Start server and save its pid.
########
-$server_exec_prefix ./server -s -f $ior_file -t $threads $iiop_lite > \
+$server_exec_prefix ./server -f $ior_file -t $threads $iiop_lite > \
${tmp}server.log 2>&1 &
server_pid=$!
@@ -71,10 +71,10 @@ done
if [ "$remote_host" ]; then
rsh $remote_host \
"cd $PWD; LD_LIBRARY_PATH=$LD_LIBRARY_PATH $client_exec_prefix \
- ./client -s -f $ior_file -t $threads -n $iterations $iiop_lite" > \
+ ./client -f $ior_file -t $threads -n $iterations $iiop_lite" > \
${tmp}client-${threads}.log 2>&1
else
$client_exec_prefix \
- ./client -s -f $ior_file -t $threads -n $iterations $iiop_lite > \
+ ./client -f $ior_file -t $threads -n $iterations $iiop_lite > \
${tmp}client-${threads}.log 2>&1
fi
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
index 3cd61fbb636..f2c661de961 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
@@ -35,7 +35,6 @@ Task_State::Task_State (void)
shutdown_ (0),
oneway_ (0),
one_ior_ (0),
- use_name_service_ (1),
one_to_n_test_ (0),
context_switch_test_ (0),
iors_ (0),
@@ -58,7 +57,7 @@ Task_State::Task_State (void)
int
Task_State::parse_args (int argc,char *argv[])
{
- ACE_Get_Opt opts (argc, argv, "U:mu:sn:t:d:rxof:g:1cl");
+ ACE_Get_Opt opts (argc, argv, "U:mu:n:t:d:rxof:g:1cl");
int c;
while ((c = opts ()) != -1)
@@ -81,9 +80,6 @@ Task_State::parse_args (int argc,char *argv[])
use_utilization_test_ = 1;
loop_count_ = util_time_ = ACE_OS::atoi (opts.optarg);
break;
- case 's':
- use_name_service_ = 0;
- break;
case 'f':
ior_file_ = ACE_OS::strdup (opts.optarg);
break;
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
index 63d97283372..0461a748e13 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
@@ -150,9 +150,6 @@ public:
char *one_ior_;
// Ior array used if utilization test is run.
- u_int use_name_service_;
- // Flag that say if we are using the or not the name service.
-
u_int one_to_n_test_;
// indicates whether we are running the "1 to n" test, which has 1
// low priority servant and n low priority clients.