From: Vladimir Davydov <vdavydov.dev@gmail.com>
To: kostja@tarantool.org
Cc: tarantool-patches@freelists.org
Subject: [RFC PATCH 21/23] vinyl: zap vy_scheduler::is_worker_pool_running
Date: Sun, 8 Jul 2018 19:48:52 +0300 [thread overview]
Message-ID: <76a1afa2b12b9fe84323dfe5243322fa5b6cc1dc.1531065648.git.vdavydov.dev@gmail.com> (raw)
In-Reply-To: <cover.1531065648.git.vdavydov.dev@gmail.com>
In-Reply-To: <cover.1531065648.git.vdavydov.dev@gmail.com>
This flag is set iff worker_pool != NULL hence it is pointless.
---
src/box/vy_scheduler.c | 9 +++------
src/box/vy_scheduler.h | 2 --
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/src/box/vy_scheduler.c b/src/box/vy_scheduler.c
index bd3ad4be..ac6b1f47 100644
--- a/src/box/vy_scheduler.c
+++ b/src/box/vy_scheduler.c
@@ -274,11 +274,10 @@ vy_compact_heap_less(struct heap_node *a, struct heap_node *b)
static void
vy_scheduler_start_workers(struct vy_scheduler *scheduler)
{
- assert(!scheduler->is_worker_pool_running);
+ assert(scheduler->worker_pool == NULL);
/* One thread is reserved for dumps, see vy_schedule(). */
assert(scheduler->worker_pool_size >= 2);
- scheduler->is_worker_pool_running = true;
scheduler->idle_worker_count = scheduler->worker_pool_size;
scheduler->worker_pool = calloc(scheduler->worker_pool_size,
sizeof(*scheduler->worker_pool));
@@ -300,9 +299,7 @@ vy_scheduler_start_workers(struct vy_scheduler *scheduler)
static void
vy_scheduler_stop_workers(struct vy_scheduler *scheduler)
{
- assert(scheduler->is_worker_pool_running);
- scheduler->is_worker_pool_running = false;
-
+ assert(scheduler->worker_pool != NULL);
for (int i = 0; i < scheduler->worker_pool_size; i++) {
struct vy_worker *worker = &scheduler->worker_pool[i];
cbus_stop_loop(&worker->worker_pipe);
@@ -355,7 +352,7 @@ vy_scheduler_destroy(struct vy_scheduler *scheduler)
fiber_cond_signal(&scheduler->dump_cond);
fiber_cond_signal(&scheduler->scheduler_cond);
- if (scheduler->is_worker_pool_running)
+ if (scheduler->worker_pool != NULL)
vy_scheduler_stop_workers(scheduler);
diag_destroy(&scheduler->diag);
diff --git a/src/box/vy_scheduler.h b/src/box/vy_scheduler.h
index a235aa6f..deefacd7 100644
--- a/src/box/vy_scheduler.h
+++ b/src/box/vy_scheduler.h
@@ -67,8 +67,6 @@ struct vy_scheduler {
* dump/compaction tasks.
*/
struct vy_worker *worker_pool;
- /** Set if the worker threads are running. */
- bool is_worker_pool_running;
/** Total number of worker threads. */
int worker_pool_size;
/** Number worker threads that are currently idle. */
--
2.11.0
next prev parent reply other threads:[~2018-07-08 16:48 UTC|newest]
Thread overview: 65+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-08 16:48 [RFC PATCH 02/23] vinyl: always get full tuple from pk after reading from secondary index Vladimir Davydov
2018-07-08 16:48 ` [RFC PATCH 00/23] vinyl: eliminate read on REPLACE/DELETE Vladimir Davydov
2018-07-08 16:48 ` [RFC PATCH 01/23] vinyl: do not turn REPLACE into INSERT when processing DML request Vladimir Davydov
2018-07-10 12:15 ` Konstantin Osipov
2018-07-10 12:19 ` Vladimir Davydov
2018-07-10 18:39 ` Konstantin Osipov
2018-07-11 7:57 ` Vladimir Davydov
2018-07-11 10:25 ` Vladimir Davydov
2018-07-08 16:48 ` [RFC PATCH 03/23] vinyl: use vy_mem_iterator for point lookup Vladimir Davydov
2018-07-17 10:14 ` Vladimir Davydov
2018-07-08 16:48 ` [RFC PATCH 04/23] vinyl: make point lookup always return the latest tuple version Vladimir Davydov
2018-07-10 16:19 ` Konstantin Osipov
2018-07-10 16:43 ` Vladimir Davydov
2018-07-11 16:33 ` Vladimir Davydov
2018-07-31 19:17 ` Konstantin Osipov
2018-07-08 16:48 ` [RFC PATCH 05/23] vinyl: fold vy_replace_one and vy_replace_impl Vladimir Davydov
2018-07-31 20:28 ` Konstantin Osipov
2018-07-08 16:48 ` [RFC PATCH 06/23] vinyl: fold vy_delete_impl Vladimir Davydov
2018-07-31 20:28 ` Konstantin Osipov
2018-07-08 16:48 ` [RFC PATCH 07/23] vinyl: refactor unique check Vladimir Davydov
2018-07-31 20:28 ` Konstantin Osipov
2018-07-08 16:48 ` [RFC PATCH 08/23] vinyl: check key uniqueness before modifying tx write set Vladimir Davydov
2018-07-31 20:34 ` Konstantin Osipov
2018-08-01 10:42 ` Vladimir Davydov
2018-08-09 20:26 ` Konstantin Osipov
2018-08-10 8:26 ` Vladimir Davydov
2018-07-08 16:48 ` [RFC PATCH 09/23] vinyl: remove env argument of vy_check_is_unique_{primary,secondary} Vladimir Davydov
2018-07-08 16:48 ` [RFC PATCH 10/23] vinyl: store full tuples in secondary index cache Vladimir Davydov
2018-07-08 16:48 ` [RFC PATCH 11/23] xrow: allow to store flags in DML requests Vladimir Davydov
2018-07-31 20:36 ` Konstantin Osipov
2018-08-01 14:10 ` Vladimir Davydov
2018-08-17 13:34 ` Vladimir Davydov
2018-08-17 13:34 ` [PATCH 1/2] xrow: allow to store tuple metadata in request Vladimir Davydov
2018-08-17 13:34 ` [PATCH 2/2] vinyl: introduce statement flags Vladimir Davydov
2018-07-08 16:48 ` [RFC PATCH 12/23] vinyl: do not pass region explicitly to write iterator functions Vladimir Davydov
2018-07-17 10:16 ` Vladimir Davydov
2018-07-31 20:38 ` Konstantin Osipov
2018-08-01 14:14 ` Vladimir Davydov
2018-07-08 16:48 ` [RFC PATCH 13/23] vinyl: fix potential use-after-free in vy_read_view_merge Vladimir Davydov
2018-07-17 10:16 ` Vladimir Davydov
2018-07-08 16:48 ` [RFC PATCH 14/23] test: unit/vy_write_iterator: minor refactoring Vladimir Davydov
2018-07-17 10:17 ` Vladimir Davydov
2018-07-08 16:48 ` [RFC PATCH 15/23] vinyl: teach write iterator to return overwritten tuples Vladimir Davydov
2018-07-08 16:48 ` [RFC PATCH 16/23] vinyl: allow to skip certain statements on read Vladimir Davydov
2018-07-08 16:48 ` [RFC PATCH 17/23] vinyl: do not free pending tasks on shutdown Vladimir Davydov
2018-07-08 16:48 ` [RFC PATCH 18/23] vinyl: store pointer to scheduler in struct vy_task Vladimir Davydov
2018-07-31 20:39 ` Konstantin Osipov
2018-07-08 16:48 ` [RFC PATCH 19/23] vinyl: rename some members of vy_scheduler and vy_task struct Vladimir Davydov
2018-07-31 20:40 ` Konstantin Osipov
2018-07-08 16:48 ` [RFC PATCH 20/23] vinyl: use cbus for communication between scheduler and worker threads Vladimir Davydov
2018-07-31 20:43 ` Konstantin Osipov
2018-08-01 14:26 ` Vladimir Davydov
2018-07-08 16:48 ` Vladimir Davydov [this message]
2018-07-31 20:43 ` [RFC PATCH 21/23] vinyl: zap vy_scheduler::is_worker_pool_running Konstantin Osipov
2018-07-08 16:48 ` [RFC PATCH 22/23] vinyl: rename vy_task::status to is_failed Vladimir Davydov
2018-07-31 20:44 ` Konstantin Osipov
2018-07-08 16:48 ` [RFC PATCH 23/23] vinyl: eliminate read on REPLACE/DELETE Vladimir Davydov
2018-07-13 10:53 ` Vladimir Davydov
2018-07-13 10:53 ` [PATCH 1/3] stailq: add stailq_insert function Vladimir Davydov
2018-07-15 7:02 ` Konstantin Osipov
2018-07-15 13:17 ` Vladimir Davydov
2018-07-15 18:40 ` Konstantin Osipov
2018-07-17 10:18 ` Vladimir Davydov
2018-07-13 10:53 ` [PATCH 2/3] vinyl: link all indexes of the same space Vladimir Davydov
2018-07-13 10:53 ` [PATCH 3/3] vinyl: generate deferred DELETEs on tx commit Vladimir Davydov
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=76a1afa2b12b9fe84323dfe5243322fa5b6cc1dc.1531065648.git.vdavydov.dev@gmail.com \
--to=vdavydov.dev@gmail.com \
--cc=kostja@tarantool.org \
--cc=tarantool-patches@freelists.org \
--subject='Re: [RFC PATCH 21/23] vinyl: zap vy_scheduler::is_worker_pool_running' \
/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