refresh (create temporary patch)

diff --git a/meta b/meta
index bc6978fd1ae2e8261e8b1a0a27fcf1b9397879e2..4ae30482f42e08547572893808a47aa99e6e41f1 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,11 @@
 Version: 1
-Previous: 7df643fa92baef1016954b15a426f6c26dc16948
-Head: 81878eb30604d7b25d0648329ca9e5f3eba591e1
+Previous: 9014a8e31f374e2856814e4ff54c51cf3d0790d9
+Head: ab9ae3744b56ad22fbabb9792fb429f168c8c59d
 Applied:
   deam: 15fcbd5198ba0c15ab4e8fddcdba32c8ef45faf8
   braces: 5fb48c1b8d722b60332f83ca4c8b92b2a7e456a6
   counters: 81878eb30604d7b25d0648329ca9e5f3eba591e1
+  refresh-temp: ab9ae3744b56ad22fbabb9792fb429f168c8c59d
 Unapplied:
   acm1.0.5: 1b225173756cfcec4d81d26b1160ebae7644261b
   name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..862291e
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,47 @@
+Bottom: 96d4b580e6b64a5b93647bf40210f2a5ee9a6839
+Top:    4e880c751ba52d99f201637395b7a42c35db7d72
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2011-06-29 00:06:19 -0700
+
+Refresh of counters
+
+---
+
+diff --git a/src/acme.c b/src/acme.c
+index 733170f..cf296c6 100644
+--- a/src/acme.c
++++ b/src/acme.c
+@@ -665,6 +665,7 @@ static int query_perf(char *program, char *dest_arg)
+                       for (i = 0; i < cnt; i++)
+                               printf("%llu,", counters[i]);
+                       printf("\n");
++                      ib_acm_free_perf(counters);
+               }
+ 
+               ib_acm_disconnect();
+diff --git a/src/libacm.c b/src/libacm.c
+index f6dd452..5a0332f 100644
+--- a/src/libacm.c
++++ b/src/libacm.c
+@@ -316,8 +316,10 @@ out:
+ 
+ int ib_acm_query_perf(uint64_t **counters, int *count)
+ {
+-      struct acm_msg msg;
+-      struct acm_perf_msg *perf_msg = (struct acm_perf_msg *) &msg;
++      union {
++              struct acm_msg msg;
++              struct acm_perf_msg perf_msg;
++      };
+       int ret;
+ 
+       lock_acquire(&lock);
+@@ -345,7 +347,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, msg.hdr.data[0]);
+       *count = msg.hdr.data[0];
+       ret = 0;
+ out: