From: Cyrill Gorcunov <gorcunov@gmail.com> To: Serge Petrenko <sergepetrenko@tarantool.org> Cc: tarantool-patches@dev.tarantool.org Subject: Re: [Tarantool-patches] [PATCH 1/2] trigger: add trigger_is_set() method Date: Sat, 11 Apr 2020 19:33:58 +0300 [thread overview] Message-ID: <20200411163358.GU3072@uranus> (raw) In-Reply-To: <b6b0188089089533458d2f4bfd6d13487c466c36.1586606685.git.sergepetrenko@tarantool.org> On Sat, Apr 11, 2020 at 03:33:44PM +0300, Serge Petrenko wrote: > --- > src/lib/core/trigger.h | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/src/lib/core/trigger.h b/src/lib/core/trigger.h > index 7b500dd92..ae477ad70 100644 > --- a/src/lib/core/trigger.h > +++ b/src/lib/core/trigger.h > @@ -95,6 +95,12 @@ trigger_add_unique(struct rlist *list, struct trigger *trigger) > trigger_add(list, trigger); > } > > +static inline int > +trigger_is_set(struct trigger *trigger) > +{ > + return !rlist_empty(&trigger->link); > +} > + Wait. Serge, you know I don;t like it. Can't we rather provide normal static initializer say like --- diff --git a/src/lib/core/trigger.h b/src/lib/core/trigger.h index 7b500dd92..e9c6dd17e 100644 --- a/src/lib/core/trigger.h +++ b/src/lib/core/trigger.h @@ -59,6 +59,14 @@ struct trigger trigger_f0 destroy; }; +#define DECLARE_TRIGGER(__name, __run, __data, __destroy) \ + struct trigger __name = { \ + .link = RLIST_HEAD_INITIALIZER(__name.link), \ + .run = __run, \ + .data = __data, \ + .destroy= __destroy, \ + } + and simply declare the trigger diff --git a/src/box/relay.cc b/src/box/relay.cc index c634348a4..cdc20dc5b 100644 --- a/src/box/relay.cc +++ b/src/box/relay.cc @@ -580,9 +580,7 @@ relay_subscribe_f(va_list ap) * Not needed for anonymous replicas, since they * aren't registered with gc at all. */ - struct trigger on_close_log = { - RLIST_LINK_INITIALIZER, relay_on_close_log_f, relay, NULL - }; + DECLARE_TRIGGER(on_close_log, relay_on_close_log_f, relay, NULL); if (!relay->replica->anon) trigger_add(&r->on_close_log, &on_close_log); so that trigger_clear won't fail without if statement?
next prev parent reply other threads:[~2020-04-11 16:34 UTC|newest] Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-11 12:33 [Tarantool-patches] [PATCH 0/2] fix replication/anon test segfaut Serge Petrenko 2020-04-11 12:33 ` [Tarantool-patches] [PATCH 1/2] trigger: add trigger_is_set() method Serge Petrenko 2020-04-11 16:33 ` Cyrill Gorcunov [this message] 2020-04-13 9:53 ` Serge Petrenko 2020-04-13 10:00 ` Cyrill Gorcunov 2020-04-11 12:33 ` [Tarantool-patches] [PATCH 2/2] relay: fix segfault on replica transition from anonymous Serge Petrenko
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200411163358.GU3072@uranus \ --to=gorcunov@gmail.com \ --cc=sergepetrenko@tarantool.org \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH 1/2] trigger: add trigger_is_set() method' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox