Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id C4140200C36 for ; Thu, 23 Feb 2017 23:51:11 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id BFF44160B64; Thu, 23 Feb 2017 22:51:11 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5750E160B8E for ; Thu, 23 Feb 2017 23:51:10 +0100 (CET) Received: (qmail 77438 invoked by uid 500); 23 Feb 2017 22:51:09 -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 76418 invoked by uid 99); 23 Feb 2017 22:51:08 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 23 Feb 2017 22:51:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A8EBFDFE8F; Thu, 23 Feb 2017 22:51:08 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aconway@apache.org To: commits@qpid.apache.org Date: Thu, 23 Feb 2017 22:51:33 -0000 Message-Id: <5a5541fedc8a416ea22b5abe68523deb@git.apache.org> In-Reply-To: <18e12ab11c6247358369966c9b6620b7@git.apache.org> References: <18e12ab11c6247358369966c9b6620b7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [26/38] qpid-proton git commit: PROTON-1403: Rename pn_proactor_grab -> pn_proactor_get archived-at: Thu, 23 Feb 2017 22:51:11 -0000 PROTON-1403: Rename pn_proactor_grab -> pn_proactor_get Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/6a2316a5 Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/6a2316a5 Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/6a2316a5 Branch: refs/heads/go1 Commit: 6a2316a5d0a4e274802de81744ceae534323ba17 Parents: 7368c34 Author: Alan Conway Authored: Fri Feb 17 13:40:52 2017 -0500 Committer: Alan Conway Committed: Fri Feb 17 13:40:52 2017 -0500 ---------------------------------------------------------------------- proton-c/include/proton/proactor.h | 2 +- proton-c/src/proactor/libuv.c | 2 +- proton-c/src/tests/proactor.c | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/6a2316a5/proton-c/include/proton/proactor.h ---------------------------------------------------------------------- diff --git a/proton-c/include/proton/proactor.h b/proton-c/include/proton/proactor.h index af3acbc..94c4891 100644 --- a/proton-c/include/proton/proactor.h +++ b/proton-c/include/proton/proactor.h @@ -119,7 +119,7 @@ PNP_EXTERN pn_event_batch_t *pn_proactor_wait(pn_proactor_t *proactor); * Return a batch of events if one is available immediately, otherwise return NULL. If it * does return an event batch, the rules are the same as for pn_proactor_wait() */ -PNP_EXTERN pn_event_batch_t *pn_proactor_grab(pn_proactor_t *proactor); +PNP_EXTERN pn_event_batch_t *pn_proactor_get(pn_proactor_t *proactor); /** * Call when done handling a batch of events. http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/6a2316a5/proton-c/src/proactor/libuv.c ---------------------------------------------------------------------- diff --git a/proton-c/src/proactor/libuv.c b/proton-c/src/proactor/libuv.c index 0e87d0a..d2badbe 100644 --- a/proton-c/src/proactor/libuv.c +++ b/proton-c/src/proactor/libuv.c @@ -781,7 +781,7 @@ pn_event_batch_t *pn_proactor_wait(struct pn_proactor_t* p) { return batch; } -pn_event_batch_t *pn_proactor_grab(struct pn_proactor_t* p) { +pn_event_batch_t *pn_proactor_get(struct pn_proactor_t* p) { uv_mutex_lock(&p->lock); pn_event_batch_t *batch = get_batch_lh(p); if (batch == NULL && !p->has_leader) { http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/6a2316a5/proton-c/src/tests/proactor.c ---------------------------------------------------------------------- diff --git a/proton-c/src/tests/proactor.c b/proton-c/src/tests/proactor.c index e90c45a..9f8b1fe 100644 --- a/proton-c/src/tests/proactor.c +++ b/proton-c/src/tests/proactor.c @@ -90,7 +90,7 @@ static void proactor_test_init(proactor_test_t *pts, size_t n) { } /* Iterate over an array of proactors, draining or handling events with the non-blocking - pn_proactor_grab. Continue till all handlers return H_FINISHED (and return 0) or one + pn_proactor_get. Continue till all handlers return H_FINISHED (and return 0) or one returns H_FAILED (and return non-0) */ int proactor_test_run(proactor_test_t *pts, size_t n) { @@ -100,7 +100,7 @@ int proactor_test_run(proactor_test_t *pts, size_t n) { do { finished = 0; for (proactor_test_t *pt = pts; pt < pts + n; ++pt) { - pn_event_batch_t *events = pn_proactor_grab(pt->proactor); + pn_event_batch_t *events = pn_proactor_get(pt->proactor); if (events) { pn_event_t *e; while ((e = pn_event_batch_next(events))) { --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org