/*
* 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
+ * 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.
*
* 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
*/
#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];
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)
);
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");
}
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
);
CtdlFreeMessage(msg);
msgtext = CC->redirect_buffer;
CC->redirect_buffer = NULL;
- CtdlLogPrintf(CTDL_DEBUG, "Wordbreaking message %ld...\n", msgnum);
+ 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; i<num_tokens; ++i) {
}
}
else {
- CtdlLogPrintf(CTDL_ALERT, "Invalid token %d !!\n", tok);
+ syslog(LOG_ALERT, "Invalid token %d !!\n", tok);
}
}
*/
void ft_index_room(struct ctdlroom *qrbuf, void *data)
{
- if (CtdlThreadCheckStop())
+ if (server_shutting_down)
return;
CtdlGetRoom(&CC->room, qrbuf->QRname);
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.
* 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
}
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
*/
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();
/* Here it is ... do each message! */
for (i=0; i<ft_num_msgs; ++i) {
if (time(NULL) != last_progress) {
- CtdlLogPrintf(CTDL_DEBUG,
+ syslog(LOG_DEBUG,
"Indexed %d of %d messages (%d%%)\n",
i, ft_num_msgs,
((i*100) / ft_num_msgs)
ft_index_message(ft_newmsgs[i], 1);
/* Check to see if we need to quit early */
- if (CtdlThreadCheckStop()) {
- CtdlLogPrintf(CTDL_DEBUG, "Indexer quitting early\n");
+ if (server_shutting_down) {
+ syslog(LOG_DEBUG, "Indexer quitting early\n");
ft_newhighest = ft_newmsgs[i];
break;
}
/* Check to see if we have to maybe flush to disk */
if (i >= FT_MAX_CACHE) {
- CtdlLogPrintf(CTDL_DEBUG, "Time to flush.\n");
+ syslog(LOG_DEBUG, "Time to flush.\n");
ft_newhighest = ft_newmsgs[i];
break;
}
}
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();
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;
-
-
- CtdlFillSystemContext(&indexerCC, "indexer");
- citthread_setspecific(MyConKey, (void *)&indexerCC );
- CtdlLogPrintf(CTDL_DEBUG, "indexer_thread() initializing\n");
-
- while (!CtdlThreadCheckStop()) {
- do_fulltext_indexing();
- CtdlThreadSleep(300);
- }
-
- CtdlLogPrintf(CTDL_DEBUG, "indexer_thread() exiting\n");
- CtdlClearSystemContext();
- return NULL;
-}
-
/*
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 "fulltext";
projects / citadel.git / blobdiff