ChangeLogTag: Fri Dec 28 19:22:08 2001 Johnny Willemsen <jwillemsen@remedy.nl>

5 files changed, 28 insertions, 27 deletions

diff --git a/performance-tests/Misc/test_naming.cpp b/performance-tests/Misc/test_naming.cpp
index def6a73f985..6882a599a03 100644
--- a/performance-tests/Misc/test_naming.cpp
+++ b/performance-tests/Misc/test_naming.cpp
@@ -134,7 +134,7 @@ find (ACE_Naming_Context *ns_context, int sign, int result)
     }
 }
 
-void do_testing (int argc, char *argv[], int light)
+void do_testing (int argc, ACE_TCHAR *argv[], int light)
 {
   ACE_Profile_Timer timer;
 
@@ -150,10 +150,10 @@ void do_testing (int argc, char *argv[], int light)
     }
   else  // Use NO-SYNC
     {
-      const char *p = ACE::basename (name_options->process_name (),
-                                     ACE_DIRECTORY_SEPARATOR_CHAR);
-      char s[5 /* strlen ("light") */ + MAXNAMELEN + 1];
-      ACE_OS::sprintf (s, "light%s", p);
+      const ACE_TCHAR *p = ACE::basename (name_options->process_name (),
+                                          ACE_DIRECTORY_SEPARATOR_CHAR);
+      ACE_TCHAR s[5 /* strlen ("light") */ + MAXNAMELEN + 1];
+      ACE_OS::sprintf (s, ACE_TEXT("light%s"), p);
       name_options->database (s);
       ns_context.open (ACE_Naming_Context::PROC_LOCAL, 1);
     }
@@ -177,7 +177,7 @@ void do_testing (int argc, char *argv[], int light)
 
 
 int
-main (int argc, char *argv[])
+main (int argc, ACE_TCHAR *argv[])
 {
   // Do testing with SYNC on
   ACE_DEBUG ((LM_DEBUG, "SYNC is ON\n"));
diff --git a/performance-tests/Server_Concurrency/Latency_Stats.h b/performance-tests/Server_Concurrency/Latency_Stats.h
index ccfba66ee66..d0cec975627 100644
--- a/performance-tests/Server_Concurrency/Latency_Stats.h
+++ b/performance-tests/Server_Concurrency/Latency_Stats.h
@@ -5,8 +5,8 @@ class Latency_Stats
 public:
   Latency_Stats (void);
 
-  void dump_results (const char* test_name,
-                     const char* sub_test);
+  void dump_results (const ACE_TCHAR* test_name,
+                     const ACE_TCHAR* sub_test);
 
   void sample (ACE_hrtime_t sample);
 
@@ -54,8 +54,8 @@ Latency_Stats::sample (ACE_hrtime_t sample)
 }
 
 inline void
-Latency_Stats::dump_results (const char *test_name,
-                             const char *sub_test)
+Latency_Stats::dump_results (const ACE_TCHAR *test_name,
+                             const ACE_TCHAR *sub_test)
 {
   if (this->n_ < 1)
     return;
@@ -111,8 +111,8 @@ class Throughput_Stats
 public:
   Throughput_Stats (void);
 
-  void dump_results (const char* test_name,
-                     const char* sub_test);
+  void dump_results (const ACE_TCHAR* test_name,
+                     const ACE_TCHAR* sub_test);
 
   void sample (void);
   // An event has been received
@@ -150,8 +150,8 @@ Throughput_Stats::accumulate (const Throughput_Stats& rhs)
 }
 
 inline void
-Throughput_Stats::dump_results (const char *test_name,
-                                           const char *subtest)
+Throughput_Stats::dump_results (const ACE_TCHAR *test_name,
+                                const ACE_TCHAR *subtest)
 {
   if (this->n_ == 0)
     {
diff --git a/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp b/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp
index d4beccdae30..5ac10dbfc8a 100644
--- a/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp
+++ b/performance-tests/Server_Concurrency/Leader_Follower/leader_follower.cpp
@@ -305,14 +305,14 @@ main (int argc, ACE_TCHAR *argv[])
       latency.accumulate (leader_followers[i]->latency_stats_);
       throughput.accumulate (leader_followers[i]->throughput_stats_);
       ACE_DEBUG ((LM_DEBUG, "Thread[%d]: ", i));
-      leader_followers[i]->throughput_stats_.dump_results ("", "");
+      leader_followers[i]->throughput_stats_.dump_results (ACE_TEXT(""), ACE_TEXT(""));
     }
 
   ACE_DEBUG ((LM_DEBUG, "\nTotals for latency:\n"));
-  latency.dump_results (argv[0], "latency");
+  latency.dump_results (argv[0], ACE_TEXT("latency"));
 
   ACE_DEBUG ((LM_DEBUG, "\nTotals for throughput:\n"));
-  throughput.dump_results (argv[0], "throughput");
+  throughput.dump_results (argv[0], ACE_TEXT("throughput"));
 
 #if defined(ACE_HAS_PRUSAGE_T)
   ACE_DEBUG ((LM_DEBUG, "\n(%t) Context switches %d/%d\n",
diff --git a/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp b/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp
index 729ce9a2692..48e220cf408 100644
--- a/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp
+++ b/performance-tests/Server_Concurrency/Queue_Based_Workers/workers.cpp
@@ -383,14 +383,14 @@ main (int argc, ACE_TCHAR *argv[])
       latency.accumulate (workers[i]->latency_stats_);
       throughput.accumulate (workers[i]->throughput_stats_);
       ACE_DEBUG ((LM_DEBUG, "Thread[%d]: ", i));
-      workers[i]->throughput_stats_.dump_results ("", "");
+      workers[i]->throughput_stats_.dump_results (ACE_TEXT(""), ACE_TEXT(""));
     }
 
   ACE_DEBUG ((LM_DEBUG, "\nTotals for latency:\n"));
-  latency.dump_results (argv[0], "latency");
+  latency.dump_results (argv[0], ACE_TEXT("latency"));
 
   ACE_DEBUG ((LM_DEBUG, "\nTotals for throughput:\n"));
-  throughput.dump_results (argv[0], "throughput");
+  throughput.dump_results (argv[0], ACE_TEXT("throughput"));
 
 #if defined(ACE_HAS_PRUSAGE_T)
   ACE_DEBUG ((LM_DEBUG, "\n(%t) Context switches %d/%d\n",
diff --git a/performance-tests/TCP/tcp_test.cpp b/performance-tests/TCP/tcp_test.cpp
index af75df3ba12..9bcee4e1989 100644
--- a/performance-tests/TCP/tcp_test.cpp
+++ b/performance-tests/TCP/tcp_test.cpp
@@ -249,16 +249,17 @@ Client::run (void)
 
   if (dump_history)
     {
-      history.dump_samples ("HISTORY", gsf);
+      history.dump_samples (ACE_TEXT("HISTORY"), gsf);
     }
 
   ACE_Basic_Stats latency;
   history.collect_basic_stats (latency);
-  latency.dump_results ("Client", gsf);
-  ACE_Throughput_Stats::dump_throughput ("Client", gsf,
+  latency.dump_results (ACE_TEXT("Client"), gsf);
+  ACE_Throughput_Stats::dump_throughput (ACE_TEXT("Client"),
+                                         gsf,
                                          test_end - test_start,
                                          latency.samples_count ());
-                                         
+
 
   return 0;
 }
@@ -495,7 +496,7 @@ run_server (ACE_INET_Addr &addr)
 }
 
 int
-main (int argc, char *argv[])
+main (int argc, ACE_TCHAR *argv[])
 {
   int c, dstport = DEFPORT;
   int priority =
@@ -521,7 +522,7 @@ main (int argc, char *argv[])
     }
 
 
-  ACE_Get_Opt getopt (argc, argv, "hxwvb:I:p:sci:m:at:");
+  ACE_Get_Opt getopt (argc, argv, ACE_TEXT("hxwvb:I:p:sci:m:at:"));
 
   while ((c = getopt ()) != -1)
     {
@@ -648,7 +649,7 @@ main (int argc, char *argv[])
     {
       if (remote_addr.set (dstport,
                            (ACE_UINT32) ACE_OS::inet_addr
-                           (argv[getopt.opt_ind ()])) == -1)
+                           (ACE_TEXT_ALWAYS_CHAR(argv[getopt.opt_ind ()]))) == -1)
         ACE_ERROR_RETURN ((LM_ERROR,
                            "invalid IP address: %s\n",
                            argv[getopt.opt_ind ()]),