From: Georgy Kirichenko <georgy@tarantool.org> To: tarantool-patches@freelists.org Cc: Georgy Kirichenko <georgy@tarantool.org> Subject: [tarantool-patches] [PATCH v4 1/9] txn: handle fiber stop event at transaction level Date: Thu, 20 Jun 2019 00:23:08 +0300 [thread overview] Message-ID: <e66d17a432fdcf4259ed8e3d75a530997fb81ef2.1560978655.git.georgy@tarantool.org> (raw) In-Reply-To: <cover.1560978655.git.georgy@tarantool.org> Get rid of duplicated fiber on stop logic. Prerequisites: #1254 --- src/box/memtx_engine.c | 5 ----- src/box/txn.c | 4 ++++ src/box/vinyl.c | 8 -------- 3 files changed, 4 insertions(+), 13 deletions(-) diff --git a/src/box/memtx_engine.c b/src/box/memtx_engine.c index f4312484a..cd763e547 100644 --- a/src/box/memtx_engine.c +++ b/src/box/memtx_engine.c @@ -94,15 +94,12 @@ memtx_init_txn(struct txn *txn) trigger_create(&txn->fiber_on_yield, txn_on_yield, NULL, NULL); - trigger_create(&txn->fiber_on_stop, txn_on_stop, - NULL, NULL); /* * Memtx doesn't allow yields between statements of * a transaction. Set a trigger which would roll * back the transaction if there is a yield. */ trigger_add(&fiber->on_yield, &txn->fiber_on_yield); - trigger_add(&fiber->on_stop, &txn->fiber_on_stop); /* * This serves as a marker that the triggers are * initialized. @@ -379,7 +376,6 @@ memtx_engine_prepare(struct engine *engine, struct txn *txn) * on calls to trigger_create/trigger_clear. */ trigger_clear(&txn->fiber_on_yield); - trigger_clear(&txn->fiber_on_stop); if (txn->is_aborted) { diag_set(ClientError, ER_TRANSACTION_YIELD); diag_log(); @@ -458,7 +454,6 @@ memtx_engine_rollback(struct engine *engine, struct txn *txn) { if (txn->engine_tx != NULL) { trigger_clear(&txn->fiber_on_yield); - trigger_clear(&txn->fiber_on_stop); } struct txn_stmt *stmt; stailq_reverse(&txn->stmts); diff --git a/src/box/txn.c b/src/box/txn.c index d4627b554..7a2c8cdaf 100644 --- a/src/box/txn.c +++ b/src/box/txn.c @@ -198,6 +198,8 @@ txn_begin(bool is_autocommit) txn->psql_txn = NULL; /* fiber_on_yield/fiber_on_stop initialized by engine on demand */ fiber_set_txn(fiber(), txn); + trigger_create(&txn->fiber_on_stop, txn_on_stop, NULL, NULL); + trigger_add(&fiber()->on_stop, &txn->fiber_on_stop); return txn; } @@ -421,6 +423,7 @@ txn_commit(struct txn *txn) if (engine_prepare(txn->engine, txn) != 0) goto fail; } + trigger_clear(&txn->fiber_on_stop); if (txn->n_new_rows + txn->n_applier_rows > 0) { txn->signature = txn_write_to_wal(txn); @@ -475,6 +478,7 @@ txn_rollback() struct txn *txn = in_txn(); if (txn == NULL) return; + trigger_clear(&txn->fiber_on_stop); if (txn->engine) engine_rollback(txn->engine, txn); /* Rollback triggers must not throw. */ diff --git a/src/box/vinyl.c b/src/box/vinyl.c index ecf197523..814325da5 100644 --- a/src/box/vinyl.c +++ b/src/box/vinyl.c @@ -2420,10 +2420,6 @@ vinyl_engine_begin(struct engine *engine, struct txn *txn) txn->engine_tx = vy_tx_begin(env->xm); if (txn->engine_tx == NULL) return -1; - if (!txn->is_autocommit) { - trigger_create(&txn->fiber_on_stop, txn_on_stop, NULL, NULL); - trigger_add(&fiber()->on_stop, &txn->fiber_on_stop); - } return 0; } @@ -2493,8 +2489,6 @@ vinyl_engine_commit(struct engine *engine, struct txn *txn) vy_regulator_check_dump_watermark(&env->regulator); txn->engine_tx = NULL; - if (!txn->is_autocommit) - trigger_clear(&txn->fiber_on_stop); } static void @@ -2508,8 +2502,6 @@ vinyl_engine_rollback(struct engine *engine, struct txn *txn) vy_tx_rollback(tx); txn->engine_tx = NULL; - if (!txn->is_autocommit) - trigger_clear(&txn->fiber_on_stop); } static int -- 2.22.0
next prev parent reply other threads:[~2019-06-19 21:23 UTC|newest] Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-06-19 21:23 [tarantool-patches] [PATCH v4 0/9] Parallel applier Georgy Kirichenko 2019-06-19 21:23 ` Georgy Kirichenko [this message] 2019-06-20 7:28 ` [tarantool-patches] Re: [PATCH v4 1/9] txn: handle fiber stop event at transaction level Konstantin Osipov 2019-06-20 11:39 ` [tarantool-patches] " Vladimir Davydov 2019-06-19 21:23 ` [tarantool-patches] [PATCH v4 2/9] core: latch_steal routine Georgy Kirichenko 2019-06-20 7:28 ` [tarantool-patches] " Konstantin Osipov 2019-06-20 11:53 ` [tarantool-patches] " Vladimir Davydov 2019-06-20 20:34 ` Георгий Кириченко 2019-06-19 21:23 ` [tarantool-patches] [PATCH v4 3/9] txn: get rid of autocommit from a txn structure Georgy Kirichenko 2019-06-20 7:32 ` [tarantool-patches] " Konstantin Osipov 2019-06-20 11:52 ` [tarantool-patches] " Vladimir Davydov 2019-06-20 20:16 ` Георгий Кириченко 2019-06-19 21:23 ` [tarantool-patches] [PATCH v4 4/9] txn: get rid of fiber_gc from txn_rollback Georgy Kirichenko 2019-06-20 7:43 ` [tarantool-patches] " Konstantin Osipov 2019-06-20 20:35 ` Георгий Кириченко 2019-06-20 13:03 ` [tarantool-patches] " Vladimir Davydov 2019-06-20 20:16 ` Георгий Кириченко 2019-06-19 21:23 ` [tarantool-patches] [PATCH v4 5/9] wal: a dedicated wal scheduling fiber Georgy Kirichenko 2019-06-20 7:53 ` [tarantool-patches] " Konstantin Osipov 2019-06-20 13:05 ` [tarantool-patches] " Vladimir Davydov 2019-06-19 21:23 ` [tarantool-patches] [PATCH v4 6/9] wal: introduce a journal entry finalization callback Georgy Kirichenko 2019-06-20 7:56 ` [tarantool-patches] " Konstantin Osipov 2019-06-20 14:08 ` [tarantool-patches] " Vladimir Davydov 2019-06-20 20:22 ` Георгий Кириченко 2019-06-21 7:26 ` [tarantool-patches] " Konstantin Osipov 2019-06-19 21:23 ` [tarantool-patches] [PATCH v4 7/9] txn: introduce asynchronous txn commit Georgy Kirichenko 2019-06-20 8:01 ` [tarantool-patches] " Konstantin Osipov 2019-06-20 15:00 ` [tarantool-patches] " Vladimir Davydov 2019-06-21 7:28 ` [tarantool-patches] " Konstantin Osipov 2019-06-19 21:23 ` [tarantool-patches] [PATCH v4 8/9] applier: apply transaction in parallel Georgy Kirichenko 2019-06-20 7:41 ` [tarantool-patches] " Георгий Кириченко 2019-06-20 8:07 ` Konstantin Osipov 2019-06-20 16:37 ` Vladimir Davydov 2019-06-20 20:33 ` Георгий Кириченко 2019-06-21 8:36 ` Vladimir Davydov 2019-06-20 8:06 ` Konstantin Osipov 2019-06-19 21:23 ` [tarantool-patches] [PATCH v4 9/9] test: fix flaky test Georgy Kirichenko
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=e66d17a432fdcf4259ed8e3d75a530997fb81ef2.1560978655.git.georgy@tarantool.org \ --to=georgy@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [tarantool-patches] [PATCH v4 1/9] txn: handle fiber stop event at transaction level' \ /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