From dfddc0d6efccb44578d842a5494563f9b4e6c986 Mon Sep 17 00:00:00 2001 From: Dave West Date: Tue, 18 Mar 2008 21:05:27 +0000 Subject: [PATCH] Added some more CtdlThreadCheckStop() calls to speed shutdown. --- citadel/modules/fulltext/serv_fulltext.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/citadel/modules/fulltext/serv_fulltext.c b/citadel/modules/fulltext/serv_fulltext.c index 522ebe7f5..4e8ea9b6b 100644 --- a/citadel/modules/fulltext/serv_fulltext.c +++ b/citadel/modules/fulltext/serv_fulltext.c @@ -207,6 +207,9 @@ void ft_index_msg(long msgnum, void *userdata) { */ void ft_index_room(struct ctdlroom *qrbuf, void *data) { + if (CtdlThreadCheckStop()) + return; + getroom(&CC->room, qrbuf->QRname); CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL, NULL, ft_index_msg, NULL); } @@ -318,8 +321,12 @@ void do_fulltext_indexing(void) { ft_newmsgs = NULL; } end_time = time(NULL); - lprintf(CTDL_DEBUG, "do_fulltext_indexing() duration (%ld)\n", end_time - run_time); + if (CtdlThreadCheckStop()) + return; + + lprintf(CTDL_DEBUG, "do_fulltext_indexing() duration (%ld)\n", end_time - run_time); + /* Save our place so we don't have to do this again */ ft_flush_cache(); begin_critical_section(S_CONTROL); -- 2.30.2