Fix bugs in Cron

src/Cron.c

@@ -42,12 +42,12 @@ typedef struct Job
 {
     unsigned long interval;
     unsigned long lastExec;
-    void (*func) (void *);
+    JobFunc *func;
     void *args;
 } Job;
 
 static Job *
- JobCreate(long interval, void (*func) (void *), void *args)
+ JobCreate(long interval, JobFunc *func, void *args)
 {
     Job *job;
 
@@ -84,6 +84,7 @@ CronThread(void *args)
         pthread_mutex_lock(&cron->lock);
 
         ts = UtilServerTs();
+
         for (i = 0; i < ArraySize(cron->jobs); i++)
         {
             Job *job = ArrayGet(cron->jobs, i);
@@ -107,7 +108,22 @@ CronThread(void *args)
         /* Only sleep if the jobs didn't overrun the tick */
         if (cron->tick > (te - ts))
         {
-            UtilSleepMillis(cron->tick - (te - ts));
+            const unsigned long microTick = 100;
+            unsigned long remainingTick = cron->tick - (te - ts);
+
+            /* Only sleep for microTick ms at a time because if the
+             * job scheduler is supposed to stop before the tick is up,
+             * we don't want to be stuck in a long sleep */
+            while (remainingTick >= microTick && !cron->stop)
+            {
+                UtilSleepMillis(microTick);
+                remainingTick -= microTick;
+            }
+
+            if (remainingTick && !cron->stop)
+            {
+                UtilSleepMillis(remainingTick);
+            }
         }
     }
 
@@ -132,6 +148,7 @@ CronCreate(unsigned long tick)
     }
 
     cron->tick = tick;
+    cron->stop = 1;
 
     pthread_mutex_init(&cron->lock, NULL);
 
@@ -139,7 +156,7 @@ CronCreate(unsigned long tick)
 }
 
 void
- CronOnce(Cron * cron, void (*func) (void *), void *args)
+ CronOnce(Cron * cron, JobFunc *func, void *args)
 {
     Job *job;
 
@@ -160,7 +177,7 @@ void
 }
 
 void
- CronEvery(Cron * cron, unsigned long interval, void (*func) (void *), void *args)
+ CronEvery(Cron * cron, unsigned long interval, JobFunc *func, void *args)
 {
     Job *job;
 

src/Telodendria.c

@@ -41,6 +41,7 @@
 #include <Matrix.h>
 #include <Db.h>
 #include <Cron.h>
+#include <UserInteractiveAuth.h>
 
 static void
 TelodendriaMemoryHook(MemoryAction a, MemoryInfo * i, void *args)
@@ -607,7 +608,7 @@ main(int argc, char **argv)
 
     Log(lc, LOG_DEBUG, "Registering jobs...");
 
-    /* TODO: Register jobs here */
+    CronEvery(cron, 30 * 60 * 1000, (JobFunc *) UserInteractiveAuthCleanup, &matrixArgs);
 
     Log(lc, LOG_NOTICE, "Starting job scheduler...");
     CronStart(cron);

src/UserInteractiveAuth.c

@@ -135,7 +135,7 @@ UserInteractiveAuth(HttpServerContext * context, Db * db,
 }
 
 void
-UserInteractiveAuthCleanup(Db * db)
+UserInteractiveAuthCleanup(MatrixHttpHandlerArgs *args)
 {
-
+    Log(args->lc, LOG_DEBUG, "Purging old user interactive auth sessions...");
 }

src/include/Cron.h

@@ -26,14 +26,16 @@
 
 typedef struct Cron Cron;
 
+typedef void (JobFunc) (void *);
+
 extern Cron *
  CronCreate(unsigned long);
 
 extern void
- CronOnce(Cron *, void (*) (void *), void *);
+ CronOnce(Cron *, JobFunc *, void *);
 
 extern void
- CronEvery(Cron *, unsigned long, void (*) (void *), void *);
+ CronEvery(Cron *, unsigned long, JobFunc *, void *);
 
 extern void
  CronStart(Cron *);

src/include/UserInteractiveAuth.h

@@ -26,10 +26,10 @@
 
 #include <HashMap.h>
 #include <HttpServer.h>
-#include <Db.h>
+#include <Matrix.h>
 
 extern void
- UserInteractiveAuthCleanup(Db *);
+ UserInteractiveAuthCleanup(MatrixHttpHandlerArgs *);
 
 extern HashMap *
  UserInteractiveAuth(HttpServerContext *, Db *, HashMap *);