This is an automated email from the ASF dual-hosted git repository. kgiusti pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
commit 45198bf94969e7c41b8439437c92e99f4ba00a98 Author: Kenneth Giusti <[email protected]> AuthorDate: Sun Jan 3 15:10:23 2021 -0500 NO-JIRA: clarify delivery inc/decref messages --- src/adaptors/http1/http1_client.c | 8 ++++---- src/adaptors/http1/http1_server.c | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/adaptors/http1/http1_client.c b/src/adaptors/http1/http1_client.c index 19a70a2..3c58f3b 100644 --- a/src/adaptors/http1/http1_client.c +++ b/src/adaptors/http1/http1_client.c @@ -1490,7 +1490,7 @@ uint64_t qdr_http1_client_core_link_deliver(qdr_http1_adaptor_t *adaptor, rmsg->dlv = delivery; DEQ_INIT(rmsg->out_data.fifo); qdr_delivery_set_context(delivery, hreq); - qdr_delivery_incref(delivery, "referenced by HTTP1 adaptor"); + qdr_delivery_incref(delivery, "HTTP1 client referencing response delivery"); DEQ_INSERT_TAIL(hreq->responses, rmsg); qd_log(qdr_http1_adaptor->log, QD_LOG_TRACE, "[C%"PRIu64"][L%"PRIu64"] HTTP received response for msg-id=%"PRIu64, @@ -1545,7 +1545,7 @@ uint64_t qdr_http1_client_core_link_deliver(qdr_http1_adaptor_t *adaptor, // returning a terminal disposition will cause the delivery to be updated and settled, // so drop our reference qdr_delivery_set_context(rmsg->dlv, 0); - qdr_delivery_decref(qdr_http1_adaptor->core, rmsg->dlv, "malformed HTTP1 response, delivery released"); + qdr_delivery_decref(qdr_http1_adaptor->core, rmsg->dlv, "HTTP1 client releasing malformed response delivery"); rmsg->dlv = 0; qdr_http1_close_connection(hconn, "Cannot parse response message"); return rmsg->dispo; @@ -1569,7 +1569,7 @@ static void _client_response_msg_free(_client_request_t *req, _client_response_m DEQ_REMOVE(req->responses, rmsg); if (rmsg->dlv) { qdr_delivery_set_context(rmsg->dlv, 0); - qdr_delivery_decref(qdr_http1_adaptor->core, rmsg->dlv, "HTTP1 adaptor response settled"); + qdr_delivery_decref(qdr_http1_adaptor->core, rmsg->dlv, "HTTP1 client response delivery settled"); } qdr_http1_out_data_fifo_cleanup(&rmsg->out_data); @@ -1602,7 +1602,7 @@ static void _client_request_free(_client_request_t *hreq) qd_message_free(hreq->request_msg); if (hreq->request_dlv) { qdr_delivery_set_context(hreq->request_dlv, 0); - qdr_delivery_decref(qdr_http1_adaptor->core, hreq->request_dlv, "HTTP1 adaptor request settled"); + qdr_delivery_decref(qdr_http1_adaptor->core, hreq->request_dlv, "HTTP1 client request delivery settled"); } qd_compose_free(hreq->request_props); diff --git a/src/adaptors/http1/http1_server.c b/src/adaptors/http1/http1_server.c index 18a114a..1a661e6 100644 --- a/src/adaptors/http1/http1_server.c +++ b/src/adaptors/http1/http1_server.c @@ -649,7 +649,7 @@ static bool _process_requests(qdr_http1_connection_t *hconn) hreq->request_acked = hreq->request_settled = true; } qdr_delivery_set_context(hreq->request_dlv, 0); - qdr_delivery_decref(qdr_http1_adaptor->core, hreq->request_dlv, "HTTP1 adaptor request cancelled"); + qdr_delivery_decref(qdr_http1_adaptor->core, hreq->request_dlv, "HTTP1 server request cancelled releasing delivery"); hreq->request_dlv = 0; } @@ -713,7 +713,7 @@ static bool _process_requests(qdr_http1_connection_t *hconn) hreq->request_acked = true; if (hreq->request_settled) { qdr_delivery_set_context(hreq->request_dlv, 0); - qdr_delivery_decref(qdr_http1_adaptor->core, hreq->request_dlv, "HTTP1 adaptor request settled"); + qdr_delivery_decref(qdr_http1_adaptor->core, hreq->request_dlv, "HTTP1 server request settled releasing delivery"); hreq->request_dlv = 0; } } @@ -1434,7 +1434,7 @@ uint64_t qdr_http1_server_core_link_deliver(qdr_http1_adaptor_t *adaptor, hreq->request_dlv = delivery; qdr_delivery_set_context(delivery, (void*) hreq); - qdr_delivery_incref(delivery, "referenced by HTTP1 adaptor"); + qdr_delivery_incref(delivery, "HTTP1 server referencing request delivery"); break; } } @@ -1458,7 +1458,7 @@ uint64_t qdr_http1_server_core_link_deliver(qdr_http1_adaptor_t *adaptor, // returning a terminal disposition will cause the delivery to be updated and settled, // so drop our reference qdr_delivery_set_context(hreq->request_dlv, 0); - qdr_delivery_decref(qdr_http1_adaptor->core, hreq->request_dlv, "malformed HTTP1 request, delivery released"); + qdr_delivery_decref(qdr_http1_adaptor->core, hreq->request_dlv, "HTTP1 server releasing malformed HTTP1 request delivery"); hreq->request_dlv = 0; hreq->request_acked = hreq->request_settled = true; return hreq->request_dispo; @@ -1483,7 +1483,7 @@ static void _server_response_msg_free(_server_request_t *hreq, _server_response_ qd_compose_free(rmsg->msg_props); if (rmsg->dlv) { qdr_delivery_set_context(rmsg->dlv, 0); - qdr_delivery_decref(qdr_http1_adaptor->core, rmsg->dlv, "HTTP1 adaptor response freed"); + qdr_delivery_decref(qdr_http1_adaptor->core, rmsg->dlv, "HTTP1 server releasing response delivery"); } free__server_response_msg_t(rmsg); } @@ -1497,7 +1497,7 @@ static void _server_request_free(_server_request_t *hreq) qdr_http1_request_base_cleanup(&hreq->base); if (hreq->request_dlv) { qdr_delivery_set_context(hreq->request_dlv, 0); - qdr_delivery_decref(qdr_http1_adaptor->core, hreq->request_dlv, "HTTP1 adaptor request freed"); + qdr_delivery_decref(qdr_http1_adaptor->core, hreq->request_dlv, "HTTP1 server releasing request delivery"); } qdr_http1_out_data_fifo_cleanup(&hreq->out_data); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
