X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Ffulltext%2Fserv_fulltext.c;h=4589859d4fd9ca20eb740028bb044e3364427369;hb=cf09c5cb779279f9ad24545e68414edc0340d6fa;hp=f7861ad03ab16caa14651adf28b72de8000c543d;hpb=f1ee61891901850ebbdee1e9440b363dc6df540a;p=citadel.git diff --git a/citadel/modules/fulltext/serv_fulltext.c b/citadel/modules/fulltext/serv_fulltext.c index f7861ad03..4589859d4 100644 --- a/citadel/modules/fulltext/serv_fulltext.c +++ b/citadel/modules/fulltext/serv_fulltext.c @@ -1,23 +1,22 @@ /* * This module handles fulltext indexing of the message base. - * Copyright (c) 2005-2009 by the citadel.org team + * Copyright (c) 2005-2011 by the citadel.org team * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. + * This program is open source software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as published + * by the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ - #include "sysdep.h" #include #include @@ -58,14 +57,11 @@ #include "ctdl_module.h" - - long ft_newhighest = 0L; long *ft_newmsgs = NULL; int ft_num_msgs = 0; int ft_num_alloc = 0; - int ftc_num_msgs[65536]; long *ftc_msgs[65536]; @@ -94,7 +90,7 @@ void ft_flush_cache(void) { for (i=0; i<65536; ++i) { if ((time(NULL) - last_update) >= 10) { syslog(LOG_INFO, - "Flushing index cache to disk (%d%% complete)\n", + "Flushing index cache to disk (%d%% complete)", (i * 100 / 65536) ); last_update = time(NULL); @@ -107,7 +103,7 @@ void ft_flush_cache(void) { ftc_msgs[i] = NULL; } } - syslog(LOG_INFO, "Flushed index cache to disk (100%% complete)\n"); + syslog(LOG_INFO, "Flushed index cache to disk (100%% complete)"); } @@ -124,36 +120,36 @@ void ft_index_message(long msgnum, int op) { int tok; struct CtdlMessage *msg = NULL; - msg = CtdlFetchMessage(msgnum, 1); + msg = CtdlFetchMessage(msgnum, 1, 1); if (msg == NULL) { - syslog(LOG_ERR, "ft_index_message() could not load msg %ld\n", msgnum); + syslog(LOG_ERR, "ft_index_message() could not load msg %ld", msgnum); return; } - if (msg->cm_fields['1'] != NULL) { - syslog(LOG_DEBUG, "ft_index_message() excluded msg %ld\n", msgnum); - CtdlFreeMessage(msg); + if (!CM_IsEmpty(msg, eSuppressIdx)) { + syslog(LOG_DEBUG, "ft_index_message() excluded msg %ld", msgnum); + CM_Free(msg); return; } - syslog(LOG_DEBUG, "ft_index_message() %s msg %ld\n", - (op ? "adding" : "removing") , msgnum - ); + syslog(LOG_DEBUG, "ft_index_message() %s msg %ld", (op ? "adding" : "removing") , msgnum); /* Output the message as text before indexing it, so we don't end up * indexing a bunch of encoded base64, etc. */ CC->redirect_buffer = NewStrBufPlain(NULL, SIZ); CtdlOutputPreLoadedMsg(msg, MT_CITADEL, HEADERS_ALL, 0, 1, 0); - CtdlFreeMessage(msg); + CM_Free(msg); msgtext = CC->redirect_buffer; CC->redirect_buffer = NULL; - syslog(LOG_DEBUG, "Wordbreaking message %ld...\n", msgnum); + if (msgtext != NULL) { + syslog(LOG_DEBUG, "Wordbreaking message %ld (%d bytes)", msgnum, StrLength(msgtext)); + } txt = SmashStrBuf(&msgtext); wordbreaker(txt, &num_tokens, &tokens); free(txt); - syslog(LOG_DEBUG, "Indexing message %ld [%d tokens]\n", msgnum, num_tokens); + syslog(LOG_DEBUG, "Indexing message %ld [%d tokens]", msgnum, num_tokens); if (num_tokens > 0) { for (i=0; iroom, qrbuf->QRname); @@ -248,6 +244,9 @@ void do_fulltext_indexing(void) { static time_t last_progress = 0L; time_t run_time = 0L; time_t end_time = 0L; + static int is_running = 0; + if (is_running) return; /* Concurrency check - only one can run */ + is_running = 1; /* * Don't do this if the site doesn't have it enabled. @@ -260,13 +259,10 @@ void do_fulltext_indexing(void) { * Make sure we don't run the indexer too frequently. * FIXME move the setting into config */ -/* - * The thread sleeps for 300 seconds so we don't need this here any more if ( (time(NULL) - last_index) < 300L) { return; } -*/ /* * Check to see whether the fulltext index is up to date; if there @@ -277,7 +273,7 @@ void do_fulltext_indexing(void) { } run_time = time(NULL); - syslog(LOG_DEBUG, "do_fulltext_indexing() started (%ld)\n", run_time); + syslog(LOG_DEBUG, "do_fulltext_indexing() started (%ld)", run_time); /* * If we've switched wordbreaker modules, burn the index and start @@ -285,9 +281,10 @@ void do_fulltext_indexing(void) { */ begin_critical_section(S_CONTROL); if (CitControl.fulltext_wordbreaker != FT_WORDBREAKER_ID) { - syslog(LOG_DEBUG, "wb ver on disk = %d, code ver = %d\n", - CitControl.fulltext_wordbreaker, FT_WORDBREAKER_ID); - syslog(LOG_INFO, "(re)initializing full text index\n"); + syslog(LOG_DEBUG, "wb ver on disk = %d, code ver = %d", + CitControl.fulltext_wordbreaker, FT_WORDBREAKER_ID + ); + syslog(LOG_INFO, "(re)initializing full text index"); cdb_trunc(CDB_FULLTEXT); CitControl.MMfulltext = 0L; put_control(); @@ -315,7 +312,7 @@ void do_fulltext_indexing(void) { for (i=0; i= FT_MAX_CACHE) { - syslog(LOG_DEBUG, "Time to flush.\n"); + syslog(LOG_DEBUG, "Time to flush."); ft_newhighest = ft_newmsgs[i]; break; } @@ -346,10 +343,12 @@ void do_fulltext_indexing(void) { } end_time = time(NULL); - if (CtdlThreadCheckStop()) + if (server_shutting_down) { + is_running = 0; return; + } - syslog(LOG_DEBUG, "do_fulltext_indexing() duration (%ld)\n", end_time - run_time); + syslog(LOG_DEBUG, "do_fulltext_indexing() duration (%ld)", end_time - run_time); /* Save our place so we don't have to do this again */ ft_flush_cache(); @@ -360,31 +359,11 @@ void do_fulltext_indexing(void) { end_critical_section(S_CONTROL); last_index = time(NULL); - syslog(LOG_DEBUG, "do_fulltext_indexing() finished\n"); + syslog(LOG_DEBUG, "do_fulltext_indexing() finished"); + is_running = 0; return; } -/* - * Main loop for the indexer thread. - */ -void *indexer_thread(void *arg) { - struct CitContext indexerCC; - - - CtdlFillSystemContext(&indexerCC, "indexer"); - citthread_setspecific(MyConKey, (void *)&indexerCC ); - syslog(LOG_DEBUG, "indexer_thread() initializing\n"); - - while (!CtdlThreadCheckStop()) { - do_fulltext_indexing(); - CtdlThreadSleep(300); - } - - syslog(LOG_DEBUG, "indexer_thread() exiting\n"); - CtdlClearSystemContext(); - return NULL; -} - /* @@ -435,28 +414,29 @@ void ft_search(int *fts_num_msgs, long **fts_msgs, const char *search_string) { } free(tokens); - qsort(all_msgs, num_all_msgs, sizeof(long), longcmp); - - /* - * At this point, if a message appears num_tokens times in the - * list, then it contains all of the search tokens. - */ - if (num_all_msgs >= num_tokens) - for (j=0; j<(num_all_msgs-num_tokens+1); ++j) { - if (all_msgs[j] == all_msgs[j+num_tokens-1]) { - - ++num_ret_msgs; - if (num_ret_msgs > num_ret_alloc) { - num_ret_alloc += 64; - ret_msgs = realloc(ret_msgs, - (num_ret_alloc*sizeof(long)) ); + if (all_msgs != NULL) { + qsort(all_msgs, num_all_msgs, sizeof(long), longcmp); + + /* + * At this point, if a message appears num_tokens times in the + * list, then it contains all of the search tokens. + */ + if (num_all_msgs >= num_tokens) + for (j=0; j<(num_all_msgs-num_tokens+1); ++j) { + if (all_msgs[j] == all_msgs[j+num_tokens-1]) { + + ++num_ret_msgs; + if (num_ret_msgs > num_ret_alloc) { + num_ret_alloc += 64; + ret_msgs = realloc(ret_msgs, + (num_ret_alloc*sizeof(long)) ); + } + ret_msgs[num_ret_msgs - 1] = all_msgs[j]; + + } } - ret_msgs[num_ret_msgs - 1] = all_msgs[j]; - - } + free(all_msgs); } - - free(all_msgs); } *fts_num_msgs = num_ret_msgs; @@ -526,11 +506,8 @@ CTDL_MODULE_INIT(fulltext) CtdlRegisterDeleteHook(ft_delete_remove); CtdlRegisterSearchFuncHook(ft_search, "fulltext"); CtdlRegisterCleanupHook(noise_word_cleanup); + CtdlRegisterSessionHook(do_fulltext_indexing, EVT_TIMER, PRIO_CLEANUP + 300); } - else - { - CtdlThreadCreate("Indexer", CTDLTHREAD_BIGSTACK, indexer_thread, NULL); - } - /* return our Subversion id for the Log */ + /* return our module name for the log */ return "fulltext"; }