refresh

diff --git a/meta b/meta
index 4d6bce82e70385e8848698ab426341f318a29813..bfb3ca864223e94bed0589c490f3f9605e252006 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 082726ec9c4a682d0d2a3c0a5976f442895fe14b
-Head: e71036b5f58d6fcaadf02650e5d266e374a70278
+Previous: 5236bfccda9b7e6d6cda4e5a17d95e30a19160fc
+Head: 0d01bada46421fe24e2ecc84c6d3d1e89cebef64
 Applied:
   dsocket: 320986faa492c17e8858885798b9da8afaad7551
-  udpong: 28b925cd2b29a61d24f97198b80d2a7af7891c11
-  refresh-temp: e71036b5f58d6fcaadf02650e5d266e374a70278
+  udpong: 0d01bada46421fe24e2ecc84c6d3d1e89cebef64
 Unapplied:
   test-udp: f6c78ad2a26f452cf166aff1baa7b76160bd8bf7
   iom-dbg: 88434072d07f8edc58f454ac954d78bd39441eed

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 5a4c54e..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,46 +0,0 @@
-Bottom: 2cfd1213602b08cffdeaa70b35ffe759618c3cec
-Top:    9e3e037135928d4420496bf19acfd9b674f415cc
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-12-10 14:53:17 -0800
-
-Refresh of udpong
-
----
-
-diff --git a/examples/udpong.c b/examples/udpong.c
-index 12f0e5b..3b0f961 100644
---- a/examples/udpong.c
-+++ b/examples/udpong.c
-@@ -375,11 +375,22 @@ static int run_test(void)
- {
-       int ret, i;
- 
-+printf("send start msg 1\n");
-       msg.op = msg_op_start;
-       ret = client_send_recv(&msg, CTRL_MSG_SIZE, 1000);
-       if (ret != CTRL_MSG_SIZE)
-               goto out;
- 
-+      printf("send start msg 2\n");
-+      ret = client_send_recv(&msg, CTRL_MSG_SIZE, 1000);
-+      if (ret != CTRL_MSG_SIZE)
-+              goto out;
-+      printf("send start msg 3\n");
-+      ret = client_send_recv(&msg, CTRL_MSG_SIZE, 1000);
-+      if (ret != CTRL_MSG_SIZE)
-+              goto out;
-+      printf("starting test\n");
-+
-       msg.op = echo ? msg_op_echo : msg_op_data;
-       gettimeofday(&start, NULL);
-       for (i = 0; i < transfer_count; i++) {
-@@ -429,8 +440,10 @@ static int client_connect(void)
-               rs_close(rs);
-       }
- 
-+      printf("send login msg\n");
-       msg.op = msg_op_login;
-       ret = client_send_recv(&msg, CTRL_MSG_SIZE, 1000);
-+      printf("login %d %s\n", ret, strerror(errno));
-       if (ret == CTRL_MSG_SIZE)
-               ret = 0;

diff --git a/patches/udpong b/patches/udpong
index 9745a7f94976c5c4d9707812e0edd2ae609ed911..65f9d97694859da3bcd115c004636bdac650d82d 100644 (file)
--- a/patches/udpong
+++ b/patches/udpong
@@ -1,5 +1,5 @@
 Bottom: d58bea7ff66215f5a1631dca9de9254822217783
-Top:    2cfd1213602b08cffdeaa70b35ffe759618c3cec
+Top:    9e3e037135928d4420496bf19acfd9b674f415cc
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-12-05 15:58:03 -0800
 
@@ -584,10 +584,10 @@ index 069b7c9..617710e 100644
  
 diff --git a/examples/udpong.c b/examples/udpong.c
 new file mode 100644
-index 0000000..12f0e5b
+index 0000000..3b0f961
 --- /dev/null
 +++ b/examples/udpong.c
-@@ -0,0 +1,568 @@
+@@ -0,0 +1,581 @@
 +/*
 + * Copyright (c) 2012 Intel Corporation.  All rights reserved.
 + *
@@ -965,11 +965,22 @@ index 0000000..12f0e5b
 +{
 +      int ret, i;
 +
++printf("send start msg 1\n");
 +      msg.op = msg_op_start;
 +      ret = client_send_recv(&msg, CTRL_MSG_SIZE, 1000);
 +      if (ret != CTRL_MSG_SIZE)
 +              goto out;
 +
++      printf("send start msg 2\n");
++      ret = client_send_recv(&msg, CTRL_MSG_SIZE, 1000);
++      if (ret != CTRL_MSG_SIZE)
++              goto out;
++      printf("send start msg 3\n");
++      ret = client_send_recv(&msg, CTRL_MSG_SIZE, 1000);
++      if (ret != CTRL_MSG_SIZE)
++              goto out;
++      printf("starting test\n");
++
 +      msg.op = echo ? msg_op_echo : msg_op_data;
 +      gettimeofday(&start, NULL);
 +      for (i = 0; i < transfer_count; i++) {
@@ -1019,8 +1030,10 @@ index 0000000..12f0e5b
 +              rs_close(rs);
 +      }
 +
++      printf("send login msg\n");
 +      msg.op = msg_op_login;
 +      ret = client_send_recv(&msg, CTRL_MSG_SIZE, 1000);
++      printf("login %d %s\n", ret, strerror(errno));
 +      if (ret == CTRL_MSG_SIZE)
 +              ret = 0;
 +