From 454a4f87db062d598c383f403bae4a3349bd8f89 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 15 Nov 2010 14:08:15 -0800 Subject: [PATCH] squash --- meta | 7 ++- .../{logging => ibacm-enhance-debug-logging} | 46 +++++++++++++------ patches/logging2 | 37 --------------- 3 files changed, 36 insertions(+), 54 deletions(-) rename patches/{logging => ibacm-enhance-debug-logging} (81%) delete mode 100644 patches/logging2 diff --git a/meta b/meta index cb29ec2..414cd46 100644 --- a/meta +++ b/meta @@ -1,9 +1,8 @@ Version: 1 -Previous: 30ad1be38d0c969b5a579f6599a42ed871cbd773 -Head: b69e982755c03636396faab8b31f5359e5a67a6b +Previous: 5a0a8096dbe2966f8bfb5ee3e495b1c8536b3ad8 +Head: c17b34344b1983b71aebeed9d5dd0d553e014b3b Applied: - logging: 88d1bcda7ee4d64fe55e1e639cd485422a30c23b - logging2: b69e982755c03636396faab8b31f5359e5a67a6b + ibacm-enhance-debug-logging: c17b34344b1983b71aebeed9d5dd0d553e014b3b Unapplied: acm_snoop: a8dc60dcbdd2ab3da998585bc84770e6d59f0114 log_lid: a447930f64695cb689443978bf381f00a60eac03 diff --git a/patches/logging b/patches/ibacm-enhance-debug-logging similarity index 81% rename from patches/logging rename to patches/ibacm-enhance-debug-logging index 2620062..8fde65e 100644 --- a/patches/logging +++ b/patches/ibacm-enhance-debug-logging @@ -1,7 +1,7 @@ Bottom: 30326a5093b7b177c8d7612eba401d4999793f71 -Top: d1d96503c5833062d50818f5ab44f42d2432089a +Top: 18456ee741149c35b5859c6627ad1b4824322404 Author: Sean Hefty -Date: 2010-11-11 16:51:45 -0800 +Date: 2010-11-15 14:08:15 -0800 ibacm: enhance debug logging @@ -13,11 +13,10 @@ to each other. Signed-off-by: Sean Hefty - --- diff --git a/src/acm.c b/src/acm.c -index 820365c..f5eec84 100644 +index 820365c..27a6a25 100644 --- a/src/acm.c +++ b/src/acm.c @@ -37,6 +37,7 @@ @@ -134,7 +133,28 @@ index 820365c..f5eec84 100644 memset(&msg, 0, sizeof msg); lock_acquire(&client->lock); -@@ -992,11 +1000,13 @@ acm_process_addr_req(struct acm_ep *ep, struct ibv_wc *wc, struct acm_mad *mad) +@@ -900,7 +908,7 @@ acm_complete_queued_req(struct acm_dest *dest, uint8_t status) + req = container_of(entry, struct acm_request, entry); + lock_release(&dest->lock); + +- acm_log(2, "completing client request\n"); ++ acm_log(2, "completing request, client %d\n", req->client->index); + acm_client_resolve_resp(req->client, + (struct acm_resolve_msg *) &req->msg, dest, status); + acm_free_req(req); +@@ -923,9 +931,11 @@ acm_dest_sa_resp(struct acm_send_msg *msg, struct ibv_wc *wc, struct acm_mad *ma + status = ACM_STATUS_ETIMEDOUT; + } + acm_log(2, "resp status 0x%x\n", status); ++ acm_log_addr(2, "acm_dest_sa_resp: ", dest->addr_type, dest->address); + + lock_acquire(&dest->lock); + if (dest->state != ACM_QUERY_ROUTE) { ++ acm_log(2, "discarding SA response\n"); + lock_release(&dest->lock); + return; + } +@@ -992,11 +1002,13 @@ acm_process_addr_req(struct acm_ep *ep, struct ibv_wc *wc, struct acm_mad *mad) dest->req_id = mad->tid; lock_acquire(&dest->lock); @@ -148,7 +168,7 @@ index 820365c..f5eec84 100644 ibv_destroy_ah(dest->ah); // TODO: ah could be in use /* fall through */ case ACM_INIT: -@@ -1078,6 +1088,7 @@ put: +@@ -1078,6 +1090,7 @@ put: static void acm_process_acm_recv(struct acm_ep *ep, struct ibv_wc *wc, struct acm_mad *mad) { struct acm_send_msg *req; @@ -156,7 +176,7 @@ index 820365c..f5eec84 100644 int free; acm_log(2, "\n"); -@@ -1092,6 +1103,9 @@ static void acm_process_acm_recv(struct acm_ep *ep, struct ibv_wc *wc, struct ac +@@ -1092,6 +1105,9 @@ static void acm_process_acm_recv(struct acm_ep *ep, struct ibv_wc *wc, struct ac return; } @@ -166,7 +186,7 @@ index 820365c..f5eec84 100644 if (mad->method & IB_METHOD_RESP) { acm_log(2, "received response\n"); req = acm_get_request(ep, mad->tid, &free); -@@ -1187,7 +1201,7 @@ static void acm_process_recv(struct acm_ep *ep, struct ibv_wc *wc) +@@ -1187,7 +1203,7 @@ static void acm_process_recv(struct acm_ep *ep, struct ibv_wc *wc) { struct acm_mad *mad; @@ -175,7 +195,7 @@ index 820365c..f5eec84 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 +1649,7 @@ static void acm_svr_accept(void) +@@ -1635,7 +1651,7 @@ static void acm_svr_accept(void) client[i].sock = s; atomic_set(&client[i].refcnt, 1); @@ -184,7 +204,7 @@ index 820365c..f5eec84 100644 } static uint8_t acm_svr_query_sa(struct acm_ep *ep, struct acm_request *req) -@@ -1711,7 +1725,7 @@ acm_svr_query(struct acm_client *client, struct acm_resolve_msg *msg) +@@ -1711,7 +1727,7 @@ acm_svr_query(struct acm_client *client, struct acm_resolve_msg *msg) struct acm_ep *ep; uint8_t status; @@ -193,7 +213,7 @@ index 820365c..f5eec84 100644 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; -@@ -1916,7 +1930,7 @@ acm_svr_queue_req(struct acm_dest *dest, struct acm_client *client, +@@ -1916,7 +1932,7 @@ acm_svr_queue_req(struct acm_dest *dest, struct acm_client *client, { struct acm_request *req; @@ -202,7 +222,7 @@ index 820365c..f5eec84 100644 req = acm_alloc_req(client, msg); if (!req) { return ACM_STATUS_ENOMEM; -@@ -1935,6 +1949,7 @@ acm_svr_resolve(struct acm_client *client, struct acm_resolve_msg *msg) +@@ -1935,6 +1951,7 @@ acm_svr_resolve(struct acm_client *client, struct acm_resolve_msg *msg) uint8_t status; int ret; @@ -210,7 +230,7 @@ index 820365c..f5eec84 100644 status = acm_svr_verify_resolve(msg, &saddr, &daddr); if (status) { acm_log(0, "misformatted or unsupported request\n"); -@@ -2006,7 +2021,7 @@ static void acm_svr_receive(struct acm_client *client) +@@ -2006,7 +2023,7 @@ static void acm_svr_receive(struct acm_client *client) struct acm_resolve_msg *resolve_msg = (struct acm_resolve_msg *) &msg; int ret; diff --git a/patches/logging2 b/patches/logging2 deleted file mode 100644 index a62b272..0000000 --- a/patches/logging2 +++ /dev/null @@ -1,37 +0,0 @@ -Bottom: d1d96503c5833062d50818f5ab44f42d2432089a -Top: 18456ee741149c35b5859c6627ad1b4824322404 -Author: Sean Hefty -Date: 2010-11-15 12:37:47 -0800 - -ibacm: more logging debug - -Signed-off-by: Sean Hefty - - ---- - -diff --git a/src/acm.c b/src/acm.c -index f5eec84..27a6a25 100644 ---- a/src/acm.c -+++ b/src/acm.c -@@ -908,7 +908,7 @@ acm_complete_queued_req(struct acm_dest *dest, uint8_t status) - req = container_of(entry, struct acm_request, entry); - lock_release(&dest->lock); - -- acm_log(2, "completing client request\n"); -+ acm_log(2, "completing request, client %d\n", req->client->index); - acm_client_resolve_resp(req->client, - (struct acm_resolve_msg *) &req->msg, dest, status); - acm_free_req(req); -@@ -931,9 +931,11 @@ acm_dest_sa_resp(struct acm_send_msg *msg, struct ibv_wc *wc, struct acm_mad *ma - status = ACM_STATUS_ETIMEDOUT; - } - acm_log(2, "resp status 0x%x\n", status); -+ acm_log_addr(2, "acm_dest_sa_resp: ", dest->addr_type, dest->address); - - lock_acquire(&dest->lock); - if (dest->state != ACM_QUERY_ROUTE) { -+ acm_log(2, "discarding SA response\n"); - lock_release(&dest->lock); - return; - } -- 2.46.0