From 8cd06e6acc28677c59270517a8e5075b792e05af Mon Sep 17 00:00:00 2001
From: Vladimir Davydov <vdavydov.dev@gmail.com>
Date: Wed, 28 Feb 2018 19:35:51 +0300
Subject: [PATCH] vinyl: don't start event loop for worker threads
This is pointless as worker threads don't use coio.
---
src/box/vy_scheduler.c | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/src/box/vy_scheduler.c b/src/box/vy_scheduler.c
index e4cf56019d..d833514cb9 100644
--- a/src/box/vy_scheduler.c
+++ b/src/box/vy_scheduler.c
@@ -41,7 +41,6 @@
#include <tarantool_ev.h>
#include "checkpoint.h"
-#include "coio_task.h"
#include "diag.h"
#include "errcode.h"
#include "errinj.h"
@@ -72,7 +71,7 @@ enum { VY_YIELD_LOOPS = 2 };
#define VY_SCHEDULER_TIMEOUT_MIN 1
#define VY_SCHEDULER_TIMEOUT_MAX 60
-static int vy_worker_f(va_list);
+static void *vy_worker_f(void *);
static int vy_scheduler_f(va_list);
struct vy_task;
@@ -267,7 +266,7 @@ vy_scheduler_start_workers(struct vy_scheduler *scheduler)
for (int i = 0; i < scheduler->worker_pool_size; i++) {
char name[FIBER_NAME_MAX];
snprintf(name, sizeof(name), "vinyl.writer.%d", i);
- if (cord_costart(&scheduler->worker_pool[i], name,
+ if (cord_start(&scheduler->worker_pool[i], name,
vy_worker_f, scheduler) != 0)
panic("failed to start vinyl worker thread");
}
@@ -1595,11 +1594,10 @@ vy_scheduler_f(va_list va)
return 0;
}
-static int
-vy_worker_f(va_list va)
+static void *
+vy_worker_f(void *arg)
{
- struct vy_scheduler *scheduler = va_arg(va, struct vy_scheduler *);
- coio_enable();
+ struct vy_scheduler *scheduler = arg;
struct vy_task *task = NULL;
tt_pthread_mutex_lock(&scheduler->mutex);
@@ -1631,5 +1629,5 @@ vy_worker_f(va_list va)
stailq_add_tail_entry(&scheduler->output_queue, task, link);
}
tt_pthread_mutex_unlock(&scheduler->mutex);
- return 0;
+ return NULL;
}
--
GitLab