refresh

diff --git a/meta b/meta
index bc7a6095462de4b31219bad6827086674bc1031b..8b5503dd4484351aecd472ab4dd5955f64cc0223 100644 (file)
--- a/meta
+++ b/meta
@@ -1,13 +1,12 @@
 Version: 1
-Previous: 6cfeea17861e2c7ba183f3020ba48bfb029404eb
-Head: 62b04e460e3c022fd6034ab85e59ba9bbf6cfde2
+Previous: 48622a2a801aa8a31ec41d304b2f516bc13f7393
+Head: 5f22fd6affd5193837567d5cf7113e1c25376ef4
 Applied:
   rm-ib-var: 63a728f303f78348ad9727c46ac3e271197dace4
   cma-rm-pd: 2ffda7f2991395570b9e776ff5ae256ca9684771
   transpose: 7856c0c353736cee5399eb2f706a6ac2913cc368
   fork: 1768d762d8a2100e5250234ddf080b722a5e582f
-  rstream-fork: 602815d0414b4eeb27251c22383cd13b75796480
-  refresh-temp: 62b04e460e3c022fd6034ab85e59ba9bbf6cfde2
+  rstream-fork: 5f22fd6affd5193837567d5cf7113e1c25376ef4
 Unapplied:
   dbg: 0068d0c2bc8c327b322182bdb33e140beeb9b706
   waitall-buggy: c49c6b56c55385774065f5aa2704078e6ae0ceb8

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 220e596..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,35 +0,0 @@
-Bottom: fac77e11574baf1034f2881bef2086f2f30ac95a
-Top:    1944ff9455330a5668da3d69575cd2e1928f07dc
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-07-19 15:13:57 -0700
-
-Refresh of rstream-fork
-
----
-
-diff --git a/examples/rstream.c b/examples/rstream.c
-index 8595657..490caa5 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -557,7 +557,9 @@ static int run(void)
-                       init_latency_test(test_size[i].size);
-                       run_test();
-               }
--              if (!fork_pid)
-+              if (fork_pid)
-+                      wait(NULL);
-+              else
-                       rs_shutdown(rs, SHUT_RDWR);
-               rs_close(rs);
- 
-@@ -583,7 +585,9 @@ static int run(void)
-                       ret = run_test();
-       }
- 
--      if (!fork_pid)
-+      if (fork_pid)
-+              wait(NULL);
-+      else
-               rs_shutdown(rs, SHUT_RDWR);
-       rs_close(rs);
- free:

diff --git a/patches/rstream-fork b/patches/rstream-fork
index 2dea55c304adb5e103f9892e1bea4411cf103f33..e1ff1de08d7b8dcf92e56450390e215b04e698a2 100644 (file)
--- a/patches/rstream-fork
+++ b/patches/rstream-fork
@@ -1,5 +1,5 @@
 Bottom: 06618864b863228d0a358680b7f0aeafe4237c7b
-Top:    fac77e11574baf1034f2881bef2086f2f30ac95a
+Top:    1944ff9455330a5668da3d69575cd2e1928f07dc
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-07-17 15:32:54 -0700
 
@@ -11,7 +11,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/examples/rstream.c b/examples/rstream.c
-index 48e2771..8595657 100644
+index 48e2771..490caa5 100644
 --- a/examples/rstream.c
 +++ b/examples/rstream.c
 @@ -84,6 +84,8 @@ static int verify;
@@ -35,7 +35,7 @@ index 48e2771..8595657 100644
        return ret;
  }
  
-@@ -546,20 +551,24 @@ static int run(void)
+@@ -546,20 +551,26 @@ static int run(void)
                if (ret)
                        goto free;
  
@@ -47,7 +47,9 @@ index 48e2771..8595657 100644
                        run_test();
                }
 -              rs_shutdown(rs, SHUT_RDWR);
-+              if (!fork_pid)
++              if (fork_pid)
++                      wait(NULL);
++              else
 +                      rs_shutdown(rs, SHUT_RDWR);
                rs_close(rs);
  
@@ -63,7 +65,7 @@ index 48e2771..8595657 100644
                        if (test_size[i].option > size_option)
                                continue;
                        init_bandwidth_test(test_size[i].size);
-@@ -570,10 +579,12 @@ static int run(void)
+@@ -570,10 +581,14 @@ static int run(void)
                if (ret)
                        goto free;
  
@@ -73,12 +75,14 @@ index 48e2771..8595657 100644
        }
  
 -      rs_shutdown(rs, SHUT_RDWR);
-+      if (!fork_pid)
++      if (fork_pid)
++              wait(NULL);
++      else
 +              rs_shutdown(rs, SHUT_RDWR);
        rs_close(rs);
  free:
        free(buf);
-@@ -593,6 +604,10 @@ static int set_test_opt(char *optarg)
+@@ -593,6 +608,10 @@ static int set_test_opt(char *optarg)
                case 'b':
                        flags &= ~MSG_DONTWAIT;
                        break;
@@ -89,7 +93,7 @@ index 48e2771..8595657 100644
                case 'n':
                        flags |= MSG_DONTWAIT;
                        break;
-@@ -613,6 +628,9 @@ static int set_test_opt(char *optarg)
+@@ -613,6 +632,9 @@ static int set_test_opt(char *optarg)
                        flags |= MSG_DONTWAIT;
                } else if (!strncasecmp("verify", optarg, 6)) {
                        verify = 1;
@@ -99,7 +103,7 @@ index 48e2771..8595657 100644
                } else {
                        return -1;
                }
-@@ -671,6 +689,7 @@ int main(int argc, char **argv)
+@@ -671,6 +693,7 @@ int main(int argc, char **argv)
                        printf("\t    s|sockets - use standard tcp/ip sockets\n");
                        printf("\t    a|async - asynchronous operation (use poll)\n");
                        printf("\t    b|blocking - use blocking calls\n");