Skip to content

Commit

Permalink
More whitespace removed
Browse files Browse the repository at this point in the history
  • Loading branch information
GavinB-hpe committed Jan 20, 2021
1 parent 306acf0 commit 0dbda2d
Show file tree
Hide file tree
Showing 14 changed files with 43 additions and 43 deletions.
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ His prompting finally got me off my whatever to put the confidence
interval stuff from the guys at IBM into netperf

Peter Skopp [email protected]
Fixes to make netperf more secure.
Fixes to make netperf more secure.

Tom Wilson <[email protected]>
A fix to send_udp_rr to correct bogus throughput values.
Expand Down
16 changes: 8 additions & 8 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ case "$enable_unixdomain" in
yes)
use_unixdomain=true
;;
no)
no)
use_unixdomain=false
;;
'')
Expand Down Expand Up @@ -259,7 +259,7 @@ case "$enable_dlpi" in
yes)
use_dlpi=true
;;
no)
no)
use_dlpi=false
;;
'')
Expand Down Expand Up @@ -293,7 +293,7 @@ case "$enable_dccp" in
yes)
use_dccp=true
;;
no)
no)
use_dccp=false
;;
'')
Expand Down Expand Up @@ -327,7 +327,7 @@ case "$enable_omni" in
yes)
use_omni=true
;;
no)
no)
use_omni=false
;;
'')
Expand Down Expand Up @@ -363,7 +363,7 @@ case "$enable_xti" in
yes)
use_xti=true
;;
no)
no)
use_xti=false
;;
'')
Expand Down Expand Up @@ -399,7 +399,7 @@ case "$enable_sdp" in
AC_CHECK_LIB(sdp,t_open)
use_sdp=true
;;
no)
no)
use_sdp=false
;;
'')
Expand Down Expand Up @@ -435,7 +435,7 @@ case "$enable_exs" in
AC_CHECK_HEADER(sys/exs.h,,[use_exs=false])
AC_CHECK_LIB(exs,exs_init,,[use_exs=false])
;;
no)
no)
use_exs=false
;;
'')
Expand Down Expand Up @@ -641,7 +641,7 @@ case "$enable_cpuutil" in
looper)
use_cpuutil=true
AC_DEFINE([USE_LOOPER],,[Use looper/soaker processes to measure CPU util.])
;;
;;
procstat)
use_cpuutil=true
AC_DEFINE([USE_PROC_STAT],,[Use Linux's procstat interface to measure CPU util.])
Expand Down
2 changes: 1 addition & 1 deletion doc/examples/runremomniaggdemo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ function run_cmd {
id=`printf "%.5d" $i`
RUN="$NETPERF -H $TARGET $NETPERF_CMD 2>&1 > netperf_${TEST}_${id}_${SOURCE}_to_${TARGET}.out & exit"
ssh -f ${SSH_OPTS} ubuntu@$SOURCE "$RUN" 2>&1 >> starting.log
i=`expr $i + 1`
if [ $i -eq $PAUSE_AT ] && [ $i -ne $MAX_INSTANCES ]
Expand Down
2 changes: 1 addition & 1 deletion doc/examples/runremrandomniaggdemo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ function run_cmd {
id=`printf "%.5d" $i`
RUN="$NETPERF -H $TARGET $NETPERF_CMD 2>&1 > netperf_${TEST}_${id}_${SOURCE}_to_${TARGET}.out & exit"
ssh -f ${SSH_OPTS} $INSTANCEUSER@$SOURCE "$RUN" 2>&1 >> starting.log

i=`expr $i + 1`

if [ $i -eq $PAUSE_AT ] && [ $i -ne $MAX_INSTANCES ]
Expand Down
Binary file modified doc/netperf.pdf
Binary file not shown.
Binary file modified doc/netperf_old.ps
Binary file not shown.
2 changes: 1 addition & 1 deletion src/missing/getaddrinfo.c
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ getnameinfo(sa, salen, node, nodelen, serv, servlen, flags)
}
strcpy(node, ntoa_address);
}

}

end:
Expand Down
2 changes: 1 addition & 1 deletion src/netfirewall_linux.c
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ enable_port(int port, int protocol) {

if ((port < 0) || (port > 65535))
return;

/* one of these days we will have to learn the proper way to see if
a port is already open under Linux... */
sprintf(command,
Expand Down
4 changes: 2 additions & 2 deletions src/netlib.c
Original file line number Diff line number Diff line change
Expand Up @@ -1163,7 +1163,7 @@ emulate_alarm( int seconds )
It is rather kludgy, but should be sufficient to
get this puppy shipped. The concept can be
attributed/blamed :) on Robin raj 1/96 */

if (win_kludge_socket != INVALID_SOCKET) {
HandlesClosedFlags |= 1;
closesocket(win_kludge_socket);
Expand Down Expand Up @@ -1294,7 +1294,7 @@ start_itimer(unsigned int interval_len_msec )
LARGE_INTEGER liDueTime;
TIMECAPS ptc;
MMRESULT mmr;

/* make sure timer resolution is at least as small as interval length */
timerRes=interval_len_msec;
mmr=timeGetDevCaps(&ptc, sizeof (ptc));
Expand Down
2 changes: 1 addition & 1 deletion src/nettest_bsd.c
Original file line number Diff line number Diff line change
Expand Up @@ -3034,7 +3034,7 @@ Size (bytes)\n\
}

stop_timer();

#if defined(WANT_INTERVALS)
#ifdef WIN32
stop_itimer();
Expand Down
46 changes: 23 additions & 23 deletions src/nettest_sctp.c
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ extern int first_burst_size;
/* these variables are specific to SCTP tests. declare */
/* them static to make them global only to this file. */

static int
static int
msg_count = 0, /* number of messages to transmit on association */
non_block = 0, /* default to blocking sockets */
num_associations = 1; /* number of associations on the endpoint */
Expand Down Expand Up @@ -872,7 +872,7 @@ Size (bytes)\n\
/* there was no idle counter in the kernel(s). We need to make */
/* a note of this for the user's benefit...*/
if (local_cpu_usage) {

local_cpu_utilization = calc_cpu_util(0.0);
local_service_demand = calc_service_demand(bytes_sent,
0.0,
Expand All @@ -885,7 +885,7 @@ Size (bytes)\n\
}

if (remote_cpu_usage) {

remote_cpu_utilization = sctp_stream_result->cpu_util;
remote_service_demand = calc_service_demand(bytes_sent,
0.0,
Expand Down Expand Up @@ -1754,7 +1754,7 @@ Size (bytes)\n\
perror("netperf: send_sctp_stream_1toMany: sctp stream data socket");
exit(1);
}

if (debug) {
fprintf(where,"send_sctp_stream_1toMany: send_socket obtained...\n");
}
Expand Down Expand Up @@ -2030,7 +2030,7 @@ Size (bytes)\n\
/* there was no idle counter in the kernel(s). We need to make */
/* a note of this for the user's benefit...*/
if (local_cpu_usage) {

local_cpu_utilization = calc_cpu_util(0.0);
local_service_demand = calc_service_demand(bytes_sent,
0.0,
Expand All @@ -2043,7 +2043,7 @@ Size (bytes)\n\
}

if (remote_cpu_usage) {

remote_cpu_utilization = sctp_stream_result->cpu_util;
remote_service_demand = calc_service_demand(bytes_sent,
0.0,
Expand Down Expand Up @@ -3533,7 +3533,7 @@ recv_sctp_rr( void )
if (debug) {
fprintf(where,"yo55\n");
fflush(where);
}
}
break;
}

Expand Down Expand Up @@ -3565,7 +3565,7 @@ recv_sctp_rr( void )
if (debug) {
fprintf(where,"yo6\n");
fflush(where);
}
}
break;
}

Expand Down Expand Up @@ -3885,7 +3885,7 @@ Send Recv Send Recv\n\
remote_res->ai_addr,
remote_res->ai_addrlen) < 0){
perror("netperf: data socket connect failed");

exit(1);
}

Expand Down Expand Up @@ -3991,7 +3991,7 @@ Send Recv Send Recv\n\
/* after the receive raj 8/94 */
HIST_timestamp_start(time_hist);
#endif /* WANT_HISTOGRAM */

while ((len=sctp_sendmsg(send_socket[j],
send_ring->buffer_ptr, req_size,
remote_res->ai_addr,
Expand All @@ -4015,10 +4015,10 @@ Send Recv Send Recv\n\
/* another call to break. */
break;
}

/* setup for the next time */
send_ring = send_ring->next;

rsp_bytes_left = rsp_size;
temp_message_ptr = recv_ring->buffer_ptr;
while (!(msg_flags & MSG_EOR)) {
Expand All @@ -4039,24 +4039,24 @@ Send Recv Send Recv\n\
}
rsp_bytes_left -= rsp_bytes_recvd;
temp_message_ptr += rsp_bytes_recvd;
}
}
recv_ring = recv_ring->next;

if (timed_out) {
/* we may have been in a nested while loop - we need */
/* another call to break. */
break;
}

#ifdef WANT_HISTOGRAM
HIST_timestamp_stop_add(time_hist);
#endif /* WANT_HISTOGRAM */

nummessages++;
if (trans_remaining) {
trans_remaining--;
}

if (debug > 3) {
if ((nummessages % 100) == 0) {
fprintf(where,
Expand Down Expand Up @@ -4583,7 +4583,7 @@ recv_sctp_rr_1toMany( void )
if (debug) {
fprintf(where,"yo5\n");
fflush(where);
}
}
break;
}

Expand All @@ -4610,7 +4610,7 @@ recv_sctp_rr_1toMany( void )
if (debug) {
fprintf(where,"yo6\n");
fflush(where);
}
}
/* we hit the end of the test based on time - lets */
/* bail out of here now... */
break;
Expand Down Expand Up @@ -4692,7 +4692,7 @@ scan_sctp_args( int argc, char *argv[] )

int c;

char
char
arg1[BUFSIZ], /* argument holders */
arg2[BUFSIZ];

Expand All @@ -4713,7 +4713,7 @@ scan_sctp_args( int argc, char *argv[] )

while ((c= getopt(argc, argv, SOCKETS_ARGS)) != EOF) {
switch (c) {
case '?':
case '?':
case '4':
remote_data_family = AF_INET;
local_data_family = AF_INET;
Expand Down Expand Up @@ -4773,7 +4773,7 @@ scan_sctp_args( int argc, char *argv[] )
break_args(optarg,arg1,arg2);
if (arg1[0])
strncpy(local_data_port,arg1,sizeof(local_data_port));
if (arg2[0])
if (arg2[0])
strncpy(remote_data_port,arg2,sizeof(remote_data_port));
break;
case 's':
Expand All @@ -4797,7 +4797,7 @@ scan_sctp_args( int argc, char *argv[] )
break_args(optarg,arg1,arg2);
if (arg1[0])
req_size = convert(arg1);
if (arg2[0])
if (arg2[0])
rsp_size = convert(arg2);
break;
case 'm':
Expand Down
2 changes: 1 addition & 1 deletion src/nettest_sctp.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ struct sctp_stream_response_struct {

struct sctp_stream_results_struct {
double bytes_received;
unsigned int recv_calls;
unsigned int recv_calls;
float elapsed_time; /* how long the test ran */
float cpu_util; /* -1 if not measured */
float serv_dem; /* -1 if not measured */
Expand Down
4 changes: 2 additions & 2 deletions src/nettest_sdp.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ struct sdp_stream_response_struct {

struct sdp_stream_results_struct {
double bytes_received;
unsigned int recv_calls;
unsigned int recv_calls;
float elapsed_time; /* how long the test ran */
float cpu_util; /* -1 if not measured */
float serv_dem; /* -1 if not measured */
Expand Down Expand Up @@ -173,7 +173,7 @@ struct sdp_maerts_response_struct {

struct sdp_maerts_results_struct {
double bytes_sent;
unsigned int send_calls;
unsigned int send_calls;
float elapsed_time; /* how long the test ran */
float cpu_util; /* -1 if not measured */
float serv_dem; /* -1 if not measured */
Expand Down
2 changes: 1 addition & 1 deletion src/nettest_xti.h
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ struct xti_tcp_stream_response_struct {

struct xti_tcp_stream_results_struct {
double bytes_received;
unsigned int recv_calls;
unsigned int recv_calls;
float elapsed_time; /* how long the test ran */
float cpu_util; /* -1 if not measured */
float serv_dem; /* -1 if not measured */
Expand Down

0 comments on commit 0dbda2d

Please sign in to comment.