From 5b90ec1ee8a3cfb76ef040149ffbb2ac5c119b80 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Mon, 15 Nov 2010 11:00:39 -0800 Subject: [PATCH] refresh --- meta | 7 +++---- patches/logging | 48 ++++++++++++++++++++++++++++++++++++-------- patches/refresh-temp | 45 ----------------------------------------- 3 files changed, 43 insertions(+), 57 deletions(-) delete mode 100644 patches/refresh-temp diff --git a/meta b/meta index 9fcf05a..92086fb 100644 --- a/meta +++ b/meta @@ -1,9 +1,8 @@ Version: 1 -Previous: 74bca13b56aecfeb831c5137cefa935a7bea8ade -Head: 9b2da1d6989c65899c32fad0cdc54f623066fee6 +Previous: e7c7a48dbf7d1769b5875a8399341654612be53d +Head: 88d1bcda7ee4d64fe55e1e639cd485422a30c23b Applied: - logging: 1fcfbc0bf78799aaf90fa585bd781233ee02767d - refresh-temp: 9b2da1d6989c65899c32fad0cdc54f623066fee6 + logging: 88d1bcda7ee4d64fe55e1e639cd485422a30c23b Unapplied: loopback: 8c3473645ff2d6097b6a9c351a726ea48c1d8165 Hidden: diff --git a/patches/logging b/patches/logging index 944fb64..2620062 100644 --- a/patches/logging +++ b/patches/logging @@ -1,5 +1,5 @@ Bottom: 30326a5093b7b177c8d7612eba401d4999793f71 -Top: fce4386974d7f89479b272a17777428be19699f0 +Top: d1d96503c5833062d50818f5ab44f42d2432089a Author: Sean Hefty Date: 2010-11-11 16:51:45 -0800 @@ -17,7 +17,7 @@ Signed-off-by: Sean Hefty --- diff --git a/src/acm.c b/src/acm.c -index 820365c..6366491 100644 +index 820365c..f5eec84 100644 --- a/src/acm.c +++ b/src/acm.c @@ -37,6 +37,7 @@ @@ -134,7 +134,39 @@ index 820365c..6366491 100644 memset(&msg, 0, sizeof msg); lock_acquire(&client->lock); -@@ -1187,7 +1195,7 @@ static void acm_process_recv(struct acm_ep *ep, struct ibv_wc *wc) +@@ -992,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: +@@ -1078,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"); +@@ -1092,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); +@@ -1187,7 +1201,7 @@ static void acm_process_recv(struct acm_ep *ep, struct ibv_wc *wc) { struct acm_mad *mad; @@ -143,7 +175,7 @@ index 820365c..6366491 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) +@@ -1635,7 +1649,7 @@ static void acm_svr_accept(void) client[i].sock = s; atomic_set(&client[i].refcnt, 1); @@ -152,7 +184,7 @@ index 820365c..6366491 100644 } 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) +@@ -1711,7 +1725,7 @@ acm_svr_query(struct acm_client *client, struct acm_resolve_msg *msg) struct acm_ep *ep; uint8_t status; @@ -161,7 +193,7 @@ index 820365c..6366491 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 +1924,7 @@ acm_svr_queue_req(struct acm_dest *dest, struct acm_client *client, +@@ -1916,7 +1930,7 @@ acm_svr_queue_req(struct acm_dest *dest, struct acm_client *client, { struct acm_request *req; @@ -170,7 +202,7 @@ index 820365c..6366491 100644 req = acm_alloc_req(client, msg); if (!req) { return ACM_STATUS_ENOMEM; -@@ -1935,6 +1943,7 @@ acm_svr_resolve(struct acm_client *client, struct acm_resolve_msg *msg) +@@ -1935,6 +1949,7 @@ acm_svr_resolve(struct acm_client *client, struct acm_resolve_msg *msg) uint8_t status; int ret; @@ -178,7 +210,7 @@ index 820365c..6366491 100644 status = acm_svr_verify_resolve(msg, &saddr, &daddr); if (status) { acm_log(0, "misformatted or unsupported request\n"); -@@ -2006,7 +2015,7 @@ static void acm_svr_receive(struct acm_client *client) +@@ -2006,7 +2021,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/refresh-temp b/patches/refresh-temp deleted file mode 100644 index 1adbec7..0000000 --- a/patches/refresh-temp +++ /dev/null @@ -1,45 +0,0 @@ -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.46.0