From 4e194be0d36335fa4e0fe09fd2c4df176d7fcab0 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Fri, 12 Nov 2010 16:51:40 -0800
Subject: [PATCH] refresh (create temporary patch)

---
 meta                 |   5 +-
 patches/refresh-temp | 132 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 135 insertions(+), 2 deletions(-)
 create mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index 28c8c19..d91e646 100644
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: e4f060edff974af8ea41f8f9fc2e6aeb2e4c54f2
-Head: 446f93ef1b1c8349750ff1507f0a7ba76b39fc89
+Previous: 2db38b799582f7e8e2dc7efe123c716aef1f9d12
+Head: 1e2ef4313ab513de3517700baf63aa95b329c89c
 Applied:
   ts: 446f93ef1b1c8349750ff1507f0a7ba76b39fc89
+  refresh-temp: 1e2ef4313ab513de3517700baf63aa95b329c89c
 Unapplied:
   loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165
 Hidden:
diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644
index 0000000..85e5b04
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,132 @@
+Bottom: a54b3e542a71776166e8d85e0c30256c37ccc268
+Top:    1df1d44b89d4161f2d3d3274603c0435ddfdd479
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2010-11-12 16:51:40 -0800
+
+Refresh of ts
+
+---
+
+diff --git a/src/acm.c b/src/acm.c
+index 6f77729..fd61a9d 100644
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -296,7 +296,7 @@ acm_alloc_dest(uint8_t addr_type, uint8_t *addr)
+ 	}
+ 
+ 	acm_init_dest(dest, addr_type, addr, ACM_MAX_ADDRESS);
+-	acm_log(1, "%p\n", dest);
++	acm_log_addr(1, "acm_alloc_dest: ", addr_type, addr);
+ 	return dest;
+ }
+ 
+@@ -310,17 +310,18 @@ acm_get_dest(struct acm_ep *ep, uint8_t addr_type, uint8_t *addr)
+ 	if (tdest) {
+ 		dest = *tdest;
+ 		(void) atomic_inc(&dest->refcnt);
++		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(2, "%p\n", dest);
+ 	return dest;
+ }
+ 
+ static void
+ acm_put_dest(struct acm_dest *dest)
+ {
+-	acm_log(2, "%p\n", dest);
++	acm_log_addr(2, "acm_put_dest: ", dest->addr_type, dest->address);
+ 	if (atomic_dec(&dest->refcnt) == 0) {
+ 		free(dest);
+ 	}
+@@ -368,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, "%p\n", req);
++	acm_log(2, "client id %d, req %p\n", client->index, req);
+ 	return req;
+ }
+ 
+@@ -743,7 +744,7 @@ static uint8_t acm_resolve_path(struct acm_ep *ep, struct acm_dest *dest,
+ 	struct acm_send_msg *msg;
+ 	struct ib_sa_mad *mad;
+ 
+-	acm_log(2, "\n");
++	acm_log_addr(2, "acm_resolve_path: ", dest->addr_type, dest->addr);
+ 	msg = acm_alloc_send(ep, &ep->port->sa_dest, sizeof(*mad));
+ 	if (!msg) {
+ 		acm_log(0, "ERROR - cannot allocate send msg\n");
+@@ -771,7 +772,7 @@ acm_record_acm_addr(struct acm_ep *ep, struct acm_dest *dest, struct ibv_wc *wc,
+ {
+ 	int index;
+ 
+-	acm_log(2, "\n");
++	acm_log_addr(2, "acm_record_acm_addr: ", dest->addr_type, dest->addr);
+ 	index = acm_best_mc_index(ep, rec);
+ 	if (index < 0) {
+ 		acm_log(0, "ERROR - no shared multicast groups\n");
+@@ -821,7 +822,7 @@ acm_send_addr_resp(struct acm_ep *ep, struct acm_dest *dest)
+ 	struct acm_send_msg *msg;
+ 	struct acm_mad *mad;
+ 
+-	acm_log(2, "\n");
++	acm_log_addr(2, "acm_send_addr_resp: ", dest->addr_type, dest->addr);
+ 	msg = acm_alloc_send(ep, dest, sizeof (*mad));
+ 	if (!msg) {
+ 		acm_log(0, "ERROR - failed to allocate message\n");
+@@ -852,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, "status 0x%x\n", status);
++	acm_log(1, "client id %d, status 0x%x\n", client->index, status);
+ 	memset(&msg, 0, sizeof msg);
+ 
+ 	lock_acquire(&client->lock);
+@@ -1194,7 +1195,7 @@ static void acm_process_recv(struct acm_ep *ep, struct ibv_wc *wc)
+ {
+ 	struct acm_mad *mad;
+ 
+-	acm_log(2, "\n");
++	acm_log_addr(2, "acm_process_recv: ep ", ep->addr_type, ep->addr);
+ 	mad = (struct acm_mad *) (uintptr_t) (wc->wr_id + sizeof(struct ibv_grh));
+ 	switch (mad->mgmt_class) {
+ 	case IB_MGMT_CLASS_SA:
+@@ -1718,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);
+ 	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;
+@@ -1923,7 +1924,7 @@ acm_svr_queue_req(struct acm_dest *dest, struct acm_client *client,
+ {
+ 	struct acm_request *req;
+ 
+-	acm_log(2, "\n");
++	acm_log(2, "client id %d\n", client->index);
+ 	req = acm_alloc_req(client, msg);
+ 	if (!req) {
+ 		return ACM_STATUS_ENOMEM;
+@@ -1942,6 +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);
+ 	status = acm_svr_verify_resolve(msg, &saddr, &daddr);
+ 	if (status) {
+ 		acm_log(0, "misformatted or unsupported request\n");
+@@ -2013,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, "\n");
++	acm_log(2, "client id %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");
-- 
2.46.0