refresh

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

diff --git a/patches/counters b/patches/counters
index eab11bbe7254ff6333955a31d5b7b89597f9caad..f6bc1fc2ada636bfadb8a7ef9da4712bad6fc2bb 100644 (file)
--- a/patches/counters
+++ b/patches/counters
@@ -1,5 +1,5 @@
 Bottom: 8c494522d92d53cdd3122c29716c08dda270b21e
-Top:    24b90b7bc391f985713d5e23a631bcae818e7c1d
+Top:    555cb49d8a01e14492c60314840c56971163d433
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-06-27 10:29:36 -0700
 
@@ -81,7 +81,7 @@ index acf6a1d..af57d0b 100644
  4. Optionally, run 'ib_acme -d <dest_ip> -v' to verify that
  the ib_acm service is running.
 diff --git a/src/acm.c b/src/acm.c
-index 7b0639a..8e36885 100644
+index 7b0639a..54b2411 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -47,7 +47,7 @@
@@ -210,7 +210,7 @@ index 7b0639a..8e36885 100644
 +      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)
@@ -427,7 +427,7 @@ index d42ba81..cf296c6 100644
        if (verbose || !(make_addr || make_opts) || ret)
                printf("return status 0x%x\n", ret);
 diff --git a/src/libacm.c b/src/libacm.c
-index 31014d1..f6dd452 100644
+index 31014d1..5331b2c 100644
 --- a/src/libacm.c
 +++ b/src/libacm.c
 @@ -36,6 +36,8 @@
@@ -534,7 +534,7 @@ index 31014d1..f6dd452 100644
 +              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:

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 2b50af6..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,35 +0,0 @@
-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: