From bd660e17d775189dad03bdfa3b8d093babab10e1 Mon Sep 17 00:00:00 2001 From: Adam Weinberger Date: Mon, 28 Jul 2014 14:17:02 +0000 Subject: Rename benchmark/ patch-xy patches to reflect the files they modify. --- benchmarks/dbs/files/patch-aa | 33 ---------------------------- benchmarks/dbs/files/patch-ab | 22 ------------------- benchmarks/dbs/files/patch-ac | 35 ------------------------------ benchmarks/dbs/files/patch-ad | 22 ------------------- benchmarks/dbs/files/patch-ae | 35 ------------------------------ benchmarks/dbs/files/patch-ag | 11 ---------- benchmarks/dbs/files/patch-src_Makefile | 33 ++++++++++++++++++++++++++++ benchmarks/dbs/files/patch-src__record.h | 12 ---------- benchmarks/dbs/files/patch-src_dbsc.c | 22 +++++++++++++++++++ benchmarks/dbs/files/patch-src_dbsd.c | 35 ++++++++++++++++++++++++++++++ benchmarks/dbs/files/patch-src_record.h | 12 ++++++++++ benchmarks/dbs/files/patch-src_scan.c | 22 +++++++++++++++++++ benchmarks/dbs/files/patch-src_sendrecv.c | 35 ++++++++++++++++++++++++++++++ benchmarks/dbs/files/patch-src_tcp_trace.c | 11 ++++++++++ 14 files changed, 170 insertions(+), 170 deletions(-) delete mode 100644 benchmarks/dbs/files/patch-aa delete mode 100644 benchmarks/dbs/files/patch-ab delete mode 100644 benchmarks/dbs/files/patch-ac delete mode 100644 benchmarks/dbs/files/patch-ad delete mode 100644 benchmarks/dbs/files/patch-ae delete mode 100644 benchmarks/dbs/files/patch-ag create mode 100644 benchmarks/dbs/files/patch-src_Makefile delete mode 100644 benchmarks/dbs/files/patch-src__record.h create mode 100644 benchmarks/dbs/files/patch-src_dbsc.c create mode 100644 benchmarks/dbs/files/patch-src_dbsd.c create mode 100644 benchmarks/dbs/files/patch-src_record.h create mode 100644 benchmarks/dbs/files/patch-src_scan.c create mode 100644 benchmarks/dbs/files/patch-src_sendrecv.c create mode 100644 benchmarks/dbs/files/patch-src_tcp_trace.c (limited to 'benchmarks/dbs') diff --git a/benchmarks/dbs/files/patch-aa b/benchmarks/dbs/files/patch-aa deleted file mode 100644 index f533d8c59b3d..000000000000 --- a/benchmarks/dbs/files/patch-aa +++ /dev/null @@ -1,33 +0,0 @@ ---- src/Makefile-- Sat Aug 1 19:13:01 1998 -+++ src/Makefile Sat Aug 1 19:44:49 1998 -@@ -27,10 +27,10 @@ - # make install - # - --BIN =/usr/local/etc -+BIN = ${PREFIX}/bin - - #CC =gcc --CFLAGS =-O -+CFLAGS +=-DHAVE_SYS_PARAM_H - - #CFLAGS =-g # debug - #CFLAGS =-g -DDEBUGMODE -@@ -51,7 +51,7 @@ - obj:: - (cd ../obj/$(UNAME); make) - --UNAME = `uname|tr -d '/'``uname -r|tr -d '/'` -+UNAME = `uname|tr -d '/'` - dir:: - -@ mkdir ../obj - -@ mkdir ../obj/$(UNAME) -@@ -74,7 +74,7 @@ - etags *.c *.h - - install:: -- cp -p dbsc dbsd ../script/dbs_view $(BIN) -+ cp -p dbsc dbsd ../../script/dbs_view $(BIN) - - dbsc: dbsc.o scan.o dbs.o - $(CC) $(BSTATIC) dbsc.o scan.o dbs.o -o $@ -lm $(LDFLAGS) diff --git a/benchmarks/dbs/files/patch-ab b/benchmarks/dbs/files/patch-ab deleted file mode 100644 index f3f9b60fdb4d..000000000000 --- a/benchmarks/dbs/files/patch-ab +++ /dev/null @@ -1,22 +0,0 @@ ---- src/dbsc.c-- Mon Jun 8 00:23:35 1998 -+++ src/dbsc.c Sat Aug 1 19:29:49 1998 -@@ -51,6 +51,10 @@ - - #define DBSC - -+#ifdef HAVE_SYS_PARAM_H -+#include -+#endif -+ - #include - #include - #include -@@ -69,7 +73,7 @@ - #include - #include - --#if !defined(bsdi) -+#if (!defined(BSD) || (BSD < 199306)) - #include - #endif - diff --git a/benchmarks/dbs/files/patch-ac b/benchmarks/dbs/files/patch-ac deleted file mode 100644 index e0dd4f7cb47d..000000000000 --- a/benchmarks/dbs/files/patch-ac +++ /dev/null @@ -1,35 +0,0 @@ ---- src/dbsd.c.orig Sun Jun 7 19:23:26 1998 -+++ src/dbsd.c Sat Sep 18 17:19:36 1999 -@@ -51,6 +51,9 @@ - - #define DBSD - -+#ifdef HAVE_SYS_PARAM_H -+#include -+#endif - #include - #include - #include -@@ -80,7 +83,7 @@ - #include - #endif - --#if !defined(bsdi) -+#if (!defined(BSD) || (BSD < 199306)) - #include - #endif - -@@ -1002,8 +1005,13 @@ - d[i].snd_max = htonl((int)rt.d[i].td_cb.snd_max); - d[i].snd_cwnd = htonl((int)rt.d[i].td_cb.snd_cwnd); - d[i].snd_ssthresh = htonl((int)rt.d[i].td_cb.snd_ssthresh); -+#if !defined(__FreeBSD_version) || (__FreeBSD_version < 400009) - d[i].t_idle = htonl((int)rt.d[i].td_cb.t_idle); - d[i].t_rtt = htonl((int)rt.d[i].td_cb.t_rtt); -+#else -+ d[i].t_idle = htonl((int)rt.d[i].td_cb.t_rcvtime); -+ d[i].t_rtt = htonl((int)rt.d[i].td_cb.t_rtttime); -+#endif - d[i].t_rtseq = htonl((int)rt.d[i].td_cb.t_rtseq); - d[i].t_srtt = htonl((int)rt.d[i].td_cb.t_srtt); - d[i].t_rttvar = htonl((int)rt.d[i].td_cb.t_rttvar); diff --git a/benchmarks/dbs/files/patch-ad b/benchmarks/dbs/files/patch-ad deleted file mode 100644 index 5939f8477776..000000000000 --- a/benchmarks/dbs/files/patch-ad +++ /dev/null @@ -1,22 +0,0 @@ ---- src/scan.c-- Fri Jul 11 00:54:12 1997 -+++ src/scan.c Sat Aug 1 19:33:34 1998 -@@ -49,6 +49,9 @@ - * $Author: yukio-m $ - *****************************************************************/ - -+#ifdef HAVE_SYS_PARAM_H -+#include -+#endif - #include - #include - -@@ -58,7 +61,8 @@ - #include - #endif - --#if !defined(bsdi) -+#if (!defined(BSD) || (BSD < 199306)) -+#error BSD - #include - #endif - diff --git a/benchmarks/dbs/files/patch-ae b/benchmarks/dbs/files/patch-ae deleted file mode 100644 index 8adccc9b1dd4..000000000000 --- a/benchmarks/dbs/files/patch-ae +++ /dev/null @@ -1,35 +0,0 @@ ---- src/sendrecv.c-- Mon Oct 13 03:27:19 1997 -+++ src/sendrecv.c Sat Aug 1 19:37:02 1998 -@@ -70,12 +70,12 @@ - #define INIT_RECORD() (rdp = rd->d, rd->n=0) - #define INIT_RECORD2() (rdp2 = rd2->d, rd2->n=0) - --#define RECORD(NO,SIZE) (gettimeofday(&(rdp->tv), &tzp),\ -+#define RECORD(NO,SIZE) (gettimeofday(&(rdp->tv), (struct timezone *)&tzp),\ - rdp->packet_no = (NO),\ - rdp->packet_size = (SIZE),\ - rdp++, rd->n++) - --#define RECORD2(NO,SIZE) (gettimeofday(&(rdp2->tv), &tzp),\ -+#define RECORD2(NO,SIZE) (gettimeofday(&(rdp2->tv), (struct timezone *)&tzp),\ - rdp2->packet_no = (NO),\ - rdp2->packet_size = (SIZE),\ - rdp2++, rd2->n++) -@@ -87,7 +87,7 @@ - _TP1.tv_usec %= 1000000;\ - } - --#define GETTIMEOFDAY(_TPP) gettimeofday(&tp, &tzp);\ -+#define GETTIMEOFDAY(_TPP) gettimeofday(&tp, (struct timezone *)&tzp);\ - tp.tv_sec = _TPP.tv_sec - tp.tv_sec;\ - tp.tv_usec = _TPP.tv_usec - tp.tv_usec;\ - if (tp.tv_usec < 0) {\ -@@ -108,7 +108,7 @@ - USLEEP(tp); - - /* before 0.00001s */ --#define WAIT_BEFORE(_TPP) gettimeofday(&tp, &tzp);\ -+#define WAIT_BEFORE(_TPP) gettimeofday(&tp, (struct timezone *) &tzp);\ - tp.tv_sec = _TPP.tv_sec - tp.tv_sec;\ - tp.tv_usec = _TPP.tv_usec - tp.tv_usec - 1000;\ - if (tp.tv_usec < 0) {\ diff --git a/benchmarks/dbs/files/patch-ag b/benchmarks/dbs/files/patch-ag deleted file mode 100644 index 6353e42e5946..000000000000 --- a/benchmarks/dbs/files/patch-ag +++ /dev/null @@ -1,11 +0,0 @@ ---- src/tcp_trace.c-- Thu Nov 2 23:00:13 2000 -+++ src/tcp_trace.c Thu Nov 2 23:00:33 2000 -@@ -307,7 +307,7 @@ - #ifdef _PATH_UNIX - system = _PATH_UNIX; - #else -- system = "/vmunix"; -+ system = "/kernel"; - #endif - #endif - diff --git a/benchmarks/dbs/files/patch-src_Makefile b/benchmarks/dbs/files/patch-src_Makefile new file mode 100644 index 000000000000..f533d8c59b3d --- /dev/null +++ b/benchmarks/dbs/files/patch-src_Makefile @@ -0,0 +1,33 @@ +--- src/Makefile-- Sat Aug 1 19:13:01 1998 ++++ src/Makefile Sat Aug 1 19:44:49 1998 +@@ -27,10 +27,10 @@ + # make install + # + +-BIN =/usr/local/etc ++BIN = ${PREFIX}/bin + + #CC =gcc +-CFLAGS =-O ++CFLAGS +=-DHAVE_SYS_PARAM_H + + #CFLAGS =-g # debug + #CFLAGS =-g -DDEBUGMODE +@@ -51,7 +51,7 @@ + obj:: + (cd ../obj/$(UNAME); make) + +-UNAME = `uname|tr -d '/'``uname -r|tr -d '/'` ++UNAME = `uname|tr -d '/'` + dir:: + -@ mkdir ../obj + -@ mkdir ../obj/$(UNAME) +@@ -74,7 +74,7 @@ + etags *.c *.h + + install:: +- cp -p dbsc dbsd ../script/dbs_view $(BIN) ++ cp -p dbsc dbsd ../../script/dbs_view $(BIN) + + dbsc: dbsc.o scan.o dbs.o + $(CC) $(BSTATIC) dbsc.o scan.o dbs.o -o $@ -lm $(LDFLAGS) diff --git a/benchmarks/dbs/files/patch-src__record.h b/benchmarks/dbs/files/patch-src__record.h deleted file mode 100644 index af6f763eb9f0..000000000000 --- a/benchmarks/dbs/files/patch-src__record.h +++ /dev/null @@ -1,12 +0,0 @@ ---- src/record.h.orig 1997-10-13 09:36:38.000000000 +0900 -+++ src/record.h 2012-04-29 03:08:53.000000000 +0900 -@@ -69,7 +69,9 @@ - #include - - #ifndef __linux__ -+#ifndef __FreeBSD__ - #include -+#endif - #include - #include - /*#define TCPSTATES*/ diff --git a/benchmarks/dbs/files/patch-src_dbsc.c b/benchmarks/dbs/files/patch-src_dbsc.c new file mode 100644 index 000000000000..f3f9b60fdb4d --- /dev/null +++ b/benchmarks/dbs/files/patch-src_dbsc.c @@ -0,0 +1,22 @@ +--- src/dbsc.c-- Mon Jun 8 00:23:35 1998 ++++ src/dbsc.c Sat Aug 1 19:29:49 1998 +@@ -51,6 +51,10 @@ + + #define DBSC + ++#ifdef HAVE_SYS_PARAM_H ++#include ++#endif ++ + #include + #include + #include +@@ -69,7 +73,7 @@ + #include + #include + +-#if !defined(bsdi) ++#if (!defined(BSD) || (BSD < 199306)) + #include + #endif + diff --git a/benchmarks/dbs/files/patch-src_dbsd.c b/benchmarks/dbs/files/patch-src_dbsd.c new file mode 100644 index 000000000000..e0dd4f7cb47d --- /dev/null +++ b/benchmarks/dbs/files/patch-src_dbsd.c @@ -0,0 +1,35 @@ +--- src/dbsd.c.orig Sun Jun 7 19:23:26 1998 ++++ src/dbsd.c Sat Sep 18 17:19:36 1999 +@@ -51,6 +51,9 @@ + + #define DBSD + ++#ifdef HAVE_SYS_PARAM_H ++#include ++#endif + #include + #include + #include +@@ -80,7 +83,7 @@ + #include + #endif + +-#if !defined(bsdi) ++#if (!defined(BSD) || (BSD < 199306)) + #include + #endif + +@@ -1002,8 +1005,13 @@ + d[i].snd_max = htonl((int)rt.d[i].td_cb.snd_max); + d[i].snd_cwnd = htonl((int)rt.d[i].td_cb.snd_cwnd); + d[i].snd_ssthresh = htonl((int)rt.d[i].td_cb.snd_ssthresh); ++#if !defined(__FreeBSD_version) || (__FreeBSD_version < 400009) + d[i].t_idle = htonl((int)rt.d[i].td_cb.t_idle); + d[i].t_rtt = htonl((int)rt.d[i].td_cb.t_rtt); ++#else ++ d[i].t_idle = htonl((int)rt.d[i].td_cb.t_rcvtime); ++ d[i].t_rtt = htonl((int)rt.d[i].td_cb.t_rtttime); ++#endif + d[i].t_rtseq = htonl((int)rt.d[i].td_cb.t_rtseq); + d[i].t_srtt = htonl((int)rt.d[i].td_cb.t_srtt); + d[i].t_rttvar = htonl((int)rt.d[i].td_cb.t_rttvar); diff --git a/benchmarks/dbs/files/patch-src_record.h b/benchmarks/dbs/files/patch-src_record.h new file mode 100644 index 000000000000..af6f763eb9f0 --- /dev/null +++ b/benchmarks/dbs/files/patch-src_record.h @@ -0,0 +1,12 @@ +--- src/record.h.orig 1997-10-13 09:36:38.000000000 +0900 ++++ src/record.h 2012-04-29 03:08:53.000000000 +0900 +@@ -69,7 +69,9 @@ + #include + + #ifndef __linux__ ++#ifndef __FreeBSD__ + #include ++#endif + #include + #include + /*#define TCPSTATES*/ diff --git a/benchmarks/dbs/files/patch-src_scan.c b/benchmarks/dbs/files/patch-src_scan.c new file mode 100644 index 000000000000..5939f8477776 --- /dev/null +++ b/benchmarks/dbs/files/patch-src_scan.c @@ -0,0 +1,22 @@ +--- src/scan.c-- Fri Jul 11 00:54:12 1997 ++++ src/scan.c Sat Aug 1 19:33:34 1998 +@@ -49,6 +49,9 @@ + * $Author: yukio-m $ + *****************************************************************/ + ++#ifdef HAVE_SYS_PARAM_H ++#include ++#endif + #include + #include + +@@ -58,7 +61,8 @@ + #include + #endif + +-#if !defined(bsdi) ++#if (!defined(BSD) || (BSD < 199306)) ++#error BSD + #include + #endif + diff --git a/benchmarks/dbs/files/patch-src_sendrecv.c b/benchmarks/dbs/files/patch-src_sendrecv.c new file mode 100644 index 000000000000..8adccc9b1dd4 --- /dev/null +++ b/benchmarks/dbs/files/patch-src_sendrecv.c @@ -0,0 +1,35 @@ +--- src/sendrecv.c-- Mon Oct 13 03:27:19 1997 ++++ src/sendrecv.c Sat Aug 1 19:37:02 1998 +@@ -70,12 +70,12 @@ + #define INIT_RECORD() (rdp = rd->d, rd->n=0) + #define INIT_RECORD2() (rdp2 = rd2->d, rd2->n=0) + +-#define RECORD(NO,SIZE) (gettimeofday(&(rdp->tv), &tzp),\ ++#define RECORD(NO,SIZE) (gettimeofday(&(rdp->tv), (struct timezone *)&tzp),\ + rdp->packet_no = (NO),\ + rdp->packet_size = (SIZE),\ + rdp++, rd->n++) + +-#define RECORD2(NO,SIZE) (gettimeofday(&(rdp2->tv), &tzp),\ ++#define RECORD2(NO,SIZE) (gettimeofday(&(rdp2->tv), (struct timezone *)&tzp),\ + rdp2->packet_no = (NO),\ + rdp2->packet_size = (SIZE),\ + rdp2++, rd2->n++) +@@ -87,7 +87,7 @@ + _TP1.tv_usec %= 1000000;\ + } + +-#define GETTIMEOFDAY(_TPP) gettimeofday(&tp, &tzp);\ ++#define GETTIMEOFDAY(_TPP) gettimeofday(&tp, (struct timezone *)&tzp);\ + tp.tv_sec = _TPP.tv_sec - tp.tv_sec;\ + tp.tv_usec = _TPP.tv_usec - tp.tv_usec;\ + if (tp.tv_usec < 0) {\ +@@ -108,7 +108,7 @@ + USLEEP(tp); + + /* before 0.00001s */ +-#define WAIT_BEFORE(_TPP) gettimeofday(&tp, &tzp);\ ++#define WAIT_BEFORE(_TPP) gettimeofday(&tp, (struct timezone *) &tzp);\ + tp.tv_sec = _TPP.tv_sec - tp.tv_sec;\ + tp.tv_usec = _TPP.tv_usec - tp.tv_usec - 1000;\ + if (tp.tv_usec < 0) {\ diff --git a/benchmarks/dbs/files/patch-src_tcp_trace.c b/benchmarks/dbs/files/patch-src_tcp_trace.c new file mode 100644 index 000000000000..6353e42e5946 --- /dev/null +++ b/benchmarks/dbs/files/patch-src_tcp_trace.c @@ -0,0 +1,11 @@ +--- src/tcp_trace.c-- Thu Nov 2 23:00:13 2000 ++++ src/tcp_trace.c Thu Nov 2 23:00:33 2000 +@@ -307,7 +307,7 @@ + #ifdef _PATH_UNIX + system = _PATH_UNIX; + #else +- system = "/vmunix"; ++ system = "/kernel"; + #endif + #endif + -- cgit v1.2.3