refresh

diff --git a/meta b/meta
index 2ba57391586389463cf8e92f0641184e343e2539..c03bd08a0d1b31bde685c4d97c748dad945215c4 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: d353d23445825f9d575629981e6d83ee5eebbccd
-Head: e10f77458776837044373d6f5efed9955ea4ed96
+Previous: 402803dcc2007daa58a1fe519e3490762fa0cc4e
+Head: 78ec556f36798498ae7d006d7e4863086ac2c24e
 Applied:
   bldwrn: be4fb9a97bdc0942c04ffddca19692ccf5875878
   alias: cf8b034d082dbc168524cfadc86e231772254a64
-  counters: cf918b170663ed7fa1acdadecebcb3baf739dd04
-  refresh-temp: e10f77458776837044373d6f5efed9955ea4ed96
+  counters: 78ec556f36798498ae7d006d7e4863086ac2c24e
 Unapplied:
   acm1.0.5: 1b225173756cfcec4d81d26b1160ebae7644261b
   name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/counters b/patches/counters
index 6c79bb7cf3a19f63290a6460544dbdac6e9ed328..667ea32aed0db8ace38e72a4ac8a76eae2edabe5 100644 (file)
--- a/patches/counters
+++ b/patches/counters
@@ -1,5 +1,5 @@
 Bottom: c1a3265ecb373be6114f838a6a7b82453aafd16e
-Top:    70fb93d64e9ecf38abaca2ab5496df0a03517a96
+Top:    18f2719edc4036be333ec659de94958283145b33
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-06-27 10:29:36 -0700
 
@@ -302,7 +302,7 @@ index 1c643f3..fed0440 100644
        if (acm_open_devices()) {
                acm_log(0, "ERROR - unable to open any devices\n");
 diff --git a/src/acme.c b/src/acme.c
-index d42ba81..3030991 100644
+index d42ba81..9bb6791 100644
 --- a/src/acme.c
 +++ b/src/acme.c
 @@ -49,11 +49,13 @@ static char *opts_file = ACM_OPTS_FILE;
@@ -342,7 +342,7 @@ index d42ba81..3030991 100644
        printf("   -A [addr_file]   - generate local address configuration file\n");
        printf("                      (default is %s)\n", ACM_ADDR_FILE);
        printf("   -O [opt_file]    - generate local acm_opts.cfg options file\n");
-@@ -580,25 +586,24 @@ static char *get_dest(char *arg, char *format)
+@@ -580,58 +586,118 @@ static char *get_dest(char *arg, char *format)
        }
  }
  
@@ -352,7 +352,8 @@ index d42ba81..3030991 100644
 -      char **dest_list;
 +      char **dest_list, **src_list;
        struct ibv_path_record path;
-       int ret, i = 0;
+-      int ret, i = 0;
++      int ret, d = 0, s = 0;
        char dest_type;
  
 -      ret = libacm_init();
@@ -364,33 +365,52 @@ index d42ba81..3030991 100644
        dest_list = parse(dest_arg, NULL);
        if (!dest_list) {
                printf("Unable to parse destination argument\n");
--              return -1;
 +              return;
-       }
- 
++      }
++
 +      if (src_arg) {
 +              src_list = parse(src_arg, NULL);
 +      }
 +
 +      printf("Service: %s\n", svc);
-       for (dest_addr = get_dest(dest_list[i], &dest_type); dest_addr;
-            dest_addr = get_dest(dest_list[++i], &dest_type)) {
-               printf("Destination: %s\n", dest_addr);
-@@ -618,8 +623,7 @@ static int resolve(char *program, char *dest_arg)
-                       ret = resolve_gid(&path);
-                       break;
-               default:
--                      show_usage(program);
--                      exit(1);
-+                      break;
-               }
- 
-               if (!ret)
-@@ -631,7 +635,62 @@ static int resolve(char *program, char *dest_arg)
-       }
- 
-       free(dest_list);
--      libacm_cleanup();
++      for (dest_addr = get_dest(dest_list[d], &dest_type); dest_addr;
++           dest_addr = get_dest(dest_list[++d], &dest_type)) {
++              s = 0;
++              src_addr = src_list ? src_list[s] : NULL;
++              do {
++                      printf("Destination: %s\n", dest_addr);
++                      switch (dest_type) {
++                      case 'i':
++                              ret = resolve_ip(&path);
++                              break;
++                      case 'n':
++                              ret = resolve_name(&path);
++                              break;
++                      case 'l':
++                              memset(&path, 0, sizeof path);
++                              ret = resolve_lid(&path);
++                              break;
++                      case 'g':
++                              memset(&path, 0, sizeof path);
++                              ret = resolve_gid(&path);
++                              break;
++                      default:
++                              break;
++                      }
++
++                      if (!ret)
++                              show_path(&path);
++
++                      if (verify)
++                              ret = verify_resolve(&path);
++                      printf("\n");
++
++                      if (src_list)
++                              src_addr = src_list[++s];
++              } while (src_addr);
++      }
++
++      free(dest_list);
 +      return ret;
 +}
 +
