refresh

diff --git a/meta b/meta
index bf83bca7d791467757278d34973e5b5cd0c78720..e3aa14a15d89961943f5b327a39032c913153e5e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: c686d7e8040fc2f9bcf99b12749ac0ac53d04561
-Head: d4ec20d9af3c7ac156f62abc569797398a02b6e5
+Previous: e3dd5e8e0fba7128163286d8383d88c74901fd30
+Head: ff3d79a44beb17d1ba7e3eb724de877ae0eeebb5
 Applied:
   deam: 3eb8f395f9a52f04c5b408812e743566e6d673fe
   braces: b6e7734ccc3d5e6103ae137025ec71b6bea39a63
-  counters: 27a168f873eff2e048262fd0a593d9baa7a3173e
-  refresh-temp: d4ec20d9af3c7ac156f62abc569797398a02b6e5
+  counters: ff3d79a44beb17d1ba7e3eb724de877ae0eeebb5
 Unapplied:
   acm1.0.5: 1b225173756cfcec4d81d26b1160ebae7644261b
   name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/counters b/patches/counters
index f6bc1fc2ada636bfadb8a7ef9da4712bad6fc2bb..94d59ab55acea827b5398fdd0acc77ee55d3635d 100644 (file)
--- a/patches/counters
+++ b/patches/counters
@@ -1,5 +1,5 @@
 Bottom: 8c494522d92d53cdd3122c29716c08dda270b21e
-Top:    555cb49d8a01e14492c60314840c56971163d433
+Top:    ed43fb0fa39a4f3f51411e8cb67ee3b7271e74c3
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-06-27 10:29:36 -0700
 
@@ -24,7 +24,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/include/infiniband/acm.h b/include/infiniband/acm.h
-index 143d512..3cc778c 100644
+index 143d512..23d8198 100644
 --- a/include/infiniband/acm.h
 +++ b/include/infiniband/acm.h
 @@ -37,6 +37,7 @@
@@ -52,10 +52,10 @@ index 143d512..3cc778c 100644
 +      ACM_CNTR_ERROR,
 +      ACM_CNTR_RESOLVE,
 +      ACM_CNTR_NODATA,
-+      ACM_CNTR_ADDR_CACHE,
 +      ACM_CNTR_ADDR_QUERY,
-+      ACM_CNTR_ROUTE_CACHE,
++      ACM_CNTR_ADDR_CACHE,
 +      ACM_CNTR_ROUTE_QUERY,
++      ACM_CNTR_ROUTE_CACHE,
 +      ACM_MAX_COUNTER
 +};
 +
@@ -296,7 +296,7 @@ index 7b0639a..54b2411 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..cf296c6 100644
+index d42ba81..d6eadb7 100644
 --- a/src/acme.c
 +++ b/src/acme.c
 @@ -52,8 +52,6 @@ static char *src_addr;
@@ -347,8 +347,8 @@ index d42ba81..cf296c6 100644
 +              return -1;
 +      }
 +
-+      printf("Destination,Error Count,Resolve Count,No Data,Addr Cache Count,"
-+             "Addr Query Count,Route Cache Count,Route Query Count\n");
++      printf("Destination,Error Count,Resolve Count,No Data,Addr Query Count,"
++             "Addr Cache Count,Route Query Count,Route Cache Count\n");
 +      for (d = 0; dest_list[d]; d++) {
 +
 +              printf("%s,", dest_list[d]);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 0f5947e..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,41 +0,0 @@
-Bottom: 555cb49d8a01e14492c60314840c56971163d433
-Top:    ed43fb0fa39a4f3f51411e8cb67ee3b7271e74c3
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-06-29 12:13:06 -0700
-
-Refresh of counters
-
----
-
-diff --git a/include/infiniband/acm.h b/include/infiniband/acm.h
-index 3cc778c..23d8198 100644
---- a/include/infiniband/acm.h
-+++ b/include/infiniband/acm.h
-@@ -102,10 +102,10 @@ enum {
-       ACM_CNTR_ERROR,
-       ACM_CNTR_RESOLVE,
-       ACM_CNTR_NODATA,
--      ACM_CNTR_ADDR_CACHE,
-       ACM_CNTR_ADDR_QUERY,
--      ACM_CNTR_ROUTE_CACHE,
-+      ACM_CNTR_ADDR_CACHE,
-       ACM_CNTR_ROUTE_QUERY,
-+      ACM_CNTR_ROUTE_CACHE,
-       ACM_MAX_COUNTER
- };
- 
-diff --git a/src/acme.c b/src/acme.c
-index cf296c6..d6eadb7 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -647,8 +647,8 @@ static int query_perf(char *program, char *dest_arg)
-               return -1;
-       }
- 
--      printf("Destination,Error Count,Resolve Count,No Data,Addr Cache Count,"
--             "Addr Query Count,Route Cache Count,Route Query Count\n");
-+      printf("Destination,Error Count,Resolve Count,No Data,Addr Query Count,"
-+             "Addr Cache Count,Route Query Count,Route Cache Count\n");
-       for (d = 0; dest_list[d]; d++) {
- 
-               printf("%s,", dest_list[d]);