X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fmodules%2Ffulltext%2Fserv_fulltext.c;h=db0edbdd11bc04dc23bf512934f07303f14e8508;hb=2b402dc292b6dcdbc7a3786a6c722e06e3be5ab5;hp=c76671d8ef6e0fe55ec9ae70bf560b84de29a07c;hpb=252b61d61416a302548866728084dc0e21feea16;p=citadel.git diff --git a/citadel/modules/fulltext/serv_fulltext.c b/citadel/modules/fulltext/serv_fulltext.c index c76671d8e..db0edbdd1 100644 --- a/citadel/modules/fulltext/serv_fulltext.c +++ b/citadel/modules/fulltext/serv_fulltext.c @@ -1,12 +1,8 @@ /* - * $Id$ - * * This module handles fulltext indexing of the message base. + * Copyright (c) 2005-2011 by the citadel.org team * - * - * Copyright (c) 2005-2009 by the citadel.org team - * - * This program is free software; you can redistribute it and/or modify + * 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. @@ -18,7 +14,7 @@ * * 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 + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -62,14 +58,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]; @@ -97,7 +90,7 @@ void ft_flush_cache(void) { for (i=0; i<65536; ++i) { if ((time(NULL) - last_update) >= 10) { - CtdlLogPrintf(CTDL_INFO, + syslog(LOG_INFO, "Flushing index cache to disk (%d%% complete)\n", (i * 100 / 65536) ); @@ -111,7 +104,7 @@ void ft_flush_cache(void) { ftc_msgs[i] = NULL; } } - CtdlLogPrintf(CTDL_INFO, "Flushed index cache to disk (100%% complete)\n"); + syslog(LOG_INFO, "Flushed index cache to disk (100%% complete)\n"); } @@ -123,43 +116,41 @@ void ft_index_message(long msgnum, int op) { int *tokens = NULL; int i, j; struct cdbdata *cdb_bucket; - char *msgtext; + StrBuf *msgtext; + char *txt; int tok; struct CtdlMessage *msg = NULL; msg = CtdlFetchMessage(msgnum, 1); if (msg == NULL) { - CtdlLogPrintf(CTDL_ERR, "ft_index_message() could not load msg %ld\n", msgnum); + syslog(LOG_ERR, "ft_index_message() could not load msg %ld\n", msgnum); return; } if (msg->cm_fields['1'] != NULL) { - CtdlLogPrintf(CTDL_DEBUG, "ft_index_message() excluded msg %ld\n", msgnum); + syslog(LOG_DEBUG, "ft_index_message() excluded msg %ld\n", msgnum); CtdlFreeMessage(msg); return; } - CtdlLogPrintf(CTDL_DEBUG, "ft_index_message() %s msg %ld\n", + syslog(LOG_DEBUG, "ft_index_message() %s msg %ld\n", (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 = malloc(SIZ); - CC->redirect_len = 0; - CC->redirect_alloc = SIZ; + CC->redirect_buffer = NewStrBufPlain(NULL, SIZ); CtdlOutputPreLoadedMsg(msg, MT_CITADEL, HEADERS_ALL, 0, 1, 0); CtdlFreeMessage(msg); msgtext = CC->redirect_buffer; CC->redirect_buffer = NULL; - CC->redirect_len = 0; - CC->redirect_alloc = 0; - CtdlLogPrintf(CTDL_DEBUG, "Wordbreaking message %ld...\n", msgnum); - wordbreaker(msgtext, &num_tokens, &tokens); - free(msgtext); + syslog(LOG_DEBUG, "Wordbreaking message %ld...\n", msgnum); + txt = SmashStrBuf(&msgtext); + wordbreaker(txt, &num_tokens, &tokens); + free(txt); - CtdlLogPrintf(CTDL_DEBUG, "Indexing message %ld [%d tokens]\n", msgnum, num_tokens); + syslog(LOG_DEBUG, "Indexing message %ld [%d tokens]\n", msgnum, num_tokens); if (num_tokens > 0) { for (i=0; iroom, qrbuf->QRname); @@ -254,6 +245,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. @@ -266,13 +260,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 @@ -283,7 +274,7 @@ void do_fulltext_indexing(void) { } run_time = time(NULL); - CtdlLogPrintf(CTDL_DEBUG, "do_fulltext_indexing() started (%ld)\n", run_time); + syslog(LOG_DEBUG, "do_fulltext_indexing() started (%ld)\n", run_time); /* * If we've switched wordbreaker modules, burn the index and start @@ -291,9 +282,9 @@ void do_fulltext_indexing(void) { */ begin_critical_section(S_CONTROL); if (CitControl.fulltext_wordbreaker != FT_WORDBREAKER_ID) { - CtdlLogPrintf(CTDL_DEBUG, "wb ver on disk = %d, code ver = %d\n", + syslog(LOG_DEBUG, "wb ver on disk = %d, code ver = %d\n", CitControl.fulltext_wordbreaker, FT_WORDBREAKER_ID); - CtdlLogPrintf(CTDL_INFO, "(re)initializing full text index\n"); + syslog(LOG_INFO, "(re)initializing full text index\n"); cdb_trunc(CDB_FULLTEXT); CitControl.MMfulltext = 0L; put_control(); @@ -320,7 +311,7 @@ void do_fulltext_indexing(void) { /* Here it is ... do each message! */ for (i=0; i= FT_MAX_CACHE) { - CtdlLogPrintf(CTDL_DEBUG, "Time to flush.\n"); + syslog(LOG_DEBUG, "Time to flush.\n"); ft_newhighest = ft_newmsgs[i]; break; } @@ -352,10 +343,12 @@ void do_fulltext_indexing(void) { } end_time = time(NULL); - if (CtdlThreadCheckStop()) + if (server_shutting_down) { + is_running = 0; return; + } - CtdlLogPrintf(CTDL_DEBUG, "do_fulltext_indexing() duration (%ld)\n", end_time - run_time); + syslog(LOG_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(); @@ -366,30 +359,11 @@ void do_fulltext_indexing(void) { end_critical_section(S_CONTROL); last_index = time(NULL); - CtdlLogPrintf(CTDL_DEBUG, "do_fulltext_indexing() finished\n"); + syslog(LOG_DEBUG, "do_fulltext_indexing() finished\n"); + is_running = 0; return; } -/* - * Main loop for the indexer thread. - */ -void *indexer_thread(void *arg) { - struct CitContext indexerCC; - - CtdlLogPrintf(CTDL_DEBUG, "indexer_thread() initializing\n"); - - CtdlFillSystemContext(&indexerCC, "indexer"); - citthread_setspecific(MyConKey, (void *)&indexerCC ); - - while (!CtdlThreadCheckStop()) { - do_fulltext_indexing(); - CtdlThreadSleep(300); - } - - CtdlLogPrintf(CTDL_DEBUG, "indexer_thread() exiting\n"); - return NULL; -} - /* @@ -397,7 +371,7 @@ void *indexer_thread(void *arg) { * (This one does the "all of these words" search.) * Caller is responsible for freeing the message list. */ -void ft_search(int *fts_num_msgs, long **fts_msgs, char *search_string) { +void ft_search(int *fts_num_msgs, long **fts_msgs, const char *search_string) { int num_tokens = 0; int *tokens = NULL; int i, j; @@ -531,11 +505,8 @@ CTDL_MODULE_INIT(fulltext) CtdlRegisterDeleteHook(ft_delete_remove); CtdlRegisterSearchFuncHook(ft_search, "fulltext"); CtdlRegisterCleanupHook(noise_word_cleanup); - } - else - { - CtdlThreadCreate("Indexer", CTDLTHREAD_BIGSTACK, indexer_thread, NULL); + CtdlRegisterSessionHook(do_fulltext_indexing, EVT_TIMER); } /* return our Subversion id for the Log */ - return "$Id$"; + return "fulltext"; }