From: Georgy Kirichenko <georgy@tarantool.org> To: tarantool-patches@freelists.org Cc: Georgy Kirichenko <georgy@tarantool.org> Subject: [tarantool-patches] [PATCH v3 12/14] txn: handle fiber stop event at transaction level Date: Sun, 9 Jun 2019 23:44:41 +0300 [thread overview] Message-ID: <b33456bbc95dd1b663781d2a3ef954fa947be337.1560112747.git.georgy@tarantool.org> (raw) In-Reply-To: <cover.1560112747.git.georgy@tarantool.org> Get rid of duplicated fiber on stop logic. Prerequisites: #1254 --- src/box/memtx_engine.c | 5 ----- src/box/txn.c | 5 ++++- src/box/vinyl.c | 4 ---- 3 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/box/memtx_engine.c b/src/box/memtx_engine.c index 918885318..f371d147f 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. @@ -386,7 +383,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(); @@ -465,7 +461,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 815d635fe..5ceae0da1 100644 --- a/src/box/txn.c +++ b/src/box/txn.c @@ -202,6 +202,8 @@ txn_begin() txn->entry = 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; } @@ -462,7 +464,7 @@ txn_write(struct txn *txn) { if (txn_prepare(txn) != 0) goto fail; - + trigger_clear(&txn->fiber_on_stop); txn->start_tm = ev_monotonic_now(loop()); if (txn->n_new_rows + txn->n_applier_rows == 0) { /* Nothing to do. */ @@ -528,6 +530,7 @@ txn_rollback_stmt(struct txn *txn) void txn_rollback(struct txn *txn) { + trigger_clear(&txn->fiber_on_stop); txn->signature = -1; txn_complete(txn); txn_free(txn); diff --git a/src/box/vinyl.c b/src/box/vinyl.c index c61f9477e..96c1ab1c8 100644 --- a/src/box/vinyl.c +++ b/src/box/vinyl.c @@ -2414,8 +2414,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; - trigger_create(&txn->fiber_on_stop, txn_on_stop, NULL, NULL); - trigger_add(&fiber()->on_stop, &txn->fiber_on_stop); return 0; } @@ -2485,7 +2483,6 @@ vinyl_engine_commit(struct engine *engine, struct txn *txn) vy_regulator_check_dump_watermark(&env->regulator); txn->engine_tx = NULL; - trigger_clear(&txn->fiber_on_stop); } static void @@ -2499,7 +2496,6 @@ vinyl_engine_rollback(struct engine *engine, struct txn *txn) vy_tx_rollback(tx); txn->engine_tx = NULL; - trigger_clear(&txn->fiber_on_stop); } static int -- 2.21.0
next prev parent reply other threads:[~2019-06-09 20:44 UTC|newest] Thread overview: 42+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-06-09 20:44 [tarantool-patches] [PATCH v3 00/14] Parallel applier Georgy Kirichenko 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 01/14] txn: Fire a trigger after a transaction finalization Georgy Kirichenko 2019-06-09 21:59 ` [tarantool-patches] " Konstantin Osipov 2019-06-11 11:42 ` [tarantool-patches] " Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 02/14] ddl: synchronize privileges cache with actual data state Georgy Kirichenko 2019-06-11 13:13 ` Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 03/14] txn: transaction memory allocation Georgy Kirichenko 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 04/14] ddl: place alter structures onto a txn memory region Georgy Kirichenko 2019-06-11 14:14 ` Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 05/14] txn: get rid of autocommit from a txn structure Georgy Kirichenko 2019-06-13 14:11 ` Vladimir Davydov 2019-06-16 16:20 ` [tarantool-patches] " Konstantin Osipov 2019-06-16 16:14 ` Konstantin Osipov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 06/14] txn: get rid of fiber_gc from txn_rollback Georgy Kirichenko 2019-06-13 14:12 ` Vladimir Davydov 2019-06-13 19:28 ` Георгий Кириченко 2019-06-14 9:21 ` Vladimir Davydov 2019-06-16 16:38 ` [tarantool-patches] " Konstantin Osipov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 07/14] wal: remove fiber from a journal_entry structure Georgy Kirichenko 2019-06-13 14:17 ` Vladimir Davydov 2019-06-13 19:33 ` Георгий Кириченко 2019-06-14 8:05 ` Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 08/14] wal: enable asyncronous wal writes Georgy Kirichenko 2019-06-13 14:21 ` Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 09/14] wal: a dedicated wal scheduling fiber Georgy Kirichenko 2019-06-13 14:24 ` Vladimir Davydov 2019-06-13 19:36 ` Георгий Кириченко 2019-06-14 9:20 ` Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 10/14] core: latch_unlock_external routine Georgy Kirichenko 2019-06-13 14:27 ` Vladimir Davydov 2019-06-13 19:38 ` Георгий Кириченко 2019-06-14 8:10 ` Vladimir Davydov 2019-06-14 9:18 ` Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 11/14] txn: introduce asynchronous txn commit Georgy Kirichenko 2019-06-13 14:34 ` Vladimir Davydov 2019-06-13 19:45 ` Георгий Кириченко 2019-06-14 7:58 ` Vladimir Davydov 2019-06-09 20:44 ` Georgy Kirichenko [this message] 2019-06-13 14:36 ` [tarantool-patches] [PATCH v3 12/14] txn: handle fiber stop event at transaction level Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 13/14] applier: apply transaction in parallel Georgy Kirichenko 2019-06-13 15:17 ` Vladimir Davydov 2019-06-09 20:44 ` [tarantool-patches] [PATCH v3 14/14] 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=b33456bbc95dd1b663781d2a3ef954fa947be337.1560112747.git.georgy@tarantool.org \ --to=georgy@tarantool.org \ --cc=tarantool-patches@freelists.org \ --subject='Re: [tarantool-patches] [PATCH v3 12/14] 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