summaryrefslogtreecommitdiff
path: root/performance-tests/SCTP
diff options
context:
space:
mode:
Diffstat (limited to 'performance-tests/SCTP')
-rw-r--r--performance-tests/SCTP/Options_Manager.cpp46
-rw-r--r--performance-tests/SCTP/SOCK_SEQPACK_clt.cpp2
-rw-r--r--performance-tests/SCTP/SOCK_SEQPACK_srv.cpp2
-rw-r--r--performance-tests/SCTP/SOCK_STREAM_clt.cpp2
-rw-r--r--performance-tests/SCTP/SOCK_STREAM_srv.cpp2
5 files changed, 27 insertions, 27 deletions
diff --git a/performance-tests/SCTP/Options_Manager.cpp b/performance-tests/SCTP/Options_Manager.cpp
index 6d28a393fdf..dcf3f740072 100644
--- a/performance-tests/SCTP/Options_Manager.cpp
+++ b/performance-tests/SCTP/Options_Manager.cpp
@@ -67,45 +67,45 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
__program_name[Options_Manager::string_len - 1] = '\0';
}
- // Declare options with ACE_Get_Opt
+ // Declare options with ACE_Get_Arg_Opt
int c;
- ACE_Get_Opt * get_opt = 0;
+ ACE_Get_Arg_Opt<ACE_TCHAR> * get_opt = 0;
if (!ACE_OS::strcmp(ACE_TEXT ("client-opts"), opts_set)){
- get_opt = new ACE_Get_Opt(argc, argv, ACE_TEXT("c:nt:m:M:x:b:C:i:p:H:s:h"));
+ get_opt = new ACE_Get_Arg_Opt<ACE_TCHAR>(argc, argv, ACE_TEXT("c:nt:m:M:x:b:C:i:p:H:s:h"));
get_opt->long_option (ACE_TEXT ("test_iterations"), 'c',
- ACE_Get_Opt::ARG_REQUIRED);
+ ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
get_opt->long_option (ACE_TEXT ("test_enable_nagle"), 'n');
get_opt->long_option (ACE_TEXT ("test_transport_protocol"), 't',
- ACE_Get_Opt::ARG_REQUIRED);
+ ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
get_opt->long_option (ACE_TEXT ("histogram_min_bin"), 'm',
- ACE_Get_Opt::ARG_REQUIRED);
+ ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
get_opt->long_option (ACE_TEXT ("histogram_max_bin"), 'M',
- ACE_Get_Opt::ARG_REQUIRED);
+ ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
get_opt->long_option (ACE_TEXT ("histogram_num_outliers"), 'x',
- ACE_Get_Opt::ARG_REQUIRED);
+ ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
get_opt->long_option (ACE_TEXT ("histogram_bin_count"), 'b',
- ACE_Get_Opt::ARG_REQUIRED);
+ ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
get_opt->long_option (ACE_TEXT ("client_port"), 'C',
- ACE_Get_Opt::ARG_REQUIRED);
+ ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
get_opt->long_option (ACE_TEXT ("client_accept_addr"), 'i',
- ACE_Get_Opt::ARG_REQUIRED);
+ ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
get_opt->long_option (ACE_TEXT ("server_port"), 'p',
- ACE_Get_Opt::ARG_REQUIRED);
+ ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
get_opt->long_option (ACE_TEXT ("server_host"), 'H',
- ACE_Get_Opt::ARG_REQUIRED);
+ ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
get_opt->long_option (ACE_TEXT ("payload_size_power_of_2"), 's',
- ACE_Get_Opt::ARG_REQUIRED);
+ ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
get_opt->long_option (ACE_TEXT ("help"), 'h');
} else if (!ACE_OS::strcmp (ACE_TEXT ("server-opts"), opts_set)){
- get_opt = new ACE_Get_Opt(argc, argv, ACE_TEXT("nt:p:a:u"));
+ get_opt = new ACE_Get_Arg_Opt<ACE_TCHAR>(argc, argv, ACE_TEXT("nt:p:a:u"));
get_opt->long_option (ACE_TEXT ("test_enable_nagle"), 'n');
get_opt->long_option (ACE_TEXT ("test_transport_protocol"), 't',
- ACE_Get_Opt::ARG_REQUIRED);
+ ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
get_opt->long_option (ACE_TEXT ("server_port"), 'p',
- ACE_Get_Opt::ARG_REQUIRED);
+ ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
get_opt->long_option (ACE_TEXT ("server_accept_addr"), 'a',
- ACE_Get_Opt::ARG_REQUIRED);
+ ACE_Get_Arg_Opt<ACE_TCHAR>::ARG_REQUIRED);
get_opt->long_option (ACE_TEXT ("help"), 'h');
} else {
_error = 1;
@@ -114,7 +114,7 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
return;
}
- // Parse options with ACE_Get_Opt
+ // Parse options with ACE_Get_Arg_Opt
while ((c = (*get_opt)()) != -1)
{
switch ((char) c)
@@ -173,7 +173,7 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
// Obtain the 32-bit, host-byte-order representation of
// the primary address.
struct in_addr foo;
- int aton_retval = ACE_OS::inet_aton(ACE_TEXT_ALWAYS_CHAR (str),
+ int aton_retval = ACE_OS::inet_aton(ACE_TEXT_TO_CHAR_IN (str),
&foo);
// If this representation was not obtained, terminate with
@@ -231,7 +231,7 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
// Obtain the 32-bit, host-byte-order representation of
// a secondary address.
aton_retval =
- ACE_OS::inet_aton(ACE_TEXT_ALWAYS_CHAR (next_secondary_addr),
+ ACE_OS::inet_aton(ACE_TEXT_TO_CHAR_IN (next_secondary_addr),
&foo);
// If the representation was obtained without error,
@@ -290,7 +290,7 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
// Obtain the 32-bit, host-byte-order representation of
// the primary address.
struct in_addr foo;
- int aton_retval = ACE_OS::inet_aton (ACE_TEXT_ALWAYS_CHAR (str),
+ int aton_retval = ACE_OS::inet_aton (ACE_TEXT_TO_CHAR_IN (str),
&foo);
// If this representation was not obtained, terminate with
@@ -348,7 +348,7 @@ Options_Manager::Options_Manager(int argc, ACE_TCHAR **argv, ACE_TCHAR const * c
// Obtain the 32-bit, host-byte-order representation of
// a secondary address.
aton_retval =
- ACE_OS::inet_aton (ACE_TEXT_ALWAYS_CHAR (next_secondary_addr),
+ ACE_OS::inet_aton (ACE_TEXT_TO_CHAR_IN (next_secondary_addr),
&foo);
// If the representation was obtained without error,
diff --git a/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp b/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp
index 7f98883bfad..9dd12ef4a72 100644
--- a/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp
+++ b/performance-tests/SCTP/SOCK_SEQPACK_clt.cpp
@@ -61,7 +61,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){
// check that valid options were specified
if (optsMgr._error) {
- ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_ALWAYS_CHAR (optsMgr._error_message));
+ ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_TO_CHAR_IN (optsMgr._error_message));
return 1;
}
diff --git a/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp b/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp
index 84db9afc541..7677c317ed6 100644
--- a/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp
+++ b/performance-tests/SCTP/SOCK_SEQPACK_srv.cpp
@@ -231,7 +231,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){
// check that valid options were specified
if (optsMgr._error) {
- ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_ALWAYS_CHAR (optsMgr._error_message));
+ ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_TO_CHAR_IN (optsMgr._error_message));
return 1;
}
diff --git a/performance-tests/SCTP/SOCK_STREAM_clt.cpp b/performance-tests/SCTP/SOCK_STREAM_clt.cpp
index 365890265b1..f98836bedfb 100644
--- a/performance-tests/SCTP/SOCK_STREAM_clt.cpp
+++ b/performance-tests/SCTP/SOCK_STREAM_clt.cpp
@@ -65,7 +65,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){
// check that valid options were specified
if (optsMgr._error) {
- ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_ALWAYS_CHAR (optsMgr._error_message));
+ ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_TO_CHAR_IN (optsMgr._error_message));
return 1;
}
diff --git a/performance-tests/SCTP/SOCK_STREAM_srv.cpp b/performance-tests/SCTP/SOCK_STREAM_srv.cpp
index c2d3cceb1fc..c3bb001f2db 100644
--- a/performance-tests/SCTP/SOCK_STREAM_srv.cpp
+++ b/performance-tests/SCTP/SOCK_STREAM_srv.cpp
@@ -244,7 +244,7 @@ int ACE_TMAIN (int argc, ACE_TCHAR **argv){
// check that valid options were specified
if (optsMgr._error) {
- ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_ALWAYS_CHAR (optsMgr._error_message));
+ ACE_OS::fprintf (stderr, "ERROR: %s\n", ACE_TEXT_TO_CHAR_IN (optsMgr._error_message));
return 1;
}
View Lorry Controller Status