@@ -419,9 +439,30 @@ index d42ba81..3030991 100644
 +      svc_list = parse(svc_arg, NULL);
 +      if (!svc_list) {
 +              printf("Unable to parse service list argument\n");
-+              return -1;
-+      }
-+
+               return -1;
+       }
+ 
+-      for (dest_addr = get_dest(dest_list[i], &dest_type); dest_addr;
+-           dest_addr = get_dest(dest_list[++i], &dest_type)) {
+-              printf("Destination: %s\n", dest_addr);
+-              switch (dest_type) {
+-              case 'i':
+-                      ret = resolve_ip(&path);
+-                      break;
+-              case 'n':
+-                      ret = resolve_name(&path);
+-                      break;
+-              case 'l':
+-                      memset(&path, 0, sizeof path);
+-                      ret = resolve_lid(&path);
+-                      break;
+-              case 'g':
+-                      memset(&path, 0, sizeof path);
+-                      ret = resolve_gid(&path);
+-                      break;
+-              default:
+-                      show_usage(program);
+-                      exit(1);
 +      if (perf_query) {
 +              printf("Destination,Error Count,Resolve Count,No Data,Addr Query Count,"
 +                      "Addr Cache Count,Route Query Count,Route Cache Count\n");
@@ -438,19 +479,26 @@ index d42ba81..3030991 100644
 +                      ret = resolve(svc_list[i]);
 +                      if (ret)
 +                              break;
-+              }
-+
+               }
+ 
+-              if (!ret)
+-                      show_path(&path);
 +              if (perf_query)
 +                      query_perf(svc_list[i]);
-+
+ 
+-              if (verify)
+-                      ret = verify_resolve(&path);
+-              printf("\n");
 +              ib_acm_disconnect();
-+      }
-+
+       }
+ 
+-      free(dest_list);
+-      libacm_cleanup();
 +      free(svc_list);
        return ret;
  }
  
-@@ -648,20 +707,24 @@ char *opt_arg(int argc, char **argv)
+@@ -648,20 +714,24 @@ char *opt_arg(int argc, char **argv)
  
  int CDECL_FUNC main(int argc, char **argv)
  {
@@ -478,7 +526,7 @@ index d42ba81..3030991 100644
                        break;
                case 'd':
                        dest_arg = optarg;
-@@ -685,23 +748,26 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -685,23 +755,26 @@ int CDECL_FUNC main(int argc, char **argv)
                case 'D':
                        dest_dir = optarg;
                        break;
@@ -514,7 +562,7 @@ index d42ba81..3030991 100644
  
        if (!ret && make_addr)
                ret = gen_addr();
-@@ -709,8 +775,13 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -709,8 +782,13 @@ int CDECL_FUNC main(int argc, char **argv)
        if (!ret && make_opts)
                ret = gen_opts();
  

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 1f660d7..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,90 +0,0 @@
-Bottom: 70fb93d64e9ecf38abaca2ab5496df0a03517a96
-Top:    18f2719edc4036be333ec659de94958283145b33
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-06-30 17:04:46 -0700
-
-Refresh of counters
-
----
-
-diff --git a/src/acme.c b/src/acme.c
-index 3030991..9bb6791 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -590,7 +590,7 @@ static int resolve(char *svc)
- {
-       char **dest_list, **src_list;
-       struct ibv_path_record path;
--      int ret, i = 0;
-+      int ret, d = 0, s = 0;
-       char dest_type;
- 
-       dest_list = parse(dest_arg, NULL);
-@@ -604,34 +604,41 @@ static int resolve(char *svc)
-       }
- 
-       printf("Service: %s\n", svc);
--      for (dest_addr = get_dest(dest_list[i], &dest_type); dest_addr;
--           dest_addr = get_dest(dest_list[++i], &dest_type)) {
--              printf("Destination: %s\n", dest_addr);
--              switch (dest_type) {
--              case 'i':
--                      ret = resolve_ip(&path);
--                      break;
--              case 'n':
--                      ret = resolve_name(&path);
--                      break;
--              case 'l':
--                      memset(&path, 0, sizeof path);
--                      ret = resolve_lid(&path);
--                      break;
--              case 'g':
--                      memset(&path, 0, sizeof path);
--                      ret = resolve_gid(&path);
--                      break;
--              default:
--                      break;
--              }
-+      for (dest_addr = get_dest(dest_list[d], &dest_type); dest_addr;
-+           dest_addr = get_dest(dest_list[++d], &dest_type)) {
-+              s = 0;
-+              src_addr = src_list ? src_list[s] : NULL;
-+              do {
-+                      printf("Destination: %s\n", dest_addr);
-+                      switch (dest_type) {
-+                      case 'i':
-+                              ret = resolve_ip(&path);
-+                              break;
-+                      case 'n':
-+                              ret = resolve_name(&path);
-+                              break;
-+                      case 'l':
-+                              memset(&path, 0, sizeof path);
-+                              ret = resolve_lid(&path);
-+                              break;
-+                      case 'g':
-+                              memset(&path, 0, sizeof path);
-+                              ret = resolve_gid(&path);
-+                              break;
-+                      default:
-+                              break;
-+                      }
-+
-+                      if (!ret)
-+                              show_path(&path);
- 
--              if (!ret)
--                      show_path(&path);
-+                      if (verify)
-+                              ret = verify_resolve(&path);
-+                      printf("\n");
- 
--              if (verify)
--                      ret = verify_resolve(&path);
--              printf("\n");
-+                      if (src_list)
-+                              src_addr = src_list[++s];
-+              } while (src_addr);
-       }
- 
-       free(dest_list);