refresh (create temporary patch)

diff --git a/meta b/meta
index 6b8eedae82f15e7fdcbb2747aa24b628655a996a..0dcbf6921c1f2db310046d258bb6294c3ebe983c 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,11 @@
 Version: 1
-Previous: 52dfef85dbf4974719a99c9c20b89c14a47e5523
-Head: 87a68f8ca7615179b7c6dfc54e660949d7c5742f
+Previous: 1bcdb8811d80fb5a539b2c50ab686c2260de9831
+Head: ece8a9a27bf4f38889a8978d04a478b1904385e0
 Applied:
   deam: 3eb8f395f9a52f04c5b408812e743566e6d673fe
   braces: b6e7734ccc3d5e6103ae137025ec71b6bea39a63
   counters: 87a68f8ca7615179b7c6dfc54e660949d7c5742f
+  refresh-temp: ece8a9a27bf4f38889a8978d04a478b1904385e0
 Unapplied:
   acm1.0.5: 1b225173756cfcec4d81d26b1160ebae7644261b
   name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..2b50af6
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,35 @@
+Bottom: 24b90b7bc391f985713d5e23a631bcae818e7c1d
+Top:    555cb49d8a01e14492c60314840c56971163d433
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2011-06-29 00:23:07 -0700
+
+Refresh of counters
+
+---
+
+diff --git a/src/acm.c b/src/acm.c
+index 8e36885..54b2411 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -2250,7 +2250,7 @@ static int acm_svr_perf_query(struct acm_client *client, struct acm_perf_msg *ms
+       msg->hdr.length = ACM_MSG_HDR_LENGTH + (ACM_MAX_COUNTER * sizeof(uint64_t));
+ 
+       for (i = 0; i < ACM_MAX_COUNTER; i++)
+-              msg->data[i] = atomic_get(&counter[i]);
++              msg->data[i] = (uint64_t) atomic_get(&counter[i]);
+ 
+       ret = send(client->sock, (char *) msg, msg->hdr.length, 0);
+       if (ret != msg->hdr.length)
+diff --git a/src/libacm.c b/src/libacm.c
+index f6dd452..5331b2c 100644
+--- a/src/libacm.c
++++ b/src/libacm.c
+@@ -345,7 +345,7 @@ int ib_acm_query_perf(uint64_t **counters, int *count)
+               goto out;
+       }
+ 
+-      memcpy(*counters, perf_msg->data, msg.hdr.data[0]);
++      memcpy(*counters, perf_msg->data, sizeof(uint64_t) * msg.hdr.data[0]);
+       *count = msg.hdr.data[0];
+       ret = 0;
+ out: