You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zy...@apache.org on 2012/11/01 16:28:12 UTC
[2/4] git commit: cleanup jtest,
remove alpha spark irix win32 and mips supporting
cleanup jtest, remove alpha spark irix win32 and mips supporting
Project: http://git-wip-us.apache.org/repos/asf/trafficserver/repo
Commit: http://git-wip-us.apache.org/repos/asf/trafficserver/commit/f270d478
Tree: http://git-wip-us.apache.org/repos/asf/trafficserver/tree/f270d478
Diff: http://git-wip-us.apache.org/repos/asf/trafficserver/diff/f270d478
Branch: refs/heads/master
Commit: f270d478b887feb67b15625de57f0fd0567407ef
Parents: 8ef0291
Author: Zhao Yongming <mi...@gmail.com>
Authored: Wed Oct 31 00:54:34 2012 +0800
Committer: Zhao Yongming <mi...@gmail.com>
Committed: Thu Nov 1 13:27:26 2012 +0800
----------------------------------------------------------------------
tools/jtest/jtest.cc | 67 +++------------------------------------------
1 files changed, 4 insertions(+), 63 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/trafficserver/blob/f270d478/tools/jtest/jtest.cc
----------------------------------------------------------------------
diff --git a/tools/jtest/jtest.cc b/tools/jtest/jtest.cc
index 08436a7..418bcc1 100644
--- a/tools/jtest/jtest.cc
+++ b/tools/jtest/jtest.cc
@@ -39,45 +39,21 @@
#include <fcntl.h>
#include <assert.h>
#include <poll.h>
-#if !defined(IRIX) && !defined(_WIN32)
#include <netinet/tcp.h>
-#endif
#include <sys/resource.h>
-#if defined(__alpha)
-#include <sys/sysinfo.h>
-#include <machine/hal_sysinfo.h>
-#include <timers.h>
-#endif
#include <math.h>
#include <limits.h>
#include <sys/mman.h>
-#ifdef __alpha
-#define ink64 long
-#define inku64 unsigned long
-#define inkPRI64 "ld"
-#define inkPRIu64 "lu"
-#else
#define ink64 long long
#define inku64 unsigned long long
#define inkPRI64 "lld"
#define inkPRIu64 "llu"
-#endif
-#if !defined (sparc) && !defined (_WIN32)
# include <time.h>
# include <sys/time.h>
# include <stdlib.h>
typedef ink64 ink_hrtime;
-#else /* !defined (NEED_HRTIME) || defined (_WIN32) */
-# if !defined (_WIN32)
-# include <sys/time.h>
- typedef hrtime_t ink_hrtime;
-# else
-# include <time.h>
- typedef ink64 ink_hrtime;
-# endif
-#endif
#define bool int
#define false 0
@@ -778,12 +754,7 @@ ink_atoll(const char *str) {
#define HRTIME_SECOND (1000*HRTIME_MSECOND)
#define HRTIME_MSECOND (1000*HRTIME_USECOND)
#define HRTIME_USECOND (1000*HRTIME_NSECOND)
-#if !defined (_WIN32)
#define HRTIME_NSECOND (1LL)
-#else
-#define HRTIME_NSECOND (1i64)
-#endif
-
#define MAX_FILE_ARGUMENTS 100
char * file_arguments[MAX_FILE_ARGUMENTS] = { 0 };
@@ -833,27 +804,15 @@ void ink_warning(const char *message_format, ...);
inline ink_hrtime ink_get_hrtime()
{
-#if !defined (_WIN32)
-# if !defined (sparc)
-# if defined (irix)
- timespec ts;
- clock_gettime(CLOCK_SGI_CYCLE, &ts);
- return (ts.tv_sec * HRTIME_SECOND + ts.tv_nsec * HRTIME_NSECOND);
-# elif defined(FreeBSD)
+# if defined(FreeBSD)
timespec ts;
clock_gettime(CLOCK_REALTIME, &ts);
return (ts.tv_sec * HRTIME_SECOND + ts.tv_nsec * HRTIME_NSECOND);
-# else /* !defined (__alpha) && !defined(IRIX) */
+# else
timeval tv;
gettimeofday(&tv,NULL);
return (tv.tv_sec * HRTIME_SECOND + tv.tv_usec * HRTIME_USECOND);
# endif
-# else /* !defined (NEED_HRTIME) */
- return gethrtime();
-# endif
-#else /* WIN32 */
- return ink_getHiResTime();
-#endif
}
typedef struct {
@@ -966,12 +925,6 @@ static void panic_perror(char * s) {
}
int max_limit_fd() {
-#ifdef __alpha
-#ifdef GSI_FD_NEWMAX
- assert(!setsysinfo(SSI_FD_NEWMAX,0,0,0,1));
-#endif
-#endif
-
struct rlimit rl;
if (getrlimit(RLIMIT_NOFILE,&rl) >= 0) {
#ifdef OPEN_MAX
@@ -991,7 +944,6 @@ int max_limit_fd() {
}
int read_ready(int fd) {
-#if !defined (_WIN32)
struct pollfd p;
p.events = POLLIN;
p.fd = fd;
@@ -999,9 +951,6 @@ int read_ready(int fd) {
if (r<=0) return r;
if (p.revents & (POLLERR|POLLNVAL)) return -1;
if (p.revents & (POLLIN|POLLHUP)) return 1;
-#else /* WIN32 */
- return 1;
-#endif
return 0;
}
@@ -3102,11 +3051,7 @@ UrlHashTable::UrlHashTable() {
ink_assert( !ftruncate(fd,numbytes) );
bytes = (unsigned char *)
mmap(NULL,numbytes,PROT_READ|PROT_WRITE,
-#if defined(__alpha) || defined(mips)
- MAP_SHARED,
-#else
MAP_SHARED|MAP_NORESERVE,
-#endif
fd, 0);
if (bytes == (unsigned char*)MAP_FAILED || !bytes)
panic("unable to map URL Hash file\n");
@@ -4620,9 +4565,7 @@ void show_argument_configuration(ArgumentDescription * argument_descriptions,
printf("%f",*(double*)argument_descriptions[i].location);
break;
case 'L':
-#if defined(__alpha)
- printf("%ld",*(ink64*)argument_descriptions[i].location);
-#elif defined(FreeBSD)
+#if defined(FreeBSD)
printf("%qd",*(ink64*)argument_descriptions[i].location);
#else
printf("%lld",*(ink64*)argument_descriptions[i].location);
@@ -4728,9 +4671,7 @@ void usage(ArgumentDescription * argument_descriptions,
case 0: fprintf(stderr, " "); break;
case 'L':
fprintf(stderr,
-#ifdef __alpha
- " %-9ld",
-#elif defined(FreeBSD)
+#if defined(FreeBSD)
" %-9qd",
#else
" %-9lld",