From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-lj1-f181.google.com (mail-lj1-f181.google.com [209.85.208.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by dev.tarantool.org (Postfix) with ESMTPS id B780F446442 for ; Thu, 12 Nov 2020 22:53:26 +0300 (MSK) Received: by mail-lj1-f181.google.com with SMTP id h23so7639226ljg.13 for ; Thu, 12 Nov 2020 11:53:26 -0800 (PST) From: Cyrill Gorcunov Date: Thu, 12 Nov 2020 22:51:20 +0300 Message-Id: <20201112195121.191366-11-gorcunov@gmail.com> In-Reply-To: <20201112195121.191366-1-gorcunov@gmail.com> References: <20201112195121.191366-1-gorcunov@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [Tarantool-patches] [PATCH 10/11] relay: use verbose names for fibers List-Id: Tarantool development patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: tml Cc: Vladislav Shpilevoy Usually we use _f postfix for fiber's loop functions and using same postfix for the fiber instance itself looks inconsistent. Same time if we grep for "struct fibers" we see a number of places where fiber instances are postfixed with _fiber. Thus lets make the same in relay fiber code: - use explicit reader_fiber name for a reader - use relay_fiber name for the joint relay fiber which depends on the reader, moreover this explicit name allows to note that the reader cancels the bound fiber if error happens. Signed-off-by: Cyrill Gorcunov --- src/box/relay.cc | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/box/relay.cc b/src/box/relay.cc index fa3dc3a75..a9522d30c 100644 --- a/src/box/relay.cc +++ b/src/box/relay.cc @@ -539,7 +539,7 @@ int relay_reader_f(va_list ap) { struct relay *relay = va_arg(ap, struct relay *); - struct fiber *relay_f = va_arg(ap, struct fiber *); + struct fiber *relay_fiber = va_arg(ap, struct fiber *); struct ibuf ibuf; struct ev_io io; @@ -557,7 +557,7 @@ relay_reader_f(va_list ap) } } catch (Exception *e) { relay_set_error(relay, e); - fiber_cancel(relay_f); + fiber_cancel(relay_fiber); } ibuf_destroy(&ibuf); return 0; @@ -688,9 +688,10 @@ relay_subscribe_f(va_list ap) /* Start fiber for receiving replica acks. */ char name[FIBER_NAME_MAX]; snprintf(name, sizeof(name), "%s:%s", fiber()->name, "reader"); - struct fiber *reader = fiber_new_xc(name, relay_reader_f); - fiber_set_joinable(reader, true); - fiber_start(reader, relay, fiber()); + struct fiber *reader_fiber = fiber_new_xc(name, relay_reader_f); + struct fiber *relay_fiber = fiber(); + fiber_set_joinable(reader_fiber, true); + fiber_start(reader_fiber, relay, relay_fiber); /* * If the replica happens to be up to date on subscribe, @@ -771,8 +772,8 @@ relay_subscribe_f(va_list ap) wal_clear_watcher(&relay->wal_watcher, cbus_process); /* Join ack reader fiber. */ - fiber_cancel(reader); - fiber_join(reader); + fiber_cancel(reader_fiber); + fiber_join(reader_fiber); /* Destroy cpipe to tx. */ cbus_unpair(&relay->tx_pipe, &relay->relay_pipe, -- 2.26.2