From: Leonid Vasiliev <lvasiliev@tarantool.org>
To: alexander.turenko@tarantool.org
Cc: tarantool-patches@dev.tarantool.org
Subject: [Tarantool-patches] [PATCH] Add a cancellation guard to cpipe flush callback
Date: Tue, 3 Dec 2019 19:33:19 +0300 [thread overview]
Message-ID: <73ebdf94c8f03fca216de9141c6541870b1ed938.1575390549.git.lvasiliev@tarantool.org> (raw)
https://github.com/tarantool/tarantool/issues/4127
https://github.com/tarantool/tarantool/tree/lvasiliev/gh-4127-WAL-thread-stucks
We need to set a thread cancellation guard, because
another thread may cancel the current thread
(write() is a cancellation point in ev_async_send)
and the activation of the ev_async watcher
through ev_async_send will fail.
---
src/lib/core/cbus.c | 13 +++++++++++++
src/tt_pthread.h | 5 +++++
2 files changed, 18 insertions(+)
diff --git a/src/lib/core/cbus.c b/src/lib/core/cbus.c
index b3b1280e7..7e9ef91e3 100644
--- a/src/lib/core/cbus.c
+++ b/src/lib/core/cbus.c
@@ -284,6 +284,17 @@ cpipe_flush_cb(ev_loop *loop, struct ev_async *watcher, int events)
/* Trigger task processing when the queue becomes non-empty. */
bool output_was_empty;
+ /*
+ * We need to set a thread cancellation guard, because
+ * another thread may cancel the current thread
+ * (write() is a cancellation point in ev_async_send)
+ * and the activation of the ev_async watcher
+ * through ev_async_send will fail.
+ */
+
+ int old_cancel_state;
+ tt_pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &old_cancel_state);
+
tt_pthread_mutex_lock(&endpoint->mutex);
output_was_empty = stailq_empty(&endpoint->output);
/** Flush input */
@@ -297,6 +308,8 @@ cpipe_flush_cb(ev_loop *loop, struct ev_async *watcher, int events)
ev_async_send(endpoint->consumer, &endpoint->async);
}
+
+ tt_pthread_setcancelstate(old_cancel_state, NULL);
}
void
diff --git a/src/tt_pthread.h b/src/tt_pthread.h
index 40b43b112..6bb19eb23 100644
--- a/src/tt_pthread.h
+++ b/src/tt_pthread.h
@@ -300,6 +300,11 @@
#define tt_pthread_getspecific(key) pthread_getspecific(key)
+#define tt_pthread_setcancelstate(state, oldstate) \
+({ int e__ = pthread_setcancelstate(state, oldstate);\
+ tt_pthread_error(e__); \
+})
+
/** Set the current thread's name
*/
static inline void
--
2.17.1
next reply other threads:[~2019-12-03 16:33 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-03 16:33 Leonid Vasiliev [this message]
2019-12-03 18:02 ` Konstantin Osipov
2019-12-05 7:22 ` Leonid Vasiliev
2019-12-05 7:27 ` Konstantin Osipov
2019-12-23 12:44 ` Leonid Vasiliev
2019-12-23 12:55 ` Konstantin Osipov
2019-12-24 15:27 ` Leonid Vasiliev
2019-12-24 15:33 ` Konstantin Osipov
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=73ebdf94c8f03fca216de9141c6541870b1ed938.1575390549.git.lvasiliev@tarantool.org \
--to=lvasiliev@tarantool.org \
--cc=alexander.turenko@tarantool.org \
--cc=tarantool-patches@dev.tarantool.org \
--subject='Re: [Tarantool-patches] [PATCH] Add a cancellation guard to cpipe flush callback' \
/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