diff options
Diffstat (limited to 'xlators/features/changelog')
| -rw-r--r-- | xlators/features/changelog/src/changelog-ev-handle.c | 2 | ||||
| -rw-r--r-- | xlators/features/changelog/src/changelog.c | 16 |
2 files changed, 18 insertions, 0 deletions
diff --git a/xlators/features/changelog/src/changelog-ev-handle.c b/xlators/features/changelog/src/changelog-ev-handle.c index caa5bbbadcd..38e127b7eb5 100644 --- a/xlators/features/changelog/src/changelog-ev-handle.c +++ b/xlators/features/changelog/src/changelog-ev-handle.c @@ -342,6 +342,7 @@ changelog_ev_dispatch (void *data) while (1) { /* TODO: change this to be pthread cond based.. later */ + tv.tv_sec = 1; tv.tv_usec = 0; select (0, NULL, NULL, NULL, &tv); @@ -363,6 +364,7 @@ changelog_ev_dispatch (void *data) gf_msg (this->name, GF_LOG_WARNING, 0, CHANGELOG_MSG_PUT_BUFFER_FAILED, "failed to put buffer after consumption"); + } return NULL; diff --git a/xlators/features/changelog/src/changelog.c b/xlators/features/changelog/src/changelog.c index 697e8ca7b11..20af188d0d4 100644 --- a/xlators/features/changelog/src/changelog.c +++ b/xlators/features/changelog/src/changelog.c @@ -21,6 +21,7 @@ #include "changelog-messages.h" #include <pthread.h> +#include <signal.h> #include "changelog-rpc.h" #include "errno.h" @@ -2098,6 +2099,7 @@ notify (xlator_t *this, int event, void *data, ...) int ret = 0; int ret1 = 0; struct list_head queue = {0, }; + int i = 0; INIT_LIST_HEAD (&queue); @@ -2105,6 +2107,20 @@ notify (xlator_t *this, int event, void *data, ...) if (!priv) goto out; + if (event == GF_EVENT_CLEANUP) { + if (priv->connector) { + (void) gf_thread_cleanup_xint (priv->connector); + priv->connector = 0; + } + + for (; i < NR_DISPATCHERS; i++) { + if (priv->ev_dispatcher[i]) { + (void) gf_thread_cleanup_xint (priv->ev_dispatcher[i]); + priv->ev_dispatcher[i] = 0; + } + } + } + if (event == GF_EVENT_TRANSLATOR_OP) { dict = data; |