refresh (create temporary patch)

diff --git a/meta b/meta
index 29ed87ba791bb6669d330632cebf909d3fc1e21f..4dcd05a2ab7753fc73677dbb0fca1a563a6c9e39 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,11 @@
 Version: 1
-Previous: 4d7e5d05261173ea65ffb5ba2ae8274a7c05d6a6
-Head: feef8881551296005862ebaadc0086e594725c60
+Previous: 01c4748653befe1590cac6020b0c3f0fd5b0ce05
+Head: 4b8e4701ec6eed4f12e371f1f1c823264292ec0d
 Applied:
   deam: 15fcbd5198ba0c15ab4e8fddcdba32c8ef45faf8
   braces: 5fb48c1b8d722b60332f83ca4c8b92b2a7e456a6
   counters: feef8881551296005862ebaadc0086e594725c60
+  refresh-temp: 4b8e4701ec6eed4f12e371f1f1c823264292ec0d
 Unapplied:
   acm1.0.5: 1b225173756cfcec4d81d26b1160ebae7644261b
   name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..539c3c9
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,50 @@
+Bottom: 3ca44cb6f244a91dc40f2675d2828ce532d4d24f
+Top:    3550bace98f1e4ab54dfcdc255f2dd8774f3f09b
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2011-06-28 16:51:41 -0700
+
+Refresh of counters
+
+---
+
+diff --git a/include/infiniband/acm.h b/include/infiniband/acm.h
+index 20d1b9e..3cc778c 100644
+--- a/include/infiniband/acm.h
++++ b/include/infiniband/acm.h
+@@ -101,6 +101,7 @@ struct acm_resolve_msg {
+ enum {
+       ACM_CNTR_ERROR,
+       ACM_CNTR_RESOLVE,
++      ACM_CNTR_NODATA,
+       ACM_CNTR_ADDR_CACHE,
+       ACM_CNTR_ADDR_QUERY,
+       ACM_CNTR_ROUTE_CACHE,
+diff --git a/src/acm.c b/src/acm.c
+index c4b60e8..d1cdb8b 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -1009,6 +1009,11 @@ acm_client_resolve_resp(struct acm_client *client, struct acm_resolve_msg *req_m
+       acm_log(2, "client %d, status 0x%x\n", client->index, status);
+       memset(&msg, 0, sizeof msg);
+ 
++      if (status == ACM_STATUS_ENODATA)
++              atomic_inc(counters[ACM_CNTR_NODATA]);
++      else if (status)
++              atomic_inc(counters[ACM_CNTR_ERROR]);
++
+       lock_acquire(&client->lock);
+       if (client->sock == INVALID_SOCKET) {
+               acm_log(0, "ERROR - connection lost\n");
+diff --git a/src/acme.c b/src/acme.c
+index bc51faa..3be1f86 100644
+--- a/src/acme.c
++++ b/src/acme.c
+@@ -645,7 +645,7 @@ static int perf_query(char *program, char *dest_arg)
+               return -1;
+       }
+ 
+-      printf("Destination,Error Count,Resolve Count,Addr Cache Count,"
++      printf("Destination,Error Count,Resolve Count,No Data,Addr Cache Count,"
+              "Addr Query Count,Route Cache Count,Route Query Count\n")
+       for (dest_addr = get_dest(dest_list[d], &dest_type); dest_addr;
+            dest_addr = get_dest(dest_list[++d], &dest_type)) {