Fix MULTI / EXEC rendering in MONITOR output.

[redis.git] / src / bio.c

diff --git a/src/bio.c b/src/bio.c
index 1657455eb26f460a9945f6b682494d0da1a0585f..aa2cdf9fbb5a0d9289eefa825c2aa62048b66f64 100644 (file)
--- a/src/bio.c
+++ b/src/bio.c
@@ -20,6 +20,10 @@
  * Every thread wait for new jobs in its queue, and process every job
  * sequentially.
  *
  * Every thread wait for new jobs in its queue, and process every job
  * sequentially.
  *

+ * Jobs of the same type are guaranteed to be processed from the least
+ * recently inserted to the most recently inserted (older jobs processed
+ * first).
+ *

  * Currently there is no way for the creator of the job to be notified about
  * the completion of the operation, this will only be added when/if needed.
  */
  * Currently there is no way for the creator of the job to be notified about
  * the completion of the operation, this will only be added when/if needed.
  */


@@ -104,9 +108,18 @@ void bioCreateBackgroundJob(int type, void *arg1, void *arg2, void *arg3) {
 void *bioProcessBackgroundJobs(void *arg) {
     struct bio_job *job;
     unsigned long type = (unsigned long) arg;
 void *bioProcessBackgroundJobs(void *arg) {
     struct bio_job *job;
     unsigned long type = (unsigned long) arg;

+    sigset_t sigset;

 
     pthread_detach(pthread_self());
     pthread_mutex_lock(&bio_mutex[type]);
 
     pthread_detach(pthread_self());
     pthread_mutex_lock(&bio_mutex[type]);

+    /* Block SIGALRM so we are sure that only the main thread will
+     * receive the watchdog signal. */
+    sigemptyset(&sigset);
+    sigaddset(&sigset, SIGALRM);
+    if (pthread_sigmask(SIG_BLOCK, &sigset, NULL))
+        redisLog(REDIS_WARNING,
+            "Warning: can't mask SIGALRM in bio.c thread: %s", strerror(errno));
+

     while(1) {
         listNode *ln;
 
     while(1) {
         listNode *ln;
 


@@ -125,6 +138,8 @@ void *bioProcessBackgroundJobs(void *arg) {
         /* Process the job accordingly to its type. */
         if (type == REDIS_BIO_CLOSE_FILE) {
             close((long)job->arg1);
         /* Process the job accordingly to its type. */
         if (type == REDIS_BIO_CLOSE_FILE) {
             close((long)job->arg1);

+        } else if (type == REDIS_BIO_AOF_FSYNC) {
+            aof_fsync((long)job->arg1);

         } else {
             redisPanic("Wrong job type in bioProcessBackgroundJobs().");
         }
         } else {
             redisPanic("Wrong job type in bioProcessBackgroundJobs().");
         }


@@ -147,6 +162,11 @@ unsigned long long bioPendingJobsOfType(int type) {
     return val;
 }
 
     return val;
 }
 

+#if 0 /* We don't use the following code for now, and bioWaitPendingJobsLE
+         probably needs a rewrite using conditional variables instead of the
+         current implementation. */
+         
+

 /* Wait until the number of pending jobs of the specified type are
  * less or equal to the specified number.
  *
 /* Wait until the number of pending jobs of the specified type are
  * less or equal to the specified number.
  *


@@ -184,9 +204,14 @@ time_t bioOlderJobOfType(int type) {
 
     pthread_mutex_lock(&bio_mutex[type]);
     ln = listFirst(bio_jobs[type]);
 
     pthread_mutex_lock(&bio_mutex[type]);
     ln = listFirst(bio_jobs[type]);

+    if (ln == NULL) {
+        pthread_mutex_unlock(&bio_mutex[type]);
+        return 0;
+    }

     job = ln->value;
     time = job->time;
     pthread_mutex_unlock(&bio_mutex[type]);
     return time;
 }
 
     job = ln->value;
     time = job->time;
     pthread_mutex_unlock(&bio_mutex[type]);
     return time;
 }
 

+#endif