* records from a file while the file is being traversed. The delete operation
* will succeed, but the traversal is not guaranteed to visit every object if
* this is done. Therefore we utilize the two-stage purge.
+ *
+ * When using Berkeley DB, there's another reason for the two-phase purge: we
+ * don't want the entire thing being done as one huge transaction.
*/
#include <pwd.h>
#include <errno.h>
#include <sys/types.h>
-#include <sys/time.h>
+
+#if TIME_WITH_SYS_TIME
+# include <sys/time.h>
+# include <time.h>
+#else
+# if HAVE_SYS_TIME_H
+# include <sys/time.h>
+# else
+# include <time.h>
+# endif
+#endif
+
#include <sys/wait.h>
#include <string.h>
#include <limits.h>
#include "citadel.h"
#include "server.h"
#include <syslog.h>
-#include <time.h>
#include "sysdep_decls.h"
#include "citserver.h"
#include "support.h"
#include "config.h"
-#include "dynloader.h"
+#include "serv_extensions.h"
#include "room_ops.h"
#include "policy.h"
#include "database.h"
#include "msgbase.h"
#include "user_ops.h"
#include "control.h"
+#include "serv_network.h"
#include "tools.h"
-struct oldvisit {
- char v_roomname[ROOMNAMELEN];
- long v_generation;
- long v_lastseen;
- unsigned int v_flags;
-};
-
struct PurgeList {
struct PurgeList *next;
char name[ROOMNAMELEN]; /* use the larger of username or roomname */
long msgnum;
};
+struct UPurgeList {
+ struct UPurgeList *next;
+ char up_key[SIZ];
+};
+
struct PurgeList *UserPurgeList = NULL;
struct PurgeList *RoomPurgeList = NULL;
extern struct CitContext *ContextList;
-void DoPurgeMessages(struct quickroom *qrbuf, void *data) {
+
+/*
+ * First phase of message purge -- gather the locations of messages which
+ * qualify for purging and write them to a temp file.
+ */
+void GatherPurgeMessages(struct quickroom *qrbuf, void *data) {
struct ExpirePolicy epbuf;
long delnum;
time_t xtime, now;
struct cdbdata *cdbfr;
long *msglist = NULL;
int num_msgs = 0;
+ FILE *purgelist;
+
+ purgelist = (FILE *)data;
+ fprintf(purgelist, "r=%s\n", qrbuf->QRname);
time(&now);
GetExpirePolicy(&epbuf, qrbuf);
if (epbuf.expire_mode == EXPIRE_NEXTLEVEL) return;
if (epbuf.expire_mode == EXPIRE_MANUAL) return;
- begin_critical_section(S_QUICKROOM);
cdbfr = cdb_fetch(CDB_MSGLISTS, &qrbuf->QRnumber, sizeof(long));
if (cdbfr != NULL) {
/* Nothing to do if there aren't any messages */
if (num_msgs == 0) {
- end_critical_section(S_QUICKROOM);
+ if (msglist != NULL) phree(msglist);
return;
}
/* If the room is set to expire by count, do that */
if (epbuf.expire_mode == EXPIRE_NUMMSGS) {
- while (num_msgs > epbuf.expire_value) {
- delnum = msglist[0];
- lprintf(5, "Expiring message %ld\n", delnum);
- AdjRefCount(delnum, -1);
- memcpy(&msglist[0], &msglist[1],
- (sizeof(long)*(num_msgs - 1)));
- --num_msgs;
- ++messages_purged;
+ if (num_msgs > epbuf.expire_value) {
+ for (a=0; a<(num_msgs - epbuf.expire_value); ++a) {
+ fprintf(purgelist, "m=%ld\n", msglist[a]);
+ ++messages_purged;
+ }
}
}
if ((xtime > 0L)
&& (now - xtime > (time_t)(epbuf.expire_value * 86400L))) {
- lprintf(5, "Expiring message %ld\n", delnum);
- AdjRefCount(delnum, -1);
- msglist[a] = 0L;
+ fprintf(purgelist, "m=%ld\n", delnum);
++messages_purged;
}
}
}
- if (num_msgs > 0) {
- num_msgs = sort_msglist(msglist, num_msgs);
- }
-
- cdb_store(CDB_MSGLISTS, &qrbuf->QRnumber, sizeof(long),
- msglist, (num_msgs * sizeof(long)) );
-
if (msglist != NULL) phree(msglist);
+}
+
- end_critical_section(S_QUICKROOM);
+/*
+ * Second phase of message purge -- read list of msgs from temp file and
+ * delete them.
+ */
+void DoPurgeMessages(FILE *purgelist) {
+ char roomname[ROOMNAMELEN];
+ long msgnum;
+ char buf[SIZ];
+
+ rewind(purgelist);
+ strcpy(roomname, "nonexistent room ___ ___");
+ while (fgets(buf, sizeof buf, purgelist) != NULL) {
+ buf[strlen(buf)-1]=0;
+ if (!strncasecmp(buf, "r=", 2)) {
+ strcpy(roomname, &buf[2]);
+ }
+ if (!strncasecmp(buf, "m=", 2)) {
+ msgnum = atol(&buf[2]);
+ if (msgnum > 0L) {
+ CtdlDeleteMessages(roomname, msgnum, "");
+ }
+ }
+ }
}
+
void PurgeMessages(void) {
+ FILE *purgelist;
+
lprintf(5, "PurgeMessages() called\n");
messages_purged = 0;
- ForEachRoom(DoPurgeMessages, NULL);
+
+ purgelist = tmpfile();
+ if (purgelist == NULL) {
+ lprintf(3, "Can't create purgelist temp file: %s\n",
+ strerror(errno));
+ return;
+ }
+
+ ForEachRoom(GatherPurgeMessages, (void *)purgelist );
+ DoPurgeMessages(purgelist);
+ fclose(purgelist);
}
age = time(NULL) - (qrbuf->QRmtime);
purge_secs = (time_t)config.c_roompurge * (time_t)86400;
if (purge_secs <= (time_t)0) return;
- lprintf(9, "<%s> is <%ld> seconds old\n", qrbuf->QRname, age);
+ lprintf(9, "<%s> is <%ld> seconds old\n", qrbuf->QRname, (long)age);
if (age > purge_secs) do_purge = 1;
} /* !QR_MAILBOX */
while (RoomPurgeList != NULL) {
if (getroom(&qrbuf, RoomPurgeList->name) == 0) {
transcript=reallok(transcript, strlen(transcript)+SIZ);
- sprintf(&transcript[strlen(transcript)], " %s\n",
+ snprintf(&transcript[strlen(transcript)], SIZ, " %s\n",
qrbuf.QRname);
delete_room(&qrbuf);
}
struct quickroom qrbuf;
char mailboxname[ROOMNAMELEN];
MailboxName(mailboxname, us, MAILROOM);
- create_room(mailboxname, 4, "", 0);
+ create_room(mailboxname, 4, "", 0, 1, 1);
if (getroom(&qrbuf, mailboxname) != 0) return;
lprintf(9, "Got %s\n", qrbuf.QRname);
*/
while (UserPurgeList != NULL) {
transcript=reallok(transcript, strlen(transcript)+SIZ);
- sprintf(&transcript[strlen(transcript)], " %s\n",
+ snprintf(&transcript[strlen(transcript)], SIZ, " %s\n",
UserPurgeList->name);
purge_user(UserPurgeList->name);
pptr = UserPurgeList->next;
ForEachUser(AddValidUser, NULL);
/* Now traverse through the visits, purging irrelevant records... */
- cdb_begin_transaction();
cdb_rewind(CDB_VISIT);
while(cdbvisit = cdb_next_item(CDB_VISIT), cdbvisit != NULL) {
memset(&vbuf, 0, sizeof(struct visit));
}
- cdb_end_transaction();
-
/* Free the valid room/gen combination list */
while (ValidRoomList != NULL) {
vrptr = ValidRoomList->next;
return(purged);
}
+/*
+ * Purge the use table of old entries.
+ *
+ */
+int PurgeUseTable(void) {
+ int purged = 0;
+ struct cdbdata *cdbut;
+ struct UseTable ut;
+ struct UPurgeList *ul = NULL;
+ struct UPurgeList *uptr;
+
+ /* Phase 1: traverse through the table, discovering old records... */
+ lprintf(9, "Purge use table: phase 1\n");
+ cdb_rewind(CDB_USETABLE);
+ while(cdbut = cdb_next_item(CDB_USETABLE), cdbut != NULL) {
+
+ memcpy(&ut, cdbut->ptr,
+ ((cdbut->len > sizeof(struct UseTable)) ?
+ sizeof(struct UseTable) : cdbut->len));
+ cdb_free(cdbut);
+
+ if ( (time(NULL) - ut.ut_timestamp) > USETABLE_RETAIN ) {
+ uptr = (struct UPurgeList *) mallok(sizeof(struct UPurgeList));
+ if (uptr != NULL) {
+ uptr->next = ul;
+ safestrncpy(uptr->up_key, ut.ut_msgid, SIZ);
+ ul = uptr;
+ }
+ ++purged;
+ }
+
+ }
+
+ /* Phase 2: delete the records */
+ lprintf(9, "Purge use table: phase 2\n");
+ while (ul != NULL) {
+ cdb_delete(CDB_USETABLE, ul->up_key, strlen(ul->up_key));
+ uptr = ul->next;
+ phree(ul);
+ ul = uptr;
+ }
+
+ lprintf(9, "Purge use table: finished (purged %d records)\n", purged);
+ return(purged);
+}
+
void cmd_expi(char *argbuf) {
char cmd[SIZ];
extract(cmd, argbuf, 0);
if (!strcasecmp(cmd, "users")) {
retval = PurgeUsers();
- cprintf("%d Purged %d users.\n", OK, retval);
+ cprintf("%d Purged %d users.\n", CIT_OK, retval);
return;
}
else if (!strcasecmp(cmd, "messages")) {
PurgeMessages();
- cprintf("%d Expired %d messages.\n", OK, messages_purged);
+ cprintf("%d Expired %d messages.\n", CIT_OK, messages_purged);
return;
}
else if (!strcasecmp(cmd, "rooms")) {
retval = PurgeRooms();
- cprintf("%d Expired %d rooms.\n", OK, retval);
+ cprintf("%d Expired %d rooms.\n", CIT_OK, retval);
return;
}
else if (!strcasecmp(cmd, "visits")) {
retval = PurgeVisits();
- cprintf("%d Purged %d visits.\n", OK, retval);
+ cprintf("%d Purged %d visits.\n", CIT_OK, retval);
+ }
+ else if (!strcasecmp(cmd, "usetable")) {
+ retval = PurgeUseTable();
+ cprintf("%d Purged %d entries from the use table.\n",
+ CIT_OK, retval);
}
else if (!strcasecmp(cmd, "defrag")) {
defrag_databases();
- cprintf("%d Defragmented the databases.\n", OK);
+ cprintf("%d Defragmented the databases.\n", CIT_OK);
}
else {
cprintf("%d Invalid command.\n", ERROR+ILLEGAL_VALUE);
void do_fsck_room(struct quickroom *qrbuf, void *data)
{
getroom(&CC->quickroom, qrbuf->QRname);
- CtdlForEachMessage(MSGS_ALL, 0L, (-127), NULL, NULL,
- do_fsck_msg, NULL);
+ CtdlForEachMessage(MSGS_ALL, 0L, NULL, NULL, do_fsck_msg, NULL);
}
/*
void cmd_fsck(char *argbuf) {
long msgnum;
struct cdbdata *cdbmsg;
- struct SuppMsgInfo smi;
+ struct MetaData smi;
struct roomref *ptr;
int realcount;
cdb_free(cdbmsg);
cprintf("Message %7ld ", msgnum);
- GetSuppMsgInfo(&smi, msgnum);
- cprintf("refcount=%-2d ", smi.smi_refcount);
+ GetMetaData(&smi, msgnum);
+ cprintf("refcount=%-2d ", smi.meta_refcount);
realcount = 0;
for (ptr = rr; ptr != NULL; ptr = ptr->next) {
}
cprintf("realcount=%-2d\n", realcount);
- if ( (smi.smi_refcount != realcount)
+ if ( (smi.meta_refcount != realcount)
|| (realcount == 0) ) {
- smi.smi_refcount = realcount;
- PutSuppMsgInfo(&smi);
+ smi.meta_refcount = realcount;
+ PutMetaData(&smi);
AdjRefCount(msgnum, 0); /* deletes if needed */
}
/*****************************************************************************/
-char *Dynamic_Module_Init(void)
+char *serv_expire_init(void)
{
CtdlRegisterProtoHook(cmd_expi, "EXPI", "Expire old system objects");
CtdlRegisterProtoHook(cmd_fsck, "FSCK", "Check message ref counts");
projects / citadel.git / blobdiff