diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2001-03-31 15:14:53 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2001-03-31 15:14:53 +0000 |
| commit | 013bf7aa47c41e719b6fa412337bf09aab39e6b0 (patch) | |
| tree | a1c7962d8ef8859a289fee393df4aa8547c179d4 /performance-tests/TTCP | |
| parent | 0b9a079009a77e62e67f425cbdbf5c739eb81353 (diff) | |
| download | ATCD-013bf7aa47c41e719b6fa412337bf09aab39e6b0.tar.gz | |
ChangeLogTag:Fri Mar 30 14:08:18 2001 Douglas C. Schmidt <schmidt@tango.doc.wustl.edu>
Diffstat (limited to 'performance-tests/TTCP')
| -rw-r--r-- | performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp | 24 | ||||
| -rw-r--r-- | performance-tests/TTCP/C/new-ttcp.cpp | 23 |
2 files changed, 14 insertions, 33 deletions
diff --git a/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp b/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp index c7cd5ce8760..f196f7bc44e 100644 --- a/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp +++ b/performance-tests/TTCP/ACE-C++/wrapper-new-ttcp.cpp @@ -48,15 +48,9 @@ /* #define BSD41a */ // #define SYSV /* required on SGI IRIX releases before 3.3 */ -#include "ace/OS.h" -#include <ace/SOCK_Connector.h> -ACE_SOCK_Connector connector_factory; - -#include <ace/SOCK_Acceptor.h> -ACE_SOCK_Acceptor acceptor_factory; - -#include <ace/INET_Addr.h> -ACE_INET_Addr address; +#include "ace/Log_Msg.h" +#include "ace/SOCK_Connector.h" +#include "ace/SOCK_Acceptor.h" #include <stdio.h> #include <signal.h> @@ -77,6 +71,10 @@ ACE_INET_Addr address; #include <sys/un.h> #include <unistd.h> +ACE_SOCK_Connector connector_factory; +ACE_SOCK_Acceptor acceptor_factory; +ACE_INET_Addr address; + #if defined(SYSV) #define bcopy(b1,b2,n) memcpy(b2,b1,n) #define bzero(b1,n) memset(b1,0,n) @@ -182,7 +180,6 @@ void err (char *s); void mes (char *s); void pattern (register char *cp, register int cnt); char *outfmt (double b); -static void gettimeofday (struct timeval *tp, struct timezone *zp); void prep_timer (void); double read_timer (char *str, int len); static void prusage (register struct rusage *r0, struct rusage *r1, struct timeval *e, struct timeval *b, char *outp); @@ -660,13 +657,6 @@ getrusage (int ignored, register struct rusage *ru) ru->ru_utime.tv_usec = ((buf.tms_utime % HZ) * 1000000) / HZ; } -/*ARGSUSED */ -static void -gettimeofday (struct timeval *tp, struct timezone *zp) -{ - tp->tv_sec = time (0); - tp->tv_usec = 0; -} #endif /* SYSV */ /* * P R E P _ T I M E R diff --git a/performance-tests/TTCP/C/new-ttcp.cpp b/performance-tests/TTCP/C/new-ttcp.cpp index 1b8a0a40208..a897f5b39a3 100644 --- a/performance-tests/TTCP/C/new-ttcp.cpp +++ b/performance-tests/TTCP/C/new-ttcp.cpp @@ -48,14 +48,9 @@ /* #define BSD41a */ #define SYSV /* required on SGI IRIX releases before 3.3 */ -#include <ace/SOCK_Connector.h> -ACE_SOCK_Connector connector_factory; - -#include <ace/SOCK_Acceptor.h> -ACE_SOCK_Acceptor acceptor_factory; - -#include <ace/INET_Addr.h> -ACE_INET_Addr address; +#include "ace/Log_Msg.h" +#include "ace/SOCK_Connector.h" +#include "ace/SOCK_Acceptor.h" #include <stdio.h> #include <signal.h> @@ -76,6 +71,10 @@ ACE_INET_Addr address; #include <sys/un.h> #include <unistd.h> +ACE_SOCK_Connector connector_factory; +ACE_SOCK_Acceptor acceptor_factory; +ACE_INET_Addr address; + #if defined(SYSV) #define bcopy(b1,b2,n) memcpy(b2,b1,n) #define bzero(b1,n) memset(b1,0,n) @@ -187,7 +186,6 @@ void mes (char *s); void pattern (register char *cp, register int cnt); char *outfmt (double b); static void getrusage (int ignored, register struct rusage *ru); -static void gettimeofday (struct timeval *tp, struct timezone *zp); void prep_timer (void); double read_timer (char *str, int len); static void prusage (register struct rusage *r0, struct rusage *r1, struct timeval *e, struct timeval *b, char *outp); @@ -684,13 +682,6 @@ getrusage (int ignored, register struct rusage *ru) ru->ru_utime.tv_usec = ((buf.tms_utime % HZ) * 1000000) / HZ; } -/*ARGSUSED */ -static void -gettimeofday (struct timeval *tp, struct timezone *zp) -{ - tp->tv_sec = time (0); - tp->tv_usec = 0; -} #endif /* SYSV */ /* * P R E P _ T I M E R |