refresh

diff --git a/meta b/meta
index 553c57aa1d9f6b8ec0e15ac05f2beac88b8f871f..b26fc827b164e4ba3d95202b0502d7fd8905894b 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 4f60b5a4dee24722baba868cdde897bf672b6242
-Head: 131e95cc30e725eabcf108e0be598ff2129f1c3c
+Previous: b93748286eec8422b51298f9f9aaed4ade7b5498
+Head: 4c0e84b7d7a3298fe7d1d07eaf426cdf42100d67
 Applied:
   reuseaddr: 5ce7d9c48d082fd1959918e9134f4bdd85c402d9
   rs-nodelay: c7515656281368210d75c103cc68c131511debf6
@@ -8,7 +8,6 @@ Applied:
   rs-async-opt: d541438b83de7721c8ce91fd25c2801d99f5247a
   rs-async-nonblock: 8cea41290e9c701beaa780fd2f412060916ca269
   rs-group-tests: f484de0b80b9369ad12c6b5628bb49a51dfc4ef0
-  rs-fulltest: 512bdc76b96eebee6b303172faf5361f8b893181
-  refresh-temp: 131e95cc30e725eabcf108e0be598ff2129f1c3c
+  rs-fulltest: 4c0e84b7d7a3298fe7d1d07eaf426cdf42100d67
 Unapplied:
 Hidden:

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index cc37d87..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,116 +0,0 @@
-Bottom: 6143dc261a8c3107f32a4bd74443fd381b89d52e
-Top:    070f92a593aea528dcae7a68d42159b016d77109
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-05-17 11:38:24 -0700
-
-Refresh of rs-fulltest
-
----
-
-diff --git a/examples/rstream.c b/examples/rstream.c
-index 3e6d8d5..cb65911 100644
---- a/examples/rstream.c
-+++ b/examples/rstream.c
-@@ -52,22 +52,22 @@ struct test_size_param {
- 
- static struct test_size_param test_size[] = {
-       { 1 <<  6, 0 },
--      { 1 <<  7, 1 }, { 1 <<  7 + 1 <<  6, 1},
--      { 1 <<  8, 1 }, { 1 <<  8 + 1 <<  7, 1},
--      { 1 <<  9, 1 }, { 1 <<  9 + 1 <<  8, 1},
--      { 1 << 10, 1 }, { 1 << 10 + 1 <<  9, 1},
--      { 1 << 11, 1 }, { 1 << 11 + 1 << 10, 1},
--      { 1 << 12, 0 }, { 1 << 12 + 1 << 11, 1},
--      { 1 << 13, 1 }, { 1 << 13 + 1 << 12, 1},
--      { 1 << 14, 1 }, { 1 << 14 + 1 << 13, 1},
--      { 1 << 15, 1 }, { 1 << 15 + 1 << 14, 1},
--      { 1 << 16, 0 }, { 1 << 16 + 1 << 15, 1},
--      { 1 << 17, 1 }, { 1 << 17 + 1 << 16, 1},
--      { 1 << 18, 1 }, { 1 << 18 + 1 << 17, 1},
--      { 1 << 19, 1 }, { 1 << 19 + 1 << 18, 1},
--      { 1 << 20, 0 }, { 1 << 20 + 1 << 19, 1},
--      { 1 << 21, 1 }, { 1 << 21 + 1 << 20, 1},
--      { 1 << 22, 1 }, { 1 << 22 + 1 << 21, 1},
-+      { 1 <<  7, 1 }, { (1 <<  7) + (1 <<  6), 1},
-+      { 1 <<  8, 1 }, { (1 <<  8) + (1 <<  7), 1},
-+      { 1 <<  9, 1 }, { (1 <<  9) + (1 <<  8), 1},
-+      { 1 << 10, 1 }, { (1 << 10) + (1 <<  9), 1},
-+      { 1 << 11, 1 }, { (1 << 11) + (1 << 10), 1},
-+      { 1 << 12, 0 }, { (1 << 12) + (1 << 11), 1},
-+      { 1 << 13, 1 }, { (1 << 13) + (1 << 12), 1},
-+      { 1 << 14, 1 }, { (1 << 14) + (1 << 13), 1},
-+      { 1 << 15, 1 }, { (1 << 15) + (1 << 14), 1},
-+      { 1 << 16, 0 }, { (1 << 16) + (1 << 15), 1},
-+      { 1 << 17, 1 }, { (1 << 17) + (1 << 16), 1},
-+      { 1 << 18, 1 }, { (1 << 18) + (1 << 17), 1},
-+      { 1 << 19, 1 }, { (1 << 19) + (1 << 18), 1},
-+      { 1 << 20, 0 }, { (1 << 20) + (1 << 19), 1},
-+      { 1 << 21, 1 }, { (1 << 21) + (1 << 20), 1},
-+      { 1 << 22, 1 }, { (1 << 22) + (1 << 21), 1},
- };
- #define TEST_CNT (sizeof test_size / sizeof test_size[0])
- 
-@@ -106,14 +106,30 @@ static void *buf;
- 
- static void size_str(char *str, long long size)
- {
--      if (size >= (1 << 30))
--              sprintf(str, "%lldg", size / (1 << 30));
--      else if (size >= (1 << 20))
--              sprintf(str, "%lldm", size / (1 << 20));
--      else if (size >= (1 << 10))
--              sprintf(str, "%lldk", size / (1 << 10));
--      else
--              sprintf(str, "%lld", size);
-+      long long base, fraction = 0;
-+      char mag;
-+
-+      if (size >= (1 << 30)) {
-+              base = 1 << 30;
-+              mag = 'g';
-+      } else if (size >= (1 << 20)) {
-+              base = 1 << 20;
-+              mag = 'm';
-+      } else if (size >= (1 << 10)) {
-+              base = 1 << 10;
-+              mag = 'k';
-+      } else {
-+              base = 1;
-+              mag = '\0';
-+      }
-+
-+      if (size / base < 10)
-+              fraction = (size % base) * 10 / base;
-+      if (fraction) {
-+              sprintf(str, "%lld.%lld%c", size / base, fraction, mag);
-+      } else {
-+              sprintf(str, "%lld%c", size / base, mag);
-+      }
- }
- 
- static void cnt_str(char *str, long long cnt)
-@@ -491,13 +507,13 @@ static int run(void)
-       printf("name \tbytes \txfers \titers \ttotal \ttime \tGb/sec \tusec/xfer\n");
-       if (!custom) {
-               for (i = 0; i < TEST_CNT; i++) {
--                      if (test_size[i] > size_option)
-+                      if (test_size[i].option > size_option)
-                               continue;
-                       init_latency_test(test_size[i].size);
-                       run_test(rs);
-               }
-               for (i = 0; i < TEST_CNT; i++) {
--                      if (test_size[i] > size_option)
-+                      if (test_size[i].option > size_option)
-                               continue;
-                       init_bandwidth_test(test_size[i].size);
-                       run_test(rs);
-@@ -574,7 +590,7 @@ int main(int argc, char **argv)
-                       transfer_count = atoi(optarg);
-                       break;
-               case 'S':
--                      if (strncasecmp("all", optarg, 3) {
-+                      if (!strncasecmp("all", optarg, 3)) {
-                               size_option = 1;
-                       } else {
-                               custom = 1;

diff --git a/patches/rs-fulltest b/patches/rs-fulltest
index 4a2d330837c24050e717e9808d69aacda47a527f..bf870fd527a4b802cbabf4c199bfd53e75820563 100644 (file)
--- a/patches/rs-fulltest
+++ b/patches/rs-fulltest
@@ -1,5 +1,5 @@
 Bottom: 73ebe2ff1ff06d4ecc24c5fe35c8f54b8ad98f9f
-Top:    6143dc261a8c3107f32a4bd74443fd381b89d52e
+Top:    070f92a593aea528dcae7a68d42159b016d77109
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2012-05-17 09:50:15 -0700
 
@@ -14,7 +14,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/examples/rstream.c b/examples/rstream.c
-index ec9b4ff..3e6d8d5 100644
+index ec9b4ff..cb65911 100644
 --- a/examples/rstream.c
 +++ b/examples/rstream.c
 @@ -45,11 +45,29 @@
@@ -33,22 +33,22 @@ index ec9b4ff..3e6d8d5 100644
 +
 +static struct test_size_param test_size[] = {
 +      { 1 <<  6, 0 },
-+      { 1 <<  7, 1 }, { 1 <<  7 + 1 <<  6, 1},
-+      { 1 <<  8, 1 }, { 1 <<  8 + 1 <<  7, 1},
-+      { 1 <<  9, 1 }, { 1 <<  9 + 1 <<  8, 1},
-+      { 1 << 10, 1 }, { 1 << 10 + 1 <<  9, 1},
-+      { 1 << 11, 1 }, { 1 << 11 + 1 << 10, 1},
-+      { 1 << 12, 0 }, { 1 << 12 + 1 << 11, 1},
-+      { 1 << 13, 1 }, { 1 << 13 + 1 << 12, 1},
-+      { 1 << 14, 1 }, { 1 << 14 + 1 << 13, 1},
-+      { 1 << 15, 1 }, { 1 << 15 + 1 << 14, 1},
-+      { 1 << 16, 0 }, { 1 << 16 + 1 << 15, 1},
-+      { 1 << 17, 1 }, { 1 << 17 + 1 << 16, 1},
-+      { 1 << 18, 1 }, { 1 << 18 + 1 << 17, 1},
-+      { 1 << 19, 1 }, { 1 << 19 + 1 << 18, 1},
-+      { 1 << 20, 0 }, { 1 << 20 + 1 << 19, 1},
-+      { 1 << 21, 1 }, { 1 << 21 + 1 << 20, 1},
-+      { 1 << 22, 1 }, { 1 << 22 + 1 << 21, 1},
++      { 1 <<  7, 1 }, { (1 <<  7) + (1 <<  6), 1},
++      { 1 <<  8, 1 }, { (1 <<  8) + (1 <<  7), 1},
++      { 1 <<  9, 1 }, { (1 <<  9) + (1 <<  8), 1},
++      { 1 << 10, 1 }, { (1 << 10) + (1 <<  9), 1},
++      { 1 << 11, 1 }, { (1 << 11) + (1 << 10), 1},
++      { 1 << 12, 0 }, { (1 << 12) + (1 << 11), 1},
++      { 1 << 13, 1 }, { (1 << 13) + (1 << 12), 1},
++      { 1 << 14, 1 }, { (1 << 14) + (1 << 13), 1},
++      { 1 << 15, 1 }, { (1 << 15) + (1 << 14), 1},
++      { 1 << 16, 0 }, { (1 << 16) + (1 << 15), 1},
++      { 1 << 17, 1 }, { (1 << 17) + (1 << 16), 1},
++      { 1 << 18, 1 }, { (1 << 18) + (1 << 17), 1},
++      { 1 << 19, 1 }, { (1 << 19) + (1 << 18), 1},
++      { 1 << 20, 0 }, { (1 << 20) + (1 << 19), 1},
++      { 1 << 21, 1 }, { (1 << 21) + (1 << 20), 1},
++      { 1 << 22, 1 }, { (1 << 22) + (1 << 21), 1},
  };
  #define TEST_CNT (sizeof test_size / sizeof test_size[0])
  
@@ -60,7 +60,46 @@ index ec9b4ff..3e6d8d5 100644
  static int iterations = 1;
  static int transfer_size = 1000;
  static int transfer_count = 1000;
-@@ -457,7 +476,7 @@ static int run(void)
+@@ -87,14 +106,30 @@ static void *buf;
+ 
+ static void size_str(char *str, long long size)
+ {
+-      if (size >= (1 << 30))
+-              sprintf(str, "%lldg", size / (1 << 30));
+-      else if (size >= (1 << 20))
+-              sprintf(str, "%lldm", size / (1 << 20));
+-      else if (size >= (1 << 10))
+-              sprintf(str, "%lldk", size / (1 << 10));
+-      else
+-              sprintf(str, "%lld", size);
++      long long base, fraction = 0;
++      char mag;
++
++      if (size >= (1 << 30)) {
++              base = 1 << 30;
++              mag = 'g';
++      } else if (size >= (1 << 20)) {
++              base = 1 << 20;
++              mag = 'm';
++      } else if (size >= (1 << 10)) {
++              base = 1 << 10;
++              mag = 'k';
++      } else {
++              base = 1;
++              mag = '\0';
++      }
++
++      if (size / base < 10)
++              fraction = (size % base) * 10 / base;
++      if (fraction) {
++              sprintf(str, "%lld.%lld%c", size / base, fraction, mag);
++      } else {
++              sprintf(str, "%lld%c", size / base, mag);
++      }
+ }
+ 
+ static void cnt_str(char *str, long long cnt)
+@@ -457,7 +492,7 @@ static int run(void)
  {
        int i, rs, ret = 0;
  
@@ -69,31 +108,31 @@ index ec9b4ff..3e6d8d5 100644
        if (!buf) {
                perror("malloc");
                return -1;
-@@ -472,11 +491,15 @@ static int run(void)
+@@ -472,11 +507,15 @@ static int run(void)
        printf("name \tbytes \txfers \titers \ttotal \ttime \tGb/sec \tusec/xfer\n");
        if (!custom) {
                for (i = 0; i < TEST_CNT; i++) {
 -                      init_latency_test(test_size[i]);
-+                      if (test_size[i] > size_option)
++                      if (test_size[i].option > size_option)
 +                              continue;
 +                      init_latency_test(test_size[i].size);
                        run_test(rs);
                }
                for (i = 0; i < TEST_CNT; i++) {
 -                      init_bandwidth_test(test_size[i]);
-+                      if (test_size[i] > size_option)
++                      if (test_size[i].option > size_option)
 +                              continue;
 +                      init_bandwidth_test(test_size[i].size);
                        run_test(rs);
                }
        } else {
-@@ -551,8 +574,12 @@ int main(int argc, char **argv)
+@@ -551,8 +590,12 @@ int main(int argc, char **argv)
                        transfer_count = atoi(optarg);
                        break;
                case 'S':
 -                      custom = 1;
 -                      transfer_size = atoi(optarg);
-+                      if (strncasecmp("all", optarg, 3) {
++                      if (!strncasecmp("all", optarg, 3)) {
 +                              size_option = 1;
 +                      } else {
 +                              custom = 1;
@@ -102,7 +141,7 @@ index ec9b4ff..3e6d8d5 100644
                        break;
                case 'p':
                        port = optarg;
-@@ -567,7 +594,7 @@ int main(int argc, char **argv)
+@@ -567,7 +610,7 @@ int main(int argc, char **argv)
                        printf("\t[-b bind_address]\n");
                        printf("\t[-I iterations]\n");
                        printf("\t[-C transfer_count]\n");