From commits-return-47923-archive-asf-public=cust-asf.ponee.io@qpid.apache.org Fri Mar 15 14:14:56 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 0F503180627 for ; Fri, 15 Mar 2019 15:14:55 +0100 (CET) Received: (qmail 38012 invoked by uid 500); 15 Mar 2019 14:14:55 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 38003 invoked by uid 99); 15 Mar 2019 14:14:55 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 15 Mar 2019 14:14:55 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 86DDC8531F; Fri, 15 Mar 2019 14:14:54 +0000 (UTC) Date: Fri, 15 Mar 2019 14:14:54 +0000 To: "commits@qpid.apache.org" Subject: [qpid-dispatch] branch master updated: DISPATCH-1283 - Added call to update counters inside the updated_deliveries loop of qdr_delete_delivery_CT. The deliveries in that list must be accounted for. This closes #465. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155265929446.20074.3571089337567935877@gitbox.apache.org> From: gmurthy@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: qpid-dispatch X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 88e258976efdea645bb2e4d6edf528854baa5bef X-Git-Newrev: b097d7a5085ab9e58207247cafc16c0ec7b36a0e X-Git-Rev: b097d7a5085ab9e58207247cafc16c0ec7b36a0e X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. gmurthy pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git The following commit(s) were added to refs/heads/master by this push: new b097d7a DISPATCH-1283 - Added call to update counters inside the updated_deliveries loop of qdr_delete_delivery_CT. The deliveries in that list must be accounted for. This closes #465. b097d7a is described below commit b097d7a5085ab9e58207247cafc16c0ec7b36a0e Author: Ganesh Murthy AuthorDate: Thu Mar 14 15:50:18 2019 -0400 DISPATCH-1283 - Added call to update counters inside the updated_deliveries loop of qdr_delete_delivery_CT. The deliveries in that list must be accounted for. This closes #465. --- src/router_core/connections.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/router_core/connections.c b/src/router_core/connections.c index 1ac8bcf..8498ff3 100644 --- a/src/router_core/connections.c +++ b/src/router_core/connections.c @@ -666,6 +666,11 @@ static void qdr_link_cleanup_deliveries_CT(qdr_core_t *core, qdr_connection_t *c qdr_delivery_ref_t *ref = DEQ_HEAD(updated_deliveries); while (ref) { // + // Updates global and link level delivery counters like presettled_deliveries, accepted_deliveries, released_deliveries etc + // + qdr_increment_delivery_counters_CT(core, ref->dlv); + ref->dlv->link = 0; + // // Now our reference // qdr_delivery_decref_CT(core, ref->dlv, "qdr_link_cleanup_deliveries_CT - remove from updated list"); --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org