refresh

diff --git a/meta b/meta
index 5c0576d9b0e959deecfdb6fd8cc31549f76d7290..e32d326c2a2fdc7e39958c7eb19ae0f22b1026a1 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 3ceb2ddff84ba4a2c060cfe66d58a6b1fd285e65
-Head: 65f546c5f66c0d2e4137cd391a37342a1d7072c1
+Previous: ae381e5d0419e4fe9b9cf39f09b4c4777e52b5da
+Head: 9745eb6addcc69b7efe54d67ab1744739ac8dd9f
 Applied:
   ibacm-add-performance-counters: f5864c3e6d03eef8f041c5d040c887be4c6a7117
-  ib_acme-add-missing-carriage-r: 10d77b5a361567756cdabf3f4be82bf966ea9893
-  refresh-temp: 65f546c5f66c0d2e4137cd391a37342a1d7072c1
+  ib_acme-add-missing-carriage-r: 9745eb6addcc69b7efe54d67ab1744739ac8dd9f
 Unapplied:
   acm1.0.5: 93f0269bc00c539e2c7f9bf8e4afb4a9b170f064
   name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/ib_acme-add-missing-carriage-r b/patches/ib_acme-add-missing-carriage-r
index c152b3a8435bd3f5f4578c4a26fbc384aea4a2f2..bc3128dc03e5fe02feefe235c27d9ab20f64af3a 100644 (file)
--- a/patches/ib_acme-add-missing-carriage-r
+++ b/patches/ib_acme-add-missing-carriage-r
@@ -1,5 +1,5 @@
 Bottom: 17be346bccb3202eeaf8e301a5e1b6614b651c95
-Top:    91ec8488425ee8901ad8c14e7daf0ef853248170
+Top:    1a53c92d47dbca91a16fc53065c25604bca07ee1
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-08-29 16:14:50 -0700
 
@@ -10,6 +10,27 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
+diff --git a/src/acm.c b/src/acm.c
+index fed0440..d47f9d6 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -2255,14 +2255,14 @@ static int acm_svr_perf_query(struct acm_client *client, struct acm_msg *msg)
+       msg->hdr.data[0] = ACM_MAX_COUNTER;
+       msg->hdr.data[1] = 0;
+       msg->hdr.data[2] = 0;
+-      len = htons(ACM_MSG_HDR_LENGTH + (ACM_MAX_COUNTER * sizeof(uint64_t)));
++      len = ACM_MSG_HDR_LENGTH + (ACM_MAX_COUNTER * sizeof(uint64_t));
+       msg->hdr.length = htons(len);
+ 
+       for (i = 0; i < ACM_MAX_COUNTER; i++)
+               msg->perf_data[i] = htonll((uint64_t) atomic_get(&counter[i]));
+ 
+       ret = send(client->sock, (char *) msg, len, 0);
+-      if (ret != msg->hdr.length)
++      if (ret != len)
+               acm_log(0, "ERROR - failed to send response\n");
+       else
+               ret = 0;
 diff --git a/src/acme.c b/src/acme.c
 index f3faa68..3d7461b 100644
 --- a/src/acme.c
@@ -25,3 +46,24 @@ index f3faa68..3d7461b 100644
        printf("usage 2: %s\n", program);
        printf("Generate default ib_acm service configuration and option files\n");
        printf("   -A [addr_file]   - generate local address configuration file\n");
+diff --git a/src/libacm.c b/src/libacm.c
+index 8e9ccdb..727741f 100644
+--- a/src/libacm.c
++++ b/src/libacm.c
+@@ -328,12 +328,14 @@ int ib_acm_query_perf(uint64_t **counters, int *count)
+       msg.hdr.length = htons(ACM_MSG_HDR_LENGTH);
+ 
+       ret = send(sock, (char *) &msg, ACM_MSG_HDR_LENGTH, 0);
+-      if (ret != msg.hdr.length)
++      if (ret != ACM_MSG_HDR_LENGTH)
+               goto out;
+ 
+       ret = recv(sock, (char *) &msg, sizeof msg, 0);
+-      if (ret < ACM_MSG_HDR_LENGTH || ret != ntohs(msg.hdr.length))
++      if (ret < ACM_MSG_HDR_LENGTH || ret != ntohs(msg.hdr.length)) {
++              ret = ACM_STATUS_EINVAL;
+               goto out;
++      }
+ 
+       if (msg.hdr.status) {
+               ret = acm_error(msg.hdr.status);

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 420cd26..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,51 +0,0 @@
-Bottom: 91ec8488425ee8901ad8c14e7daf0ef853248170
-Top:    1a53c92d47dbca91a16fc53065c25604bca07ee1
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-09-14 14:22:51 -0700
-
-Refresh of ib_acme-add-missing-carriage-r
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index fed0440..d47f9d6 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -2255,14 +2255,14 @@ static int acm_svr_perf_query(struct acm_client *client, struct acm_msg *msg)
-       msg->hdr.data[0] = ACM_MAX_COUNTER;
-       msg->hdr.data[1] = 0;
-       msg->hdr.data[2] = 0;
--      len = htons(ACM_MSG_HDR_LENGTH + (ACM_MAX_COUNTER * sizeof(uint64_t)));
-+      len = ACM_MSG_HDR_LENGTH + (ACM_MAX_COUNTER * sizeof(uint64_t));
-       msg->hdr.length = htons(len);
- 
-       for (i = 0; i < ACM_MAX_COUNTER; i++)
-               msg->perf_data[i] = htonll((uint64_t) atomic_get(&counter[i]));
- 
-       ret = send(client->sock, (char *) msg, len, 0);
--      if (ret != msg->hdr.length)
-+      if (ret != len)
-               acm_log(0, "ERROR - failed to send response\n");
-       else
-               ret = 0;
-diff --git a/src/libacm.c b/src/libacm.c
-index 8e9ccdb..727741f 100644
---- a/src/libacm.c
-+++ b/src/libacm.c
-@@ -328,12 +328,14 @@ int ib_acm_query_perf(uint64_t **counters, int *count)
-       msg.hdr.length = htons(ACM_MSG_HDR_LENGTH);
- 
-       ret = send(sock, (char *) &msg, ACM_MSG_HDR_LENGTH, 0);
--      if (ret != msg.hdr.length)
-+      if (ret != ACM_MSG_HDR_LENGTH)
-               goto out;
- 
-       ret = recv(sock, (char *) &msg, sizeof msg, 0);
--      if (ret < ACM_MSG_HDR_LENGTH || ret != ntohs(msg.hdr.length))
-+      if (ret < ACM_MSG_HDR_LENGTH || ret != ntohs(msg.hdr.length)) {
-+              ret = ACM_STATUS_EINVAL;
-               goto out;
-+      }
- 
-       if (msg.hdr.status) {
-               ret = acm_error(msg.hdr.status);