]> git.openfabrics.org - ~shefty/ibacm.git/commitdiff
refresh (create temporary patch)
authorSean Hefty <sean.hefty@intel.com>
Fri, 1 Jul 2011 03:40:09 +0000 (20:40 -0700)
committerSean Hefty <sean.hefty@intel.com>
Fri, 1 Jul 2011 03:40:09 +0000 (20:40 -0700)
meta
patches/refresh-temp [new file with mode: 0644]

diff --git a/meta b/meta
index 904fc47d112c945b5d22ec8b502ae1f3159ab6de..ccdfbab94cc299dd3848745eb0fefe86d50aec66 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,11 @@
 Version: 1
-Previous: 4f7de21d936328c17bfbce6169e8e5c0d0e7bfc6
-Head: 891e048afff45c39b17c62261dd1f2fbb3774148
+Previous: 946023e1314b4a484c5a0c617e37d1dd52d65fc5
+Head: 0941c8148b9a65d9e00d867c38e00bcabe593ae2
 Applied:
   bldwrn: be4fb9a97bdc0942c04ffddca19692ccf5875878
   alias: cf8b034d082dbc168524cfadc86e231772254a64
   counters: 891e048afff45c39b17c62261dd1f2fbb3774148
+  refresh-temp: 0941c8148b9a65d9e00d867c38e00bcabe593ae2
 Unapplied:
   acm1.0.5: 1b225173756cfcec4d81d26b1160ebae7644261b
   name2ip: 8e00708e882239292492e13aa51c82042255933c
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..a30c2eb
--- /dev/null
@@ -0,0 +1,59 @@
+Bottom: ecfa4880e2ee351de7a1f30d0bafb1df221402dc
+Top:    131a3de8a72737d956e57cbdeed00328b22d8209
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2011-06-30 20:40:09 -0700
+
+Refresh of counters
+
+---
+
+diff --git a/src/acme.c b/src/acme.c
+index 05d093d..f3faa68 100644
+--- a/src/acme.c
++++ b/src/acme.c
+@@ -586,7 +586,7 @@ static char *get_dest(char *arg, char *format)
+       }
+ }
+-static int resolve(char *svc)
++static void resolve(char *svc)
+ {
+       char **dest_list, **src_list;
+       struct ibv_path_record path;
+@@ -596,7 +596,7 @@ static int resolve(char *svc)
+       dest_list = parse(dest_arg, NULL);
+       if (!dest_list) {
+               printf("Unable to parse destination argument\n");
+-              return -1;
++              return;
+       }
+       src_list = src_arg ? parse(src_arg, NULL) : NULL;
+@@ -642,7 +642,6 @@ static int resolve(char *svc)
+       }
+       free(dest_list);
+-      return ret;
+ }
+ static void query_perf(char *svc)
+@@ -682,16 +681,13 @@ static int query_svcs(void)
+       for (i = 0; svc_list[i]; i++) {
+               ret = ib_acm_connect(svc_list[i]);
+               if (ret) {
+-                      printf("%s, unable to contact service %s\n",
++                      printf("%s,unable to contact service: %s\n",
+                               svc_list[i], strerror(errno));
+                       continue;
+               }
+-              if (dest_arg) {
+-                      ret = resolve(svc_list[i]);
+-                      if (ret)
+-                              break;
+-              }
++              if (dest_arg)
++                      resolve(svc_list[i]);
+               if (perf_query)
+                       query_perf(svc_list[i]);