From 4e68bc21e3217ae6c7263d781864dc9eac18b0ef Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Tue, 29 Aug 2023 22:49:34 -0400 Subject: [PATCH] Removed double-fetch-room in the indexer. I don't want to celebrate prematurely, but we've gotten through 10,000 ops in every of 10 threads without deadlocking. --- citadel/server/modules/fulltext/serv_fulltext.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/citadel/server/modules/fulltext/serv_fulltext.c b/citadel/server/modules/fulltext/serv_fulltext.c index 6909e9f47..216097174 100644 --- a/citadel/server/modules/fulltext/serv_fulltext.c +++ b/citadel/server/modules/fulltext/serv_fulltext.c @@ -126,13 +126,11 @@ void ft_index_room(struct ctdlroom *qrbuf, void *data) { if (server_shutting_down) { return; } - CtdlGetRoom(&CC->room, qrbuf->QRname); -#if 0 int num_msgs = 0; long *msglist; int i; - num_msgs = CtdlFetchMsgList(CC->room.QRnumber, &msglist); + num_msgs = CtdlFetchMsgList(qrbuf->QRnumber, &msglist); if (msglist != NULL) { for (i=0; i