refresh

diff --git a/meta b/meta
index 30441a4c3a8eeea59b6edccfb4ab9f116175dd06..5b7154778b151cf1fb901399a5d21f2885e224d9 100644 (file)
--- a/meta
+++ b/meta
@@ -1,6 +1,6 @@
 Version: 1
-Previous: 52fb3ec0fd6982e6eda071c626ff200cd45f88d6
-Head: 3590d4805c177114b61cf086ee222fce5d8d4e3f
+Previous: 7abe89bed117d0013c64048d271f6e41874e029c
+Head: f342bb15537fbdb06e286ac9f17d20551e63c295
 Applied:
   logging: 549692c49922dce3911d97dcc6d0a2fc583ab5f7
   acm_snoop: dd5542fbaa1c5a92367d0552ef3525d5ea0a4638
@@ -9,8 +9,7 @@ Applied:
   dist-cfg: d2901f9410f4d3d57629189a4ff51571bb3b0cf3
   lower_retries: 25005d0475638542ab125b42d439d853c185402a
   locking: 2945ee3502392e543e39ddfb642057bc80cad9ef
-  verbose: fd08b2aa9d0ef8d3e7c3614369e72c40280a7896
-  refresh-temp: 3590d4805c177114b61cf086ee222fce5d8d4e3f
+  verbose: f342bb15537fbdb06e286ac9f17d20551e63c295
 Unapplied:
   acme_verbose: 45cba0846874c93ef7af156bf0afe59f43d82ea6
   1.0.4: 9f452b8e59adb21b90fbdda980d25a54d4360d37

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 3e5167d..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,147 +0,0 @@
-Bottom: caa30f6e0c510b4add867f1d87a2133c5a4d0bc1
-Top:    1cfc99531a549c8306d14dafeeec358fcff76c2a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-12-03 13:47:52 -0800
-
-Refresh of verbose
-
----
-
-diff --git a/linux/acme_linux.c b/linux/acme_linux.c
-index 2cb422a..9477d29 100644
---- a/linux/acme_linux.c
-+++ b/linux/acme_linux.c
-@@ -43,6 +43,7 @@
- 
- extern struct ibv_context **verbs;
- extern int dev_cnt;
-+extern int verbose;
- 
- 
- static int
-@@ -202,7 +203,8 @@ int gen_addr_ip(FILE *f)
-               if (ret)
-                       continue;
- 
--              printf("%s %s %d 0x%x\n", ip, verbs[dev_index]->device->name, port, pkey);
-+              if (verbose)
-+                      printf("%s %s %d 0x%x\n", ip, verbs[dev_index]->device->name, port, pkey);
-               fprintf(f, "%s %s %d 0x%x\n", ip, verbs[dev_index]->device->name, port, pkey);
-       }
-       ret = 0;
-diff --git a/src/acme.c b/src/acme.c
-index 552f42a..655c318 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -53,12 +53,15 @@ static char addr_type = 'i';
- static int verify;
- static int make_addr;
- static int make_opts;
-+int verbose;
- 
- struct ibv_context **verbs;
- int dev_cnt;
- 
- extern int gen_addr_ip(FILE *f);
- 
-+#define VPRINT(format, ...) do { if (verbose) printf(format, ## __VA_ARGS__ ); } while (0)
-+
- static void show_usage(char *program)
- {
-       printf("usage 1: %s\n", program);
-@@ -74,6 +77,7 @@ static void show_usage(char *program)
-       printf("                      (default is %s)\n", ACM_OPTS_FILE);
-       printf("   -D dest_dir      - specify destination directory for output files\n");
-       printf("                      (default is %s)\n", ACM_DEST_DIR);
-+      printf("   -V               - enable verbose output\n");
- }
- 
- static void gen_opts_temp(FILE *f)
-@@ -224,7 +228,7 @@ static int gen_opts(void)
- {
-       FILE *f;
- 
--      printf("Generating %s/%s\n", dest_dir, opts_file);
-+      VPRINT("Generating %s/%s\n", dest_dir, opts_file);
-       if (open_dir() || !(f = fopen(opts_file, "w"))) {
-               printf("Failed to open option configuration file: %s\n", strerror(errno));
-               return -1;
-@@ -336,7 +340,7 @@ static int gen_addr_names(FILE *f)
-                       if (!found_active) {
-                               ret = ibv_query_port(verbs[i], p, &port_attr);
-                               if (!ret && port_attr.state == IBV_PORT_ACTIVE) {
--                                      printf("%s %s %d default\n",
-+                                      VPRINT("%s %s %d default\n",
-                                               host_name, verbs[i]->device->name, p);
-                                       fprintf(f, "%s %s %d default\n",
-                                               host_name, verbs[i]->device->name, p);
-@@ -344,7 +348,7 @@ static int gen_addr_names(FILE *f)
-                               }
-                       }
- 
--                      printf("%s-%d %s %d default\n",
-+                      VPRINT("%s-%d %s %d default\n",
-                               host_name, index, verbs[i]->device->name, p);
-                       fprintf(f, "%s-%d %s %d default\n",
-                               host_name, index++, verbs[i]->device->name, p);
-@@ -359,7 +363,7 @@ static int gen_addr(void)
-       FILE *f;
-       int ret;
- 
--      printf("Generating %s/%s\n", dest_dir, addr_file);
-+      VPRINT("Generating %s/%s\n", dest_dir, addr_file);
-       if (open_dir() || !(f = fopen(addr_file, "w"))) {
-               printf("Failed to open address configuration file: %s\n", strerror(errno));
-               return -1;
-@@ -546,7 +550,7 @@ int CDECL_FUNC main(int argc, char **argv)
-       if (ret)
-               goto out;
- 
--      while ((op = getopt(argc, argv, "f:s:d:vA::O::D:")) != -1) {
-+      while ((op = getopt(argc, argv, "f:s:d:vA::O::D:V")) != -1) {
-               switch (op) {
-               case 'f':
-                       addr_type = optarg[0];
-@@ -573,6 +577,9 @@ int CDECL_FUNC main(int argc, char **argv)
-               case 'D':
-                       dest_dir = optarg;
-                       break;
-+              case 'V':
-+                      verbose = 1;
-+                      break;
-               default:
-                       show_usage(argv[0]);
-                       exit(1);
-@@ -595,6 +602,6 @@ int CDECL_FUNC main(int argc, char **argv)
-               ret = gen_opts();
- 
- out:
--      printf("return status 0x%x\n", ret);
-+      VPRINT("return status 0x%x\n", ret);
-       return ret;
- }
-diff --git a/windows/acme_windows.c b/windows/acme_windows.c
-index 52fae7b..8b2397e 100644
---- a/windows/acme_windows.c
-+++ b/windows/acme_windows.c
-@@ -34,6 +34,7 @@
- \r
- extern struct ibv_context **verbs;\r
- extern int dev_cnt;\r
-+extern int verbose;\r
- \r
- int gen_addr_ip(FILE *f)\r
- {\r
-@@ -77,8 +78,10 @@ int gen_addr_ip(FILE *f)
- \r
-               for (i = 0; i < dev_cnt; i++) {\r
-                       if (devaddr.DeviceGuid == ibv_get_device_guid(verbs[i]->device)) {\r
--                              printf("%s %s %d 0x%x\n", ip, verbs[i]->device->name,\r
--                                      devaddr.PortNumber, ntohs(devaddr.Pkey));\r
-+                              if (verbose) {\r
-+                                      printf("%s %s %d 0x%x\n", ip, verbs[i]->device->name,\r
-+                                             devaddr.PortNumber, ntohs(devaddr.Pkey));\r
-+                              }\r
-                               fprintf(f, "%s %s %d 0x%x\n", ip, verbs[i]->device->name,\r
-                                       devaddr.PortNumber, ntohs(devaddr.Pkey));\r
-                       }

diff --git a/patches/verbose b/patches/verbose
index 0af9089ced6ac64c49c864540d0431f21441f576..7db4f602974acc801d05410dc5aafd78ec2ee197 100644 (file)
--- a/patches/verbose
+++ b/patches/verbose
@@ -1,5 +1,5 @@
 Bottom: caa30f6e0c510b4add867f1d87a2133c5a4d0bc1
-Top:    caa30f6e0c510b4add867f1d87a2133c5a4d0bc1
+Top:    1cfc99531a549c8306d14dafeeec358fcff76c2a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-12-03 12:52:49 -0800
 
@@ -16,4 +16,141 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/linux/acme_linux.c b/linux/acme_linux.c
+index 2cb422a..9477d29 100644
+--- a/linux/acme_linux.c
++++ b/linux/acme_linux.c
+@@ -43,6 +43,7 @@
+ 
+ extern struct ibv_context **verbs;
+ extern int dev_cnt;
++extern int verbose;
+ 
+ 
+ static int
+@@ -202,7 +203,8 @@ int gen_addr_ip(FILE *f)
+               if (ret)
+                       continue;
+ 
+-              printf("%s %s %d 0x%x\n", ip, verbs[dev_index]->device->name, port, pkey);
++              if (verbose)
++                      printf("%s %s %d 0x%x\n", ip, verbs[dev_index]->device->name, port, pkey);
+               fprintf(f, "%s %s %d 0x%x\n", ip, verbs[dev_index]->device->name, port, pkey);
+       }
+       ret = 0;
+diff --git a/src/acme.c b/src/acme.c
+index 552f42a..655c318 100644
+--- a/src/acme.c
++++ b/src/acme.c
+@@ -53,12 +53,15 @@ static char addr_type = 'i';
+ static int verify;
+ static int make_addr;
+ static int make_opts;
++int verbose;
+ 
+ struct ibv_context **verbs;
+ int dev_cnt;
+ 
+ extern int gen_addr_ip(FILE *f);
+ 
++#define VPRINT(format, ...) do { if (verbose) printf(format, ## __VA_ARGS__ ); } while (0)
++
+ static void show_usage(char *program)
+ {
+       printf("usage 1: %s\n", program);
+@@ -74,6 +77,7 @@ static void show_usage(char *program)
+       printf("                      (default is %s)\n", ACM_OPTS_FILE);
+       printf("   -D dest_dir      - specify destination directory for output files\n");
+       printf("                      (default is %s)\n", ACM_DEST_DIR);
++      printf("   -V               - enable verbose output\n");
+ }
+ 
+ static void gen_opts_temp(FILE *f)
+@@ -224,7 +228,7 @@ static int gen_opts(void)
+ {
+       FILE *f;
+ 
+-      printf("Generating %s/%s\n", dest_dir, opts_file);
++      VPRINT("Generating %s/%s\n", dest_dir, opts_file);
+       if (open_dir() || !(f = fopen(opts_file, "w"))) {
+               printf("Failed to open option configuration file: %s\n", strerror(errno));
+               return -1;
+@@ -336,7 +340,7 @@ static int gen_addr_names(FILE *f)
+                       if (!found_active) {
+                               ret = ibv_query_port(verbs[i], p, &port_attr);
+                               if (!ret && port_attr.state == IBV_PORT_ACTIVE) {
+-                                      printf("%s %s %d default\n",
++                                      VPRINT("%s %s %d default\n",
+                                               host_name, verbs[i]->device->name, p);
+                                       fprintf(f, "%s %s %d default\n",
+                                               host_name, verbs[i]->device->name, p);
+@@ -344,7 +348,7 @@ static int gen_addr_names(FILE *f)
+                               }
+                       }
+ 
+-                      printf("%s-%d %s %d default\n",
++                      VPRINT("%s-%d %s %d default\n",
+                               host_name, index, verbs[i]->device->name, p);
+                       fprintf(f, "%s-%d %s %d default\n",
+                               host_name, index++, verbs[i]->device->name, p);
+@@ -359,7 +363,7 @@ static int gen_addr(void)
+       FILE *f;
+       int ret;
+ 
+-      printf("Generating %s/%s\n", dest_dir, addr_file);
++      VPRINT("Generating %s/%s\n", dest_dir, addr_file);
+       if (open_dir() || !(f = fopen(addr_file, "w"))) {
+               printf("Failed to open address configuration file: %s\n", strerror(errno));
+               return -1;
+@@ -546,7 +550,7 @@ int CDECL_FUNC main(int argc, char **argv)
+       if (ret)
+               goto out;
+ 
+-      while ((op = getopt(argc, argv, "f:s:d:vA::O::D:")) != -1) {
++      while ((op = getopt(argc, argv, "f:s:d:vA::O::D:V")) != -1) {
+               switch (op) {
+               case 'f':
+                       addr_type = optarg[0];
+@@ -573,6 +577,9 @@ int CDECL_FUNC main(int argc, char **argv)
+               case 'D':
+                       dest_dir = optarg;
+                       break;
++              case 'V':
++                      verbose = 1;
++                      break;
+               default:
+                       show_usage(argv[0]);
+                       exit(1);
+@@ -595,6 +602,6 @@ int CDECL_FUNC main(int argc, char **argv)
+               ret = gen_opts();
+ 
+ out:
+-      printf("return status 0x%x\n", ret);
++      VPRINT("return status 0x%x\n", ret);
+       return ret;
+ }
+diff --git a/windows/acme_windows.c b/windows/acme_windows.c
+index 52fae7b..8b2397e 100644
+--- a/windows/acme_windows.c
++++ b/windows/acme_windows.c
+@@ -34,6 +34,7 @@
+ \r
+ extern struct ibv_context **verbs;\r
+ extern int dev_cnt;\r
++extern int verbose;\r
+ \r
+ int gen_addr_ip(FILE *f)\r
+ {\r
+@@ -77,8 +78,10 @@ int gen_addr_ip(FILE *f)
+ \r
+               for (i = 0; i < dev_cnt; i++) {\r
+                       if (devaddr.DeviceGuid == ibv_get_device_guid(verbs[i]->device)) {\r
+-                              printf("%s %s %d 0x%x\n", ip, verbs[i]->device->name,\r
+-                                      devaddr.PortNumber, ntohs(devaddr.Pkey));\r
++                              if (verbose) {\r
++                                      printf("%s %s %d 0x%x\n", ip, verbs[i]->device->name,\r
++                                             devaddr.PortNumber, ntohs(devaddr.Pkey));\r
++                              }\r
+                               fprintf(f, "%s %s %d 0x%x\n", ip, verbs[i]->device->name,\r
+                                       devaddr.PortNumber, ntohs(devaddr.Pkey));\r
+                       }