refresh

diff --git a/meta b/meta
index 5d7489d50f8284a01b27ec2aa3c149fb59055eab..6d83d64b8c84c3341c37f581dc29b3e838143f53 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 79c036478848bf99e48ea004ce4ff68333cc8cb3
-Head: a34b73fdb63ca45198632d2d5c8367ebb154ab0e
+Previous: c30b848e8d045f359bdcf000835f539cdaa54b60
+Head: a075a129f6df8781dd567e78229790071bc86139
 Applied:
   dsocket: 320986faa492c17e8858885798b9da8afaad7551
-  udpong: 3c7c899adc5a1cefd244be4f54b5be9b6cbc7d46
-  refresh-temp: a34b73fdb63ca45198632d2d5c8367ebb154ab0e
+  udpong: a075a129f6df8781dd567e78229790071bc86139
 Unapplied:
   test-udp: f6c78ad2a26f452cf166aff1baa7b76160bd8bf7
   iom-dbg: 88434072d07f8edc58f454ac954d78bd39441eed

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 29af44f..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,122 +0,0 @@
-Bottom: 854184ce75f3902fa1b4d84530045ee2fb8fbb05
-Top:    3855a3afdaa94a3f44bd0f049eea2e89afa14c9a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-12-07 17:34:00 -0800
-
-Refresh of udpong
-
----
-
-diff --git a/examples/common.h b/examples/common.h
-index 37dc79e..eaffb57 100644
---- a/examples/common.h
-+++ b/examples/common.h
-@@ -62,7 +62,7 @@ extern int use_rs;
- #define rs_recvfrom(s,b,l,f,a,al) \
-       use_rs ? rrecvfrom(s,b,l,f,a,al) : recvfrom(s,b,l,f,a,al)
- #define rs_sendto(s,b,l,f,a,al) \
--      use_rs ? rsendto(s,b,l,f,a,al)   : sendto(s,b,l,fa,al)
-+      use_rs ? rsendto(s,b,l,f,a,al)   : sendto(s,b,l,f,a,al)
- #define rs_poll(f,n,t)          use_rs ? rpoll(f,n,t)    : poll(f,n,t)
- #define rs_fcntl(s,c,p)   use_rs ? rfcntl(s,c,p)   : fcntl(s,c,p)
- #define rs_setsockopt(s,l,n,v,ol) \
-diff --git a/examples/udpong.c b/examples/udpong.c
-index 4adec2f..d4f43ac 100644
---- a/examples/udpong.c
-+++ b/examples/udpong.c
-@@ -48,11 +48,11 @@
- #include "common.h"
- 
- static int test_size[] = {
--      { 1 <<  6 },
--      { 1 <<  7 }, { (1 <<  7) + (1 <<  6) },
--      { 1 <<  8 }, { (1 <<  8) + (1 <<  7) },
--      { 1 <<  9 }, { (1 <<  9) + (1 <<  8) },
--      { 1 << 10 }, { (1 << 10) + (1 <<  9) },
-+      (1 <<  6),
-+      (1 <<  7), ((1 <<  7) + (1 << 6)),
-+      (1 <<  8), ((1 <<  8) + (1 << 7)),
-+      (1 <<  9), ((1 <<  9) + (1 << 8)),
-+      (1 << 10), ((1 << 10) + (1 << 9)),
- };
- #define TEST_CNT (sizeof test_size / sizeof test_size[0])
- 
-@@ -78,7 +78,7 @@ struct client {
- };
- 
- static struct client clients[256];
--static int id;
-+static uint8_t id;
- 
- static int rs;
- static int use_async;
-@@ -106,13 +106,8 @@ static void show_perf(void)
-       int transfers;
- 
-       usec = (end.tv_sec - start.tv_sec) * 1000000 + (end.tv_usec - start.tv_usec);
--      if (echo) {
--              transfers = transfer_count;
--              bytes = (long long) transfer_count * transfer_size * 2;
--      } else {
--              transfers = ntohl(msg.data);
--              bytes = (long long) transfers * transfer_size;
--      }
-+      transfers = echo ? transfer_count * 2 : ntohl(msg.data);
-+      bytes = (long long) transfers * transfer_size;
- 
-       /* name size transfers bytes seconds Gb/sec usec/xfer */
-       printf("%-10s", test_name);
-@@ -124,7 +119,7 @@ static void show_perf(void)
-       printf("%-8s", str);
-       printf("%8.2fs%10.2f%11.2f\n",
-               usec / 1000000., (bytes * 8) / (1000. * usec),
--              (usec / iterations) / (transfers * 2));
-+              (usec / transfers));
- }
- 
- static void init_latency_test(int size)
-@@ -208,7 +203,7 @@ static ssize_t svr_recv(struct message *msg, size_t size,
- 
-       do {
-               if (use_async) {
--                      ret = do_poll(fds, poll_timeout);
-+                      ret = do_poll(&fds, poll_timeout);
-                       if (ret)
-                               return ret;
-               }
-@@ -230,7 +225,7 @@ static int svr_process(struct message *msg, size_t size,
-       switch (msg->op) {
-       case msg_op_start:
-               memset(&clients[id], 0, sizeof clients[id]);
--              msg.id = id++;
-+              msg->id = id++;
-               break;
-       case msg_op_echo:
-               clients[msg->id].recvcnt++;
-@@ -331,7 +326,7 @@ static ssize_t client_recv(struct message *msg, size_t size, int timeout)
-               fds.fd = rs;
-               fds.events = POLLIN;
- 
--              ret = rs_poll(fds, 1, timeout);
-+              ret = rs_poll(&fds, 1, timeout);
-               if (ret <= 0)
-                       return ret;
-       }
-@@ -360,7 +355,7 @@ static int client_send_recv(struct message *msg, size_t size)
- 
- static int run_test(void)
- {
--      int ret, i, t;
-+      int ret, i;
- 
-       msg.op = msg_op_start;
-       ret = client_send_recv(&msg, CTRL_MSG_SIZE);
-@@ -396,7 +391,7 @@ static int client_connect(void)
- 
-       memset(&hints, 0, sizeof hints);
-       hints.ai_socktype = SOCK_DGRAM;
--      ret = getaddrinfo(dst_addr, port, hints, &res);
-+      ret = getaddrinfo(dst_addr, port, &hints, &res);
-       if (ret) {
-               perror("getaddrinfo");
-               return ret;

diff --git a/patches/udpong b/patches/udpong
index 90a25a3e1541abb9d65d1fe23cbc5f5b56a97295..960b03ea7f0102358c52bdddb3f468a640ff6031 100644 (file)
--- a/patches/udpong
+++ b/patches/udpong
@@ -1,5 +1,5 @@
 Bottom: d58bea7ff66215f5a1631dca9de9254822217783
-Top:    854184ce75f3902fa1b4d84530045ee2fb8fbb05
+Top:    3855a3afdaa94a3f44bd0f049eea2e89afa14c9a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-12-05 15:58:03 -0800
 
@@ -149,7 +149,7 @@ index 3eeb1e9..939f50c 100644
 +      return ret == 1 ? 0 : ret;
 +}
 diff --git a/examples/common.h b/examples/common.h
-index 8d9fea0..37dc79e 100644
+index 8d9fea0..eaffb57 100644
 --- a/examples/common.h
 +++ b/examples/common.h
 @@ -1,5 +1,5 @@
@@ -188,7 +188,7 @@ index 8d9fea0..37dc79e 100644
 +#define rs_recvfrom(s,b,l,f,a,al) \
 +      use_rs ? rrecvfrom(s,b,l,f,a,al) : recvfrom(s,b,l,f,a,al)
 +#define rs_sendto(s,b,l,f,a,al) \
-+      use_rs ? rsendto(s,b,l,f,a,al)   : sendto(s,b,l,fa,al)
++      use_rs ? rsendto(s,b,l,f,a,al)   : sendto(s,b,l,f,a,al)
 +#define rs_poll(f,n,t)          use_rs ? rpoll(f,n,t)    : poll(f,n,t)
 +#define rs_fcntl(s,c,p)   use_rs ? rfcntl(s,c,p)   : fcntl(s,c,p)
 +#define rs_setsockopt(s,l,n,v,ol) \
@@ -584,10 +584,10 @@ index 069b7c9..617710e 100644
  
 diff --git a/examples/udpong.c b/examples/udpong.c
 new file mode 100644
-index 0000000..4adec2f
+index 0000000..d4f43ac
 --- /dev/null
 +++ b/examples/udpong.c
-@@ -0,0 +1,550 @@
+@@ -0,0 +1,545 @@
 +/*
 + * Copyright (c) 2012 Intel Corporation.  All rights reserved.
 + *
@@ -638,11 +638,11 @@ index 0000000..4adec2f
 +#include "common.h"
 +
 +static int test_size[] = {
-+      { 1 <<  6 },
-+      { 1 <<  7 }, { (1 <<  7) + (1 <<  6) },
-+      { 1 <<  8 }, { (1 <<  8) + (1 <<  7) },
-+      { 1 <<  9 }, { (1 <<  9) + (1 <<  8) },
-+      { 1 << 10 }, { (1 << 10) + (1 <<  9) },
++      (1 <<  6),
++      (1 <<  7), ((1 <<  7) + (1 << 6)),
++      (1 <<  8), ((1 <<  8) + (1 << 7)),
++      (1 <<  9), ((1 <<  9) + (1 << 8)),
++      (1 << 10), ((1 << 10) + (1 << 9)),
 +};
 +#define TEST_CNT (sizeof test_size / sizeof test_size[0])
 +
@@ -668,7 +668,7 @@ index 0000000..4adec2f
 +};
 +
 +static struct client clients[256];
-+static int id;
++static uint8_t id;
 +
 +static int rs;
 +static int use_async;
@@ -696,13 +696,8 @@ index 0000000..4adec2f
 +      int transfers;
 +
 +      usec = (end.tv_sec - start.tv_sec) * 1000000 + (end.tv_usec - start.tv_usec);
-+      if (echo) {
-+              transfers = transfer_count;
-+              bytes = (long long) transfer_count * transfer_size * 2;
-+      } else {
-+              transfers = ntohl(msg.data);
-+              bytes = (long long) transfers * transfer_size;
-+      }
++      transfers = echo ? transfer_count * 2 : ntohl(msg.data);
++      bytes = (long long) transfers * transfer_size;
 +
 +      /* name size transfers bytes seconds Gb/sec usec/xfer */
 +      printf("%-10s", test_name);
@@ -714,7 +709,7 @@ index 0000000..4adec2f
 +      printf("%-8s", str);
 +      printf("%8.2fs%10.2f%11.2f\n",
 +              usec / 1000000., (bytes * 8) / (1000. * usec),
-+              (usec / iterations) / (transfers * 2));
++              (usec / transfers));
 +}
 +
 +static void init_latency_test(int size)
@@ -798,7 +793,7 @@ index 0000000..4adec2f
 +
 +      do {
 +              if (use_async) {
-+                      ret = do_poll(fds, poll_timeout);
++                      ret = do_poll(&fds, poll_timeout);
 +                      if (ret)
 +                              return ret;
 +              }
@@ -820,7 +815,7 @@ index 0000000..4adec2f
 +      switch (msg->op) {
 +      case msg_op_start:
 +              memset(&clients[id], 0, sizeof clients[id]);
-+              msg.id = id++;
++              msg->id = id++;
 +              break;
 +      case msg_op_echo:
 +              clients[msg->id].recvcnt++;
@@ -921,7 +916,7 @@ index 0000000..4adec2f
 +              fds.fd = rs;
 +              fds.events = POLLIN;
 +
-+              ret = rs_poll(fds, 1, timeout);
++              ret = rs_poll(&fds, 1, timeout);
 +              if (ret <= 0)
 +                      return ret;
 +      }
@@ -950,7 +945,7 @@ index 0000000..4adec2f
 +
 +static int run_test(void)
 +{
-+      int ret, i, t;
++      int ret, i;
 +
 +      msg.op = msg_op_start;
 +      ret = client_send_recv(&msg, CTRL_MSG_SIZE);
@@ -986,7 +981,7 @@ index 0000000..4adec2f
 +
 +      memset(&hints, 0, sizeof hints);
 +      hints.ai_socktype = SOCK_DGRAM;
-+      ret = getaddrinfo(dst_addr, port, hints, &res);
++      ret = getaddrinfo(dst_addr, port, &hints, &res);
 +      if (ret) {
 +              perror("getaddrinfo");
 +              return ret;