rename some variables in rxperf

sendtimes and recvtimes are actually the data byte counts to be
exchanged during an rpc test not an iteration count as implied
by their names

Reviewed-on: http://gerrit.openafs.org/2876
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
Tested-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit 9d912b6f1c4f3d242429c66291107b2badd166e4)
Change-Id: Ie18184f5d6d911ba18ad216cb3726378333f6213
Reviewed-on: http://gerrit.openafs.org/3036

diff --git a/src/rx/test/rxperf.c b/src/rx/test/rxperf.c
index ce6c4cfe89d17a6072dc3ef835ab301395e32d89..3ab7b768b5b1db295b52a4fe3a7e489e9b8b42fd 100644 (file)
--- a/src/rx/test/rxperf.c
+++ b/src/rx/test/rxperf.c
@@ -280,7 +280,7 @@ afs_int32 rxread_size = sizeof(somebuf);
 afs_int32 use_rx_readv = 0;
 
 static int
-readbytes(struct rx_call *call, afs_int32 bytes)
+do_readbytes(struct rx_call *call, afs_int32 bytes)
 {
     struct iovec tiov[RX_MAXIOVECS];
     afs_int32 size;
@@ -307,7 +307,7 @@ readbytes(struct rx_call *call, afs_int32 bytes)
 }
 
 static int
-sendbytes(struct rx_call *call, afs_int32 bytes)
+do_sendbytes(struct rx_call *call, afs_int32 bytes)
 {
     afs_int32 size;
 
@@ -386,7 +386,7 @@ rxperf_ExecuteRequest(struct rx_call *call)
        bytes = ntohl(bytes);
 
        DBFPRINT(("reading(%d) ", bytes));
-       readbytes(call, bytes);
+       do_readbytes(call, bytes);
 
        data = htonl(RXPERF_MAGIC_COOKIE);
        if (rx_Write32(call, &data) != 4) {
@@ -411,12 +411,12 @@ rxperf_ExecuteRequest(struct rx_call *call)
        sendb = ntohl(sendb);
 
        DBFPRINT(("read(%d) ", recvb));
-       if (readbytes(call, recvb)) {
-           warnx("readbytes failed");
+       if (do_readbytes(call, recvb)) {
+           warnx("do_readbytes failed");
            return -1;
        }
        DBFPRINT(("send(%d) ", sendb));
-       if (sendbytes(call, sendb)) {
+       if (do_sendbytes(call, sendb)) {
            warnx("sendbytes failed");
            return -1;
        }
@@ -453,9 +453,9 @@ rxperf_ExecuteRequest(struct rx_call *call)
 
            if (readp) {
                DBFPRINT(("read\n"));
-               readbytes(call, bytes);
+               do_readbytes(call, bytes);
            } else {
-               sendbytes(call, bytes);
+               do_sendbytes(call, bytes);
                DBFPRINT(("send\n"));
            }
        }
@@ -471,7 +471,7 @@ rxperf_ExecuteRequest(struct rx_call *call)
        bytes = ntohl(bytes);
 
        DBFPRINT(("sending(%d) ", bytes));
-       sendbytes(call, bytes);
+       do_sendbytes(call, bytes);
 
        data = htonl(RXPERF_MAGIC_COOKIE);
        if (rx_Write32(call, &data) != 4) {
@@ -614,8 +614,8 @@ struct client_data {
     int command;
     afs_int32 times;
     afs_int32 bytes;
-    afs_int32 sendtimes;
-    afs_int32 recvtimes;
+    afs_int32 sendbytes;
+    afs_int32 readbytes;
 };
 
 static void *
@@ -663,7 +663,7 @@ client_thread( void *vparams)
                errx(1, "rx_Write failed to send size (err %d)", rx_Error(call));
 
            DBFPRINT(("sending(%d) ", params->bytes));
-           if (readbytes(call, params->bytes))
+           if (do_readbytes(call, params->bytes))
                errx(1, "sendbytes (err %d)", rx_Error(call));
 
            if (rx_Read32(call, &data) != 4)
@@ -683,7 +683,7 @@ client_thread( void *vparams)
                errx(1, "rx_Write failed to send size (err %d)", rx_Error(call));
 
            DBFPRINT(("sending(%d) ", params->bytes));
-           if (sendbytes(call, params->bytes))
+           if (do_sendbytes(call, params->bytes))
                errx(1, "sendbytes (err %d)", rx_Error(call));
 
            if (rx_Read32(call, &data) != 4)
@@ -698,20 +698,20 @@ client_thread( void *vparams)
        case RX_PERF_RPC:
            DBFPRINT(("commands "));
 
-           data = htonl(params->sendtimes);
+           data = htonl(params->sendbytes);
            if (rx_Write32(call, &data) != 4)
                errx(1, "rx_Write failed to send command (err %d)", rx_Error(call));
 
-           data = htonl(params->recvtimes);
+           data = htonl(params->readbytes);
            if (rx_Write32(call, &data) != 4)
                errx(1, "rx_Write failed to send command (err %d)", rx_Error(call));
 
-           DBFPRINT(("send(%d) ", params->sendtimes));
-           if (sendbytes(call, params->sendtimes))
+           DBFPRINT(("send(%d) ", params->sendbytes));
+           if (do_sendbytes(call, params->sendbytes))
                errx(1, "sendbytes (err %d)", rx_Error(call));
 
-           DBFPRINT(("recv(%d) ", params->recvtimes));
-           if (readbytes(call, params->recvtimes))
+           DBFPRINT(("recv(%d) ", params->readbytes));
+           if (do_readbytes(call, params->readbytes))
                errx(1, "sendbytes (err %d)", rx_Error(call));
 
            if (rx_Read32(call, &data) != 4)
@@ -742,11 +742,11 @@ client_thread( void *vparams)
                size = ntohl(readwrite[j]) * sizeof(afs_uint32);
 
                if (readp) {
-                   if (readbytes(call, size))
+                   if (do_readbytes(call, size))
                        errx(1, "sendbytes (err %d)", rx_Error(call));
                    DBFPRINT(("read\n"));
                } else {
-                   if (sendbytes(call, size))
+                   if (do_sendbytes(call, size))
                        errx(1, "sendbytes (err %d)", rx_Error(call));
                    DBFPRINT(("send\n"));
                }
@@ -772,7 +772,7 @@ client_thread( void *vparams)
 
 static void
 do_client(const char *server, short port, char *filename, afs_int32 command,
-         afs_int32 times, afs_int32 bytes, afs_int32 sendtimes, afs_int32 recvtimes,
+         afs_int32 times, afs_int32 bytes, afs_int32 sendbytes, afs_int32 readbytes,
           int dumpstats, int nojumbo, int maxmtu, int maxwsize, int minpeertimeout,
           int udpbufsz, int nostats, int hotthread, int threads)
 {
@@ -846,13 +846,13 @@ do_client(const char *server, short port, char *filename, afs_int32 command,
     params->command = command;
     params->times = times;
     params->bytes = bytes;
-    params->sendtimes = sendtimes;
-    params->recvtimes = recvtimes;
+    params->sendbytes = sendbytes;
+    params->readbytes = readbytes;
 
     switch (command) {
     case RX_PERF_RPC:
-        sprintf(stamp, "RPC: threads\t%d, times\t%d, writes\t%d, reads\t%d",
-                 threads, times, sendtimes, recvtimes);
+        sprintf(stamp, "RPC: threads\t%d, times\t%d, write bytes\t%d, read bytes\t%d",
+                 threads, times, sendbytes, readbytes);
         break;
     case RX_PERF_RECV:
         sprintf(stamp, "RECV: threads\t%d, times\t%d, bytes\t%d",
@@ -1043,8 +1043,8 @@ rxperf_client(int argc, char **argv)
     short port = DEFAULT_PORT;
     char *filename = NULL;
     afs_int32 cmd;
-    int sendtimes = 3;
-    int recvtimes = 30;
+    int sendbytes = 3;
+    int readbytes = 30;
     int times = 100;
     int dumpstats = 0;
     int nojumbo = 0;
@@ -1133,12 +1133,12 @@ rxperf_client(int argc, char **argv)
                errx(1, "can't resolve number of times to execute rpc");
            break;
        case 'S':
-           sendtimes = strtol(optarg, &ptr, 0);
+           sendbytes = strtol(optarg, &ptr, 0);
            if (ptr && *ptr != '\0')
                errx(1, "can't resolve number of bytes to send");
            break;
        case 'R':
-           recvtimes = strtol(optarg, &ptr, 0);
+           readbytes = strtol(optarg, &ptr, 0);
            if (ptr && *ptr != '\0')
                errx(1, "can't resolve number of bytes to receive");
            break;
@@ -1198,8 +1198,8 @@ rxperf_client(int argc, char **argv)
     if (cmd == RX_PERF_UNKNOWN)
        errx(1, "no command given to the client");
 
-    do_client(host, port, filename, cmd, times, bytes, sendtimes,
-             recvtimes, dumpstats, nojumbo, maxmtu, maxwsize, minpeertimeout,
+    do_client(host, port, filename, cmd, times, bytes, sendbytes,
+             readbytes, dumpstats, nojumbo, maxmtu, maxwsize, minpeertimeout,
               udpbufsz, nostats, hotthreads, threads);
 
     return 0;