From d97968a37fe05d9497f6a391523c56cf788b8e37 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 15 Nov 2010 11:00:39 -0800 Subject: [PATCH] refresh (create temporary patch) --- meta | 5 +++-- patches/refresh-temp | 45 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+), 2 deletions(-) create mode 100644 patches/refresh-temp diff --git a/meta b/meta index b0c1e51..9fcf05a 100644 --- a/meta +++ b/meta @@ -1,8 +1,9 @@ Version: 1 -Previous: e18d065c60fe9ed2057a00c405485b4cec4cd8fd -Head: 1fcfbc0bf78799aaf90fa585bd781233ee02767d +Previous: 74bca13b56aecfeb831c5137cefa935a7bea8ade +Head: 9b2da1d6989c65899c32fad0cdc54f623066fee6 Applied: logging: 1fcfbc0bf78799aaf90fa585bd781233ee02767d + refresh-temp: 9b2da1d6989c65899c32fad0cdc54f623066fee6 Unapplied: loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165 Hidden: diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 0000000..1adbec7 --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,45 @@ +Bottom: fce4386974d7f89479b272a17777428be19699f0 +Top: d1d96503c5833062d50818f5ab44f42d2432089a +Author: Sean Hefty +Date: 2010-11-15 11:00:39 -0800 + +Refresh of logging + +--- + +diff --git a/src/acm.c b/src/acm.c +index 6366491..f5eec84 100644 +--- a/src/acm.c ++++ b/src/acm.c +@@ -1000,11 +1000,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); ++ acm_log(2, "dest state %d\n", dest->state); + switch (dest->state) { + case ACM_READY: + if (dest->remote_qpn == wc->src_qp) + break; + ++ acm_log(2, "src service has new qp, resetting\n"); + ibv_destroy_ah(dest->ah); // TODO: ah could be in use + /* fall through */ + case ACM_INIT: +@@ -1086,6 +1088,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; ++ struct acm_resolve_rec *rec; + int free; + + acm_log(2, "\n"); +@@ -1100,6 +1103,9 @@ static void acm_process_acm_recv(struct acm_ep *ep, struct ibv_wc *wc, struct ac + return; + } + ++ rec = (struct acm_resolve_rec *) mad->data; ++ acm_log_addr(2, "acm_process_acm_recv: src ", rec->src_type, rec->src); ++ acm_log_addr(2, "acm_process_acm_recv: dest ", rec->dest_type, rec->dest); + if (mad->method & IB_METHOD_RESP) { + acm_log(2, "received response\n"); + req = acm_get_request(ep, mad->tid, &free); -- 2.41.0