From: Cyrill Gorcunov <gorcunov@gmail.com> To: tml <tarantool-patches@dev.tarantool.org> Subject: [Tarantool-patches] [PATCH v11 5/8] box/replication: merge replica_by_id into replicaset Date: Sat, 4 Apr 2020 19:15:21 +0300 [thread overview] Message-ID: <20200404161524.7466-6-gorcunov@gmail.com> (raw) In-Reply-To: <20200404161524.7466-1-gorcunov@gmail.com> For some reason the replica_by_id member (which is an array of pointers) is allocated dynamically. Moreover VCLOCK_MAX = 32 by now and extending it to some new limit will require a way more efforts than just increase the number. Thus reserve memory for replica_by_id inside replicaset statically. This allows to simplify code a bit and drop calloc/free calls. The former code comes from edd76a2a0ae17e3d without any explanation why the dynamic member is needed. Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com> --- src/box/replication.cc | 2 -- src/box/replication.h | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/box/replication.cc b/src/box/replication.cc index 1345f189b..7c10fb6f2 100644 --- a/src/box/replication.cc +++ b/src/box/replication.cc @@ -89,7 +89,6 @@ replication_init(void) rlist_create(&replicaset.anon); vclock_create(&replicaset.vclock); fiber_cond_create(&replicaset.applier.cond); - replicaset.replica_by_id = (struct replica **)calloc(VCLOCK_MAX, sizeof(struct replica *)); latch_create(&replicaset.applier.order_latch); vclock_create(&replicaset.applier.vclock); @@ -112,7 +111,6 @@ replication_free(void) relay_cancel(replica->relay); diag_destroy(&replicaset.applier.diag); - free(replicaset.replica_by_id); } int diff --git a/src/box/replication.h b/src/box/replication.h index 2ef1255b3..9df91e611 100644 --- a/src/box/replication.h +++ b/src/box/replication.h @@ -251,7 +251,7 @@ struct replicaset { struct diag diag; } applier; /** Map of all known replica_id's to correspponding replica's. */ - struct replica **replica_by_id; + struct replica *replica_by_id[VCLOCK_MAX]; }; extern struct replicaset replicaset; -- 2.20.1
next prev parent reply other threads:[~2020-04-04 16:16 UTC|newest] Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-04-04 16:15 [Tarantool-patches] [PATCH v11 0/8] box/replication: prevent nil dereference on applier rollback Cyrill Gorcunov 2020-04-04 16:15 ` [Tarantool-patches] [PATCH v11 1/8] box: fix bootstrap comment Cyrill Gorcunov 2020-04-05 7:31 ` Konstantin Osipov 2020-04-05 7:56 ` Cyrill Gorcunov 2020-04-05 8:35 ` Konstantin Osipov 2020-04-04 16:15 ` [Tarantool-patches] [PATCH v11 2/8] box/alter: shrink txn_alter_trigger_new code Cyrill Gorcunov 2020-04-06 7:39 ` Konstantin Osipov 2020-04-04 16:15 ` [Tarantool-patches] [PATCH v11 3/8] box/request: add missing OutOfMemory diag_set Cyrill Gorcunov 2020-04-04 16:15 ` [Tarantool-patches] [PATCH v11 4/8] box/applier: add missing diag_set on region_alloc failure Cyrill Gorcunov 2020-04-04 16:15 ` Cyrill Gorcunov [this message] 2020-04-06 7:40 ` [Tarantool-patches] [PATCH v11 5/8] box/replication: merge replica_by_id into replicaset Konstantin Osipov 2020-04-04 16:15 ` [Tarantool-patches] [PATCH v11 6/8] applier: reduce applier_txn_rollback_cb code density Cyrill Gorcunov 2020-04-06 7:40 ` Konstantin Osipov 2020-04-04 16:15 ` [Tarantool-patches] [PATCH v11 7/8] box/applier: prevent nil dereference on applier rollback Cyrill Gorcunov 2020-04-07 10:36 ` Serge Petrenko 2020-04-04 16:15 ` [Tarantool-patches] [PATCH v11 8/8] test: add replication/applier-rollback Cyrill Gorcunov 2020-04-07 10:26 ` Serge Petrenko 2020-04-07 10:55 ` Cyrill Gorcunov 2020-04-07 10:46 ` [Tarantool-patches] [PATCH v11 0/8] box/replication: prevent nil dereference on applier rollback Serge Petrenko 2020-04-07 11:00 ` Cyrill Gorcunov
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=20200404161524.7466-6-gorcunov@gmail.com \ --to=gorcunov@gmail.com \ --cc=tarantool-patches@dev.tarantool.org \ --subject='Re: [Tarantool-patches] [PATCH v11 5/8] box/replication: merge replica_by_id into replicaset' \ /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