1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
|
*** makefile.orig Thu Jul 25 12:54:42 1996
--- makefile Sat Aug 3 12:24:17 1996
***************
*** 15,22 ****
# for the rest of the world, it is probably better to put the binaries
# in /usr/local/netperf or /opt/netperf
#
! #NETPERF_HOME = /usr/local/netperf
! NETPERF_HOME = /opt/netperf
# The compiler on your system might be somewhere else, and/or have
# a different name.
--- 15,22 ----
# for the rest of the world, it is probably better to put the binaries
# in /usr/local/netperf or /opt/netperf
#
! NETPERF_HOME = ${PREFIX}/netperf
! #NETPERF_HOME = /opt/netperf
# The compiler on your system might be somewhere else, and/or have
# a different name.
***************
*** 83,89 ****
# -U__hpux - Use this when compiling _on_ HP-UX *for* an HP-RT system
LOG_FILE=DEBUG_LOG_FILE="\"/tmp/netperf.debug\""
! CFLAGS = -O -D$(LOG_FILE) -DUSE_LOOPER
# Some platforms, and some options, require additional libraries.
# you can add to the "LIBS =" line to accomplish this. if you find
--- 83,89 ----
# -U__hpux - Use this when compiling _on_ HP-UX *for* an HP-RT system
LOG_FILE=DEBUG_LOG_FILE="\"/tmp/netperf.debug\""
! CFLAGS = %CFLAGS% -D$(LOG_FILE) -DUSE_LOOPER -DHISTOGRAM -DDO_UNIX -DDO_1644
# Some platforms, and some options, require additional libraries.
# you can add to the "LIBS =" line to accomplish this. if you find
***************
*** 181,186 ****
--- 181,187 ----
netserver.o: netserver.c nettest_bsd.h netlib.h makefile
install: netperf netserver
+ mkdir -p $(NETPERF_HOME)
chmod -w *.[ch]
chmod +x $(NETPERF_SCRIPTS)
cp netperf $(NETPERF_HOME)
*** netlib.c.orig Thu Jul 25 12:54:36 1996
--- netlib.c Sat Aug 3 12:42:13 1996
***************
*** 1285,1291 ****
dump_request();
fprintf(where,
! "\nsend_request: about to send %ld bytes from %p\n",
sizeof(netperf_request),
&netperf_request);
fflush(where);
--- 1285,1291 ----
dump_request();
fprintf(where,
! "\nsend_request: about to send %d bytes from %p\n",
sizeof(netperf_request),
&netperf_request);
fflush(where);
***************
*** 2785,2791 ****
/* program, but that doesn't really seem worthwhile - raj 4/95 */
if (debug > 1) {
fprintf(where,
! "Looper child %d is born, pid %d\n",
child_index,
getpid());
fflush(where);
--- 2785,2791 ----
/* program, but that doesn't really seem worthwhile - raj 4/95 */
if (debug > 1) {
fprintf(where,
! "Looper child %d is born, pid %ld\n",
child_index,
getpid());
fflush(where);
*** netlib.h.orig Thu Jul 25 12:54:36 1996
--- netlib.h Sat Aug 3 12:16:21 1996
***************
*** 262,267 ****
--- 262,268 ----
extern int dl_open();
extern char format_cpu_method();
extern unsigned int convert();
+ extern int delta_micro();
/* these are all for the confidence interval stuff */
extern double confidence;
***************
*** 274,279 ****
--- 275,285 ----
#define HAVE_BCOPY
#define HAVE_BZERO
#endif
+
+ #if defined(__FreeBSD__) || defined(__NetBSD__)
+ #define HAVE_BCOPY
+ #define HAVE_BZERO
+ #endif /* __FreeBSD__ || __NetBSD__ */
#ifndef HAVE_BCOPY
#define bcopy(s,d,h) memcpy((d),(s),(h))
*** netserver.c.orig Thu Jul 25 12:54:36 1996
--- netserver.c Sat Aug 3 12:16:21 1996
***************
*** 405,411 ****
fclose(stdin);
fclose(stderr);
/* can I just use setsid on all systems? raj 4/96 */
! #if defined(__NetBSD__) || defined(__bsdi__) || defined(sun) || defined(__FREEBSD__)
setsid();
#else
setpgrp();
--- 405,411 ----
fclose(stdin);
fclose(stderr);
/* can I just use setsid on all systems? raj 4/96 */
! #if defined(__NetBSD__) || defined(__bsdi__) || defined(sun) || defined(__FreeBSD__)
setsid();
#else
setpgrp();
*** netsh.h.orig Thu Jul 25 12:54:36 1996
--- netsh.h Sat Aug 3 12:16:21 1996
***************
*** 28,34 ****
#define REM_SEND_ALIGN 4 /* alignment for remote sends */
/* misc defines for the hell of it */
! #define MAXLONG 4294967295L
#ifndef NETSH
/* stuff to say where this test is going */
--- 28,34 ----
#define REM_SEND_ALIGN 4 /* alignment for remote sends */
/* misc defines for the hell of it */
! #define MAXLONG 4294967295LU
#ifndef NETSH
/* stuff to say where this test is going */
*** nettest_bsd.c.orig Thu Jul 25 12:54:37 1996
--- nettest_bsd.c Sat Aug 3 12:16:22 1996
***************
*** 54,59 ****
--- 54,60 ----
#include <netinet/in.h>
#include <netinet/tcp.h>
#include <netdb.h>
+ #include <sys/param.h>
#else /* WIN32 */
#include <process.h>
#include <windows.h>
***************
*** 64,69 ****
--- 65,75 ----
#include "netlib.h"
#include "netsh.h"
#include "nettest_bsd.h"
+
+ #ifdef BSD
+ #include <sys/time.h>
+ #include <arpa/inet.h>
+ #endif /* BSD */
#ifdef HISTOGRAM
#include "hist.h"
*** nettest_unix.c.orig Thu Jul 25 12:54:39 1996
--- nettest_unix.c Sat Aug 3 12:16:22 1996
***************
*** 45,51 ****
#include <string.h>
#include <time.h>
#include <unistd.h>
! #ifndef __bsdi__
#include <malloc.h>
#endif
--- 45,52 ----
#include <string.h>
#include <time.h>
#include <unistd.h>
! #include <sys/param.h>
! #ifndef BSD
#include <malloc.h>
#endif
*** snapshot_script.orig Thu Jul 25 12:54:35 1996
--- snapshot_script Sat Aug 3 12:16:22 1996
***************
*** 34,40 ****
#
# where is netperf installed, there are a few possible places:
! NETPERF_CMD=${NETPERF_CMD:=/opt/netperf/netperf}
# there should be no more than two parms passed
--- 34,40 ----
#
# where is netperf installed, there are a few possible places:
! NETPERF_CMD=${NETPERF_CMD:=%%PREFIX%%/netperf/netperf}
# there should be no more than two parms passed
*** tcp_range_script.orig Thu Jul 25 12:54:35 1996
--- tcp_range_script Sat Aug 3 12:16:23 1996
***************
*** 43,49 ****
# where is netperf, and are there any "constant" options such as
# the netserver port number
#NETHOME=/usr/etc/net_perf
! NETHOME="."
NETPERF=$NETHOME/netperf $PORT
# How accurate we want the estimate of performance:
--- 43,49 ----
# where is netperf, and are there any "constant" options such as
# the netserver port number
#NETHOME=/usr/etc/net_perf
! NETHOME="%%PREFIX%%/netperf"
NETPERF=$NETHOME/netperf $PORT
# How accurate we want the estimate of performance:
*** tcp_rr_script.orig Thu Jul 25 12:54:35 1996
--- tcp_rr_script Sat Aug 3 12:16:23 1996
***************
*** 23,31 ****
fi
# where the programs are
! #NETHOME=/usr/local/netperf
#NETHOME="/opt/netperf"
! NETHOME=.
# at what port will netserver be waiting? If you decide to run
# netserver at a differnet port than the default of 12865, then set
--- 23,31 ----
fi
# where the programs are
! NETHOME=%%PREFIX%%/netperf
#NETHOME="/opt/netperf"
! #NETHOME=.
# at what port will netserver be waiting? If you decide to run
# netserver at a differnet port than the default of 12865, then set
*** tcp_stream_script.orig Thu Jul 25 12:54:34 1996
--- tcp_stream_script Sat Aug 3 12:16:23 1996
***************
*** 22,30 ****
fi
# where the programs are
! #NETHOME=/usr/local/netperf
#NETHOME="/opt/netperf"
! NETHOME=.
# at what port will netserver be waiting? If you decide to run
# netserver at a differnet port than the default of 12865, then set
--- 22,30 ----
fi
# where the programs are
! NETHOME=%%PREFIX%%/netperf
#NETHOME="/opt/netperf"
! #NETHOME=.
# at what port will netserver be waiting? If you decide to run
# netserver at a differnet port than the default of 12865, then set
*** udp_rr_script.orig Thu Jul 25 12:54:35 1996
--- udp_rr_script Sat Aug 3 12:16:23 1996
***************
*** 20,28 ****
# where the programs are
! #NETHOME=/usr/local/netperf
#NETHOME="/opt/netperf"
! NETHOME="."
# at what port will netserver be waiting? If you decide to run
# netserver at a differnet port than the default of 12865, then set
--- 20,28 ----
# where the programs are
! NETHOME=%%PREFIX%%/netperf
#NETHOME="/opt/netperf"
! #NETHOME="."
# at what port will netserver be waiting? If you decide to run
# netserver at a differnet port than the default of 12865, then set
*** udp_stream_script.orig Thu Jul 25 12:54:34 1996
--- udp_stream_script Sat Aug 3 12:16:23 1996
***************
*** 17,25 ****
# where the programs are
! #NETHOME=/usr/local/netperf
#NETHOME="/opt/netperf"
! NETHOME="."
# at what port will netserver be waiting? If you decide to run
# netserver at a differnet port than the default of 12865, then set
--- 17,25 ----
# where the programs are
! NETHOME=%%PREFIX%%/netperf
#NETHOME="/opt/netperf"
! #NETHOME="."
# at what port will netserver be waiting? If you decide to run
# netserver at a differnet port than the default of 12865, then set
|
