]> code.citadel.org Git - citadel.git/blobdiff - citadel/serv_expire.c
Fixes for Cygwin (see ChangeLog)
[citadel.git] / citadel / serv_expire.c
index 1083e0e25ea5db4116d5b9d6e9c2d12d3e967d88..e1293d6c44764ba0f85e4ba4f5a5b4a3ba033337 100644 (file)
@@ -6,6 +6,24 @@
  */
 /* $Id$ */
 
+
+/*
+ * A brief technical discussion:
+ *
+ * Several of the purge operations found in this module operate in two
+ * stages: the first stage generates a linked list of objects to be deleted,
+ * then the second stage deletes all listed objects from the database.
+ *
+ * At first glance this may seem cumbersome and unnecessary.  The reason it is
+ * implemented in this way is because GDBM (and perhaps some other backends we
+ * may hook into in the future) explicitly do _not_ support the deletion of
+ * 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.
+ */
+
+
+#include "sysdep.h"
 #include <stdlib.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -18,7 +36,9 @@
 #include <sys/wait.h>
 #include <string.h>
 #include <limits.h>
+#ifdef HAVE_PTHREAD_H
 #include <pthread.h>
+#endif
 #include "citadel.h"
 #include "server.h"
 #include <syslog.h>
@@ -34,6 +54,7 @@
 #include "msgbase.h"
 #include "user_ops.h"
 #include "control.h"
+#include "tools.h"
 
 
 struct oldvisit {
@@ -48,16 +69,37 @@ struct PurgeList {
        char name[ROOMNAMELEN]; /* use the larger of username or roomname */
        };
 
+struct VPurgeList {
+       struct VPurgeList *next;
+       long vp_roomnum;
+       long vp_roomgen;
+       long vp_usernum;
+       };
+
+struct ValidRoom {
+       struct ValidRoom *next;
+       long vr_roomnum;
+       long vr_roomgen;
+       };
+
+struct ValidUser {
+       struct ValidUser *next;
+       long vu_usernum;
+       };
+
 struct PurgeList *UserPurgeList = NULL;
 struct PurgeList *RoomPurgeList = NULL;
+struct ValidRoom *ValidRoomList = NULL;
+struct ValidUser *ValidUserList = NULL;
+int messages_purged;
 
 extern struct CitContext *ContextList;
 
 #define MODULE_NAME    "Expire old messages, users, rooms"
 #define MODULE_AUTHOR  "Art Cancro"
 #define MODULE_EMAIL   "ajc@uncnsrd.mt-kisco.ny.us"
-#define MAJOR_VERSION  0
-#define MINOR_VERSION  1
+#define MAJOR_VERSION  1
+#define MINOR_VERSION  0
 
 static struct DLModule_Info info = {
        MODULE_NAME,
@@ -104,6 +146,7 @@ void DoPurgeMessages(struct quickroom *qrbuf) {
                        memcpy(&CC->msglist[0], &CC->msglist[1],
                                (sizeof(long)*(CC->num_msgs - 1)));
                        CC->num_msgs = CC->num_msgs - 1;
+                       ++messages_purged;
                        }
                }
 
@@ -112,13 +155,14 @@ void DoPurgeMessages(struct quickroom *qrbuf) {
                for (a=0; a<(CC->num_msgs); ++a) {
                        delnum = MessageFromList(a);
                        sprintf(msgid, "%ld", delnum);
-                       xtime = output_message(msgid, MT_DATE, 0, 0);
+                       xtime = output_message(msgid, MT_DATE, 0);
 
                        if ((xtime > 0L)
                           && (now - xtime > (time_t)(epbuf.expire_value * 86400L))) {
+                               lprintf(5, "Expiring message %ld\n", delnum);
                                cdb_delete(CDB_MSGMAIN, &delnum, sizeof(long));
                                SetMessageInList(a, 0L);
-                               lprintf(5, "Expiring message %ld\n", delnum);
+                               ++messages_purged;
                                }
                        }
                }
@@ -129,12 +173,13 @@ void DoPurgeMessages(struct quickroom *qrbuf) {
 
 void PurgeMessages(void) {
        lprintf(5, "PurgeMessages() called\n");
+       messages_purged = 0;
        ForEachRoom(DoPurgeMessages);
        }
 
 
 void DoPurgeRooms(struct quickroom *qrbuf) {
-       time_t now, age;
+       time_t age, purge_secs;
        struct PurgeList *pptr;
 
        /* Any of these attributes render a room non-purgable */
@@ -144,14 +189,18 @@ void DoPurgeRooms(struct quickroom *qrbuf) {
        if (qrbuf->QRflags & QR_MAILBOX) return;
        if (is_noneditable(qrbuf)) return;
 
+       /* If we don't know the modification date, be safe and don't purge */
+       if (qrbuf->QRmtime <= (time_t)0) return;
+
        /* Otherwise, check the date of last modification */
-       time(&now);
-       age = now - (qrbuf->QRmtime);
+       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);
-       if ( (qrbuf->QRmtime > 0L)
-          && (age > (time_t)(config.c_roompurge * 86400L))) {
+
+       if (age > purge_secs) {
                
-               pptr = (struct PurgeList *) malloc(sizeof(struct PurgeList));
+               pptr = (struct PurgeList *) mallok(sizeof(struct PurgeList));
                pptr->next = RoomPurgeList;
                strcpy(pptr->name, qrbuf->QRname);
                RoomPurgeList = pptr;
@@ -175,7 +224,7 @@ int PurgeRooms(void) {
                        delete_room(&qrbuf);
                        }
                pptr = RoomPurgeList->next;
-               free(RoomPurgeList);
+               phree(RoomPurgeList);
                RoomPurgeList = pptr;
                ++num_rooms_purged;
                }
@@ -229,7 +278,7 @@ void do_user_purge(struct usersupp *us) {
        if (us->timescalled == 0) purge = 1;
 
        if (purge == 1) {
-               pptr = (struct PurgeList *) malloc(sizeof(struct PurgeList));
+               pptr = (struct PurgeList *) mallok(sizeof(struct PurgeList));
                pptr->next = UserPurgeList;
                strcpy(pptr->name, us->fullname);
                UserPurgeList = pptr;
@@ -251,7 +300,7 @@ int PurgeUsers(void) {
        while (UserPurgeList != NULL) {
                purge_user(UserPurgeList->name);
                pptr = UserPurgeList->next;
-               free(UserPurgeList);
+               phree(UserPurgeList);
                UserPurgeList = pptr;
                ++num_users_purged;
                }
@@ -260,16 +309,57 @@ int PurgeUsers(void) {
        return(num_users_purged);
        }
 
+void AddValidUser(struct usersupp *usbuf) {
+       struct ValidUser *vuptr;
 
+       vuptr = (struct ValidUser *)mallok(sizeof(struct ValidUser));
+       vuptr->next = ValidUserList;
+       vuptr->vu_usernum = usbuf->usernum;
+       ValidUserList = vuptr;
+       }
 
+void AddValidRoom(struct quickroom *qrbuf) {
+       struct ValidRoom *vrptr;
+
+       vrptr = (struct ValidRoom *)mallok(sizeof(struct ValidRoom));
+       vrptr->next = ValidRoomList;
+       vrptr->vr_roomnum = qrbuf->QRnumber;
+       vrptr->vr_roomgen = qrbuf->QRgen;
+       ValidRoomList = vrptr;
+       }
+
+
+/*
+ * Purge visits
+ *
+ * This is a really cumbersome "garbage collection" function.  We have to
+ * delete visits which refer to rooms and/or users which no longer exist.  In
+ * order to prevent endless traversals of the room and user files, we first
+ * build linked lists of rooms and users which _do_ exist on the system, then
+ * traverse the visit file, checking each record against those two lists and
+ * purging the ones that do not have a match on _both_ lists.  (Remember, if
+ * either the room or user being referred to is no longer on the system, the
+ * record is completely useless.)
+ */
 int PurgeVisits(void) {
        struct cdbdata *cdbvisit;
        struct visit vbuf;
+       struct VPurgeList *VisitPurgeList = NULL;
+       struct VPurgeList *vptr;
        int purged = 0;
+       char IndexBuf[32];
+       int IndexLen;
+       struct ValidRoom *vrptr;
+       struct ValidUser *vuptr;
+       int RoomIsValid, UserIsValid;
 
-       struct quickroom qr;
-       struct usersupp us;
+       /* First, load up a table full of valid room/gen combinations */
+       ForEachRoom(AddValidRoom);
 
+       /* Then load up a table full of valid user numbers */
+       ForEachUser(AddValidUser);
+
+       /* Now traverse through the visits, purging irrelevant records... */
        cdb_rewind(CDB_VISIT);
        while(cdbvisit = cdb_next_item(CDB_VISIT), cdbvisit != NULL) {
                memset(&vbuf, 0, sizeof(struct visit));
@@ -278,8 +368,62 @@ int PurgeVisits(void) {
                        sizeof(struct visit) : cdbvisit->len) );
                cdb_free(cdbvisit);
 
+               RoomIsValid = 0;
+               UserIsValid = 0;
+
+               /* Check to see if the room exists */
+               for (vrptr=ValidRoomList; vrptr!=NULL; vrptr=vrptr->next) {
+                       if ( (vrptr->vr_roomnum==vbuf.v_roomnum)
+                            && (vrptr->vr_roomgen==vbuf.v_roomgen))
+                               RoomIsValid = 1;
+                       }
+
+               /* Check to see if the user exists */
+               for (vuptr=ValidUserList; vuptr!=NULL; vuptr=vuptr->next) {
+                       if (vuptr->vu_usernum == vbuf.v_usernum)
+                               UserIsValid = 1;
+                       }
+
+               /* Put the record on the purge list if it's dead */
+               if ((RoomIsValid==0) || (UserIsValid==0)) {
+                       vptr = (struct VPurgeList *)
+                               mallok(sizeof(struct VPurgeList));
+                       vptr->next = VisitPurgeList;
+                       vptr->vp_roomnum = vbuf.v_roomnum;
+                       vptr->vp_roomgen = vbuf.v_roomgen;
+                       vptr->vp_usernum = vbuf.v_usernum;
+                       VisitPurgeList = vptr;
+                       }
+
+               }
+
+       /* Free the valid room/gen combination list */
+       while (ValidRoomList != NULL) {
+               vrptr = ValidRoomList->next;
+               phree(ValidRoomList);
+               ValidRoomList = vrptr;
+               }
+
+       /* Free the valid user list */
+       while (ValidUserList != NULL) {
+               vuptr = ValidUserList->next;
+               phree(ValidUserList);
+               ValidUserList = vuptr;
+               }
+
+       /* Now delete every visit on the purged list */
+       while (VisitPurgeList != NULL) {
+               IndexLen = GenerateRelationshipIndex(IndexBuf,
+                               VisitPurgeList->vp_roomnum,
+                               VisitPurgeList->vp_roomgen,
+                               VisitPurgeList->vp_usernum);
+               cdb_delete(CDB_VISIT, IndexBuf, IndexLen);
+               vptr = VisitPurgeList->next;
+               phree(VisitPurgeList);
+               VisitPurgeList = vptr;
                ++purged;
                }
+       
        return(purged);
        }
 
@@ -308,17 +452,17 @@ void cmd_expi(char *argbuf) {
                }
        else if (!strcasecmp(cmd, "messages")) {
                PurgeMessages();
-               cprintf("%d Finished purging messages.\n", OK);
+               cprintf("%d Expired %d messages.\n", OK, messages_purged);
                return;
                }
        else if (!strcasecmp(cmd, "rooms")) {
                retval = PurgeRooms();
-               cprintf("%d Purged %d rooms.\n", OK, retval);
+               cprintf("%d Expired %d rooms.\n", OK, retval);
                return;
                }
        else if (!strcasecmp(cmd, "visits")) {
                retval = PurgeVisits();
-               cprintf("%d There are %d visits...\n", OK, retval);
+               cprintf("%d Purged %d visits.\n", OK, retval);
                }
        else if (!strcasecmp(cmd, "defrag")) {
                defrag_databases();