refresh (create temporary patch)

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

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..7e4bac1
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,85 @@
+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");