refresh

diff --git a/meta b/meta
index 9d13418ffdf04f58f266f18bb43673f815c8099a..98388a1b06654956182292b92e97ef38bc3321be 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: b9a7699bc29d620415ac6875f3cc8ddd7efb3eeb
-Head: 85b73f4d3d087401e57a11856cd362eadec7d247
+Previous: 5685af224e524ad013a1f4724ec340cc8bba1828
+Head: fc2c0185311b13fd8e9f46f5ff43e080917c4237
 Applied:
   dsocket: 30a3a196b65c1c0637c01d0829f1ed00ba53225d
-  udpong: 9b8e30b0633710e5b1d3e3b6b53775b2ffe95a74
-  refresh-temp: 85b73f4d3d087401e57a11856cd362eadec7d247
+  udpong: fc2c0185311b13fd8e9f46f5ff43e080917c4237
 Unapplied:
   test-udp: f6c78ad2a26f452cf166aff1baa7b76160bd8bf7
   iom-dbg: 88434072d07f8edc58f454ac954d78bd39441eed

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 5fc82fd..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,46 +0,0 @@
-Bottom: 8302a577be6c358d3314f45cc04981a1e2758a4a
-Top:    0193ea3f86e40817c7a07fa255410a2807ce8df3
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-12-15 17:41:21 -0800
-
-Refresh of udpong
-
----
-
-diff --git a/examples/udpong.c b/examples/udpong.c
-index 2e3de3e..af8deb9 100644
---- a/examples/udpong.c
-+++ b/examples/udpong.c
-@@ -375,22 +375,11 @@ 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++) {
-@@ -440,10 +429,8 @@ 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 c25814aeec7ec6b4c4f54b8e2215056c320839a0..9a15ddada6d0ce046a3670ad365c8f0685a2ac8c 100644 (file)
--- a/patches/udpong
+++ b/patches/udpong
@@ -1,5 +1,5 @@
 Bottom: 085131bec099e61aa57e12da9977ca49a5ea1a1e
-Top:    8302a577be6c358d3314f45cc04981a1e2758a4a
+Top:    0193ea3f86e40817c7a07fa255410a2807ce8df3
 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..2e3de3e
+index 0000000..af8deb9
 --- /dev/null
 +++ b/examples/udpong.c
-@@ -0,0 +1,581 @@
+@@ -0,0 +1,568 @@
 +/*
 + * Copyright (c) 2012 Intel Corporation.  All rights reserved.
 + *
@@ -965,22 +965,11 @@ index 0000000..2e3de3e
 +{
 +      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++) {
@@ -1030,10 +1019,8 @@ index 0000000..2e3de3e
 +              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;
 +