refresh

diff --git a/meta b/meta
index b1d93592fc08dde1917a8d49517e098140ad7607..bf67f2767c8738031f4e5f5f01e3bbba1ef4bd53 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,8 @@
 Version: 1
-Previous: b0311f01085bde2e3a0ea8db15242a47bc516f6b
-Head: cf338808a13ab8a5515c2006f77c9bed71188185
+Previous: fb714fbea83fa08fbccdb9c477043d98b5299709
+Head: f96cc780a72a9f0c0ae7ad11eceb44290dffd87d
 Applied:
-  logging: 22288465e0296c750fd97bd38012de7c769f0429
-  refresh-temp: cf338808a13ab8a5515c2006f77c9bed71188185
+  logging: f96cc780a72a9f0c0ae7ad11eceb44290dffd87d
 Unapplied:
   loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
 Hidden:

diff --git a/patches/logging b/patches/logging
index 16c22110dc1aad52c959f50f7ac494e5cf12e591..3a453af1099dff3a777111405071d8274252d794 100644 (file)
--- a/patches/logging
+++ b/patches/logging
@@ -1,5 +1,5 @@
 Bottom: 30326a5093b7b177c8d7612eba401d4999793f71
-Top:    097fb1566cae6cb7c620f574b8ad8fe5ea5a77db
+Top:    0646098666e1c28a204874a86b8c05cbaf79c80e
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-11-11 16:51:45 -0800
 
@@ -17,7 +17,7 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 ---
 
 diff --git a/src/acm.c b/src/acm.c
-index 820365c..ce3267f 100644
+index 820365c..c642060 100644
 --- a/src/acm.c
 +++ b/src/acm.c
 @@ -37,6 +37,7 @@
@@ -75,7 +75,7 @@ index 820365c..ce3267f 100644
 +              acm_log_addr(2, "acm_get_dest: ", dest->addr_type, dest->address);
        } else {
                dest = NULL;
-+              acm_log_addr(2, "acm_get_dest: not found ", dest->addr_type, dest->address);
++              acm_log_addr(2, "acm_get_dest: not found ", addr_type, address);
        }
 -      acm_log(2, "%p\n", dest);
        return dest;
@@ -94,7 +94,7 @@ index 820365c..ce3267f 100644
        req->client = client;
        memcpy(&req->msg, msg, sizeof(req->msg));
 -      acm_log(2, "%p\n", req);
-+      acm_log(2, "client id %d, req %p\n", client->index, req);
++      acm_log(2, "client %d, req %p\n", client->index, req);
        return req;
  }
  
@@ -130,7 +130,7 @@ index 820365c..ce3267f 100644
        int ret;
  
 -      acm_log(1, "status 0x%x\n", status);
-+      acm_log(1, "client id %d, status 0x%x\n", client->index, status);
++      acm_log(1, "client %d, status 0x%x\n", client->index, status);
        memset(&msg, 0, sizeof msg);
  
        lock_acquire(&client->lock);
@@ -143,12 +143,21 @@ index 820365c..ce3267f 100644
        mad = (struct acm_mad *) (uintptr_t) (wc->wr_id + sizeof(struct ibv_grh));
        switch (mad->mgmt_class) {
        case IB_MGMT_CLASS_SA:
+@@ -1635,7 +1643,7 @@ static void acm_svr_accept(void)
+ 
+       client[i].sock = s;
+       atomic_set(&client[i].refcnt, 1);
+-      acm_log(2, "assigned client id %d\n", i);
++      acm_log(2, "assigned client %d\n", i);
+ }
+ 
+ static uint8_t acm_svr_query_sa(struct acm_ep *ep, struct acm_request *req)
 @@ -1711,7 +1719,7 @@ acm_svr_query(struct acm_client *client, struct acm_resolve_msg *msg)
        struct acm_ep *ep;
        uint8_t status;
  
 -      acm_log(2, "processing client query\n");
-+      acm_log(2, "client id %d\n", client->index);
++      acm_log(2, "client %d\n", client->index);
        if (msg->hdr.length != ACM_MSG_HDR_LENGTH + ACM_MSG_EP_LENGTH) {
                acm_log(0, "ERROR - invalid length: 0x%x\n", msg->hdr.length);
                status = ACM_STATUS_EINVAL;
@@ -157,7 +166,7 @@ index 820365c..ce3267f 100644
        struct acm_request *req;
  
 -      acm_log(2, "\n");
-+      acm_log(2, "client id %d\n", client->index);
++      acm_log(2, "client %d\n", client->index);
        req = acm_alloc_req(client, msg);
        if (!req) {
                return ACM_STATUS_ENOMEM;
@@ -165,7 +174,7 @@ index 820365c..ce3267f 100644
        uint8_t status;
        int ret;
  
-+      acm_log(2, "client id %d\n", client->index);
++      acm_log(2, "client %d\n", client->index);
        status = acm_svr_verify_resolve(msg, &saddr, &daddr);
        if (status) {
                acm_log(0, "misformatted or unsupported request\n");
@@ -174,7 +183,7 @@ index 820365c..ce3267f 100644
        int ret;
  
 -      acm_log(2, "\n");
-+      acm_log(2, "client id %d\n", client->index);
++      acm_log(2, "client %d\n", client->index);
        ret = recv(client->sock, (char *) &msg, sizeof msg, 0);
        if (ret <= 0 || ret != msg.hdr.length) {
                acm_log(2, "client disconnected\n");

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 7e4bac1..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,85 +0,0 @@
-Bottom: 097fb1566cae6cb7c620f574b8ad8fe5ea5a77db
-Top:    0646098666e1c28a204874a86b8c05cbaf79c80e
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-11-12 17:19:11 -0800
-
-Refresh of logging
-
----
-
-diff --git a/src/acm.c b/src/acm.c
-index ce3267f..c642060 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -313,7 +313,7 @@ acm_get_dest(struct acm_ep *ep, uint8_t addr_type, uint8_t *addr)
-               acm_log_addr(2, "acm_get_dest: ", dest->addr_type, dest->address);
-       } else {
-               dest = NULL;
--              acm_log_addr(2, "acm_get_dest: not found ", dest->addr_type, dest->address);
-+              acm_log_addr(2, "acm_get_dest: not found ", addr_type, address);
-       }
-       return dest;
- }
-@@ -369,7 +369,7 @@ acm_alloc_req(struct acm_client *client, struct acm_resolve_msg *msg)
-       (void) atomic_inc(&client->refcnt);
-       req->client = client;
-       memcpy(&req->msg, msg, sizeof(req->msg));
--      acm_log(2, "client id %d, req %p\n", client->index, req);
-+      acm_log(2, "client %d, req %p\n", client->index, req);
-       return req;
- }
- 
-@@ -853,7 +853,7 @@ acm_client_resolve_resp(struct acm_client *client, struct acm_resolve_msg *req_m
-       struct acm_resolve_msg *resp_msg = (struct acm_resolve_msg *) &msg;
-       int ret;
- 
--      acm_log(1, "client id %d, status 0x%x\n", client->index, status);
-+      acm_log(1, "client %d, status 0x%x\n", client->index, status);
-       memset(&msg, 0, sizeof msg);
- 
-       lock_acquire(&client->lock);
-@@ -1643,7 +1643,7 @@ static void acm_svr_accept(void)
- 
-       client[i].sock = s;
-       atomic_set(&client[i].refcnt, 1);
--      acm_log(2, "assigned client id %d\n", i);
-+      acm_log(2, "assigned client %d\n", i);
- }
- 
- static uint8_t acm_svr_query_sa(struct acm_ep *ep, struct acm_request *req)
-@@ -1719,7 +1719,7 @@ acm_svr_query(struct acm_client *client, struct acm_resolve_msg *msg)
-       struct acm_ep *ep;
-       uint8_t status;
- 
--      acm_log(2, "client id %d\n", client->index);
-+      acm_log(2, "client %d\n", client->index);
-       if (msg->hdr.length != ACM_MSG_HDR_LENGTH + ACM_MSG_EP_LENGTH) {
-               acm_log(0, "ERROR - invalid length: 0x%x\n", msg->hdr.length);
-               status = ACM_STATUS_EINVAL;
-@@ -1924,7 +1924,7 @@ acm_svr_queue_req(struct acm_dest *dest, struct acm_client *client,
- {
-       struct acm_request *req;
- 
--      acm_log(2, "client id %d\n", client->index);
-+      acm_log(2, "client %d\n", client->index);
-       req = acm_alloc_req(client, msg);
-       if (!req) {
-               return ACM_STATUS_ENOMEM;
-@@ -1943,7 +1943,7 @@ acm_svr_resolve(struct acm_client *client, struct acm_resolve_msg *msg)
-       uint8_t status;
-       int ret;
- 
--      acm_log(2, "client id %d\n", client->index);
-+      acm_log(2, "client %d\n", client->index);
-       status = acm_svr_verify_resolve(msg, &saddr, &daddr);
-       if (status) {
-               acm_log(0, "misformatted or unsupported request\n");
-@@ -2015,7 +2015,7 @@ static void acm_svr_receive(struct acm_client *client)
-       struct acm_resolve_msg *resolve_msg = (struct acm_resolve_msg *) &msg;
-       int ret;
- 
--      acm_log(2, "client id %d\n", client->index);
-+      acm_log(2, "client %d\n", client->index);
-       ret = recv(client->sock, (char *) &msg, sizeof msg, 0);
-       if (ret <= 0 || ret != msg.hdr.length) {
-               acm_log(2, "client disconnected\n");