rxperf: Build again
authorSimon Wilkinson <sxw@your-file-system.com>
Sun, 1 Apr 2012 19:40:24 +0000 (15:40 -0400)
committerJeffrey Altman <jaltman@secure-endpoints.com>
Mon, 9 Apr 2012 20:39:21 +0000 (13:39 -0700)
Fix rxperf so that it builds again

Change-Id: I9747bc1b3fedb96d5bc317acde69f35b1dc6efb8
Reviewed-on: http://gerrit.openafs.org/7011
Reviewed-by: Derrick Brashear <shadow@dementix.org>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Tested-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>

src/rx/test/Makefile.in
src/rx/test/rxperf.c

index fc76df2..826608d 100644 (file)
@@ -22,14 +22,14 @@ BASICINCLS =  ../rx_clock.h ../rx_queue.h ../rx_event.h
 
 LINK = $(AFS_LDRULE) $@.o ${LIBS}
 MT_LINK = $(CC) $(MT_CFLAGS) $(COMMON_CFLAGS) $(AFS_LDFLAGS) -o $@ \
-         $@.o $(TOP_LIBDIR)/libafsrpc.a $(LIB_hcrypto) $(LIB_roken) \
+         $@.o $(TOP_LIBDIR)/libafsrpc.a $(TOP_LIBDIR)/libopr.a \
+         $(LIB_hcrypto) $(LIB_roken) \
          $(MT_LIBS) $(XLIBS)
 
 TESTS = testclient testserver kstest kctest testqueue tableGen generator
 
 TH_TESTS = th_testserver th_testclient
 
-.IGNORE: 
 
 all: test
 
@@ -67,7 +67,7 @@ th_testserver.o: testserver.c
        $(MT_CC) $(COMMON_CFLAGS) $(MT_CFLAGS) -c -o th_testserver.o \
                ${srcdir}/testserver.c
 
-th_rxperf: th_rxperf.o ${TOP_LIBDIR}/libafsrpc.a
+th_rxperf: th_rxperf.o ${TOP_LIBDIR}/libafsrpc.a ${TOP_LIBDIR}/libopr.a
        $(MT_LINK)
 
 th_rxperf.o: rxperf.c
index 3a71ca1..f37ff9a 100644 (file)
@@ -967,7 +967,7 @@ rxperf_server(int argc, char **argv)
            if (ptr != 0 && ptr[0] != '\0')
                errx(1, "can't resolve readsize");
            if (rxread_size > sizeof(somebuf))
-               errx(1, "%d > sizeof(somebuf) (%d)", rxread_size,
+               errx(1, "%d > sizeof(somebuf) (%"AFS_SIZET_FMT")", rxread_size,
                     sizeof(somebuf));
            break;
        case 's':
@@ -995,7 +995,7 @@ rxperf_server(int argc, char **argv)
            if (ptr != 0 && ptr[0] != '\0')
                errx(1, "can't resolve writesize");
            if (rxwrite_size > sizeof(somebuf))
-               errx(1, "%d > sizeof(somebuf) (%d)", rxwrite_size,
+               errx(1, "%d > sizeof(somebuf) (%"AFS_SIZET_FMT")", rxwrite_size,
                     sizeof(somebuf));
            break;
        case 'j':
@@ -1114,7 +1114,7 @@ rxperf_client(int argc, char **argv)
            if (ptr != 0 && ptr[0] != '\0')
                errx(1, "can't resolve readsize");
            if (rxread_size > sizeof(somebuf))
-               errx(1, "%d > sizeof(somebuf) (%d)", rxread_size,
+               errx(1, "%d > sizeof(somebuf) (%"AFS_SIZET_FMT")", rxread_size,
                     sizeof(somebuf));
            break;
        case 's':
@@ -1130,7 +1130,7 @@ rxperf_client(int argc, char **argv)
            if (ptr != 0 && ptr[0] != '\0')
                errx(1, "can't resolve writesize");
            if (rxwrite_size > sizeof(somebuf))
-               errx(1, "%d > sizeof(somebuf) (%d)", rxwrite_size,
+               errx(1, "%d > sizeof(somebuf) (%"AFS_SIZET_FMT")", rxwrite_size,
                     sizeof(somebuf));
            break;
        case 'W':