tasklet: do not call tasklet callbacks inside tasklet_lock

tvheadend · Mar 8, 2016 · 25cb7a5 · 25cb7a5
1 parent e522525
commit 25cb7a5
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/src/dvr/dvr_vfsmgr.c b/src/dvr/dvr_vfsmgr.c
@@ -396,8 +396,6 @@ dvr_get_disk_space_update(const char *path, int locked)
 static void
 dvr_get_disk_space_tcb(void *opaque, int dearmed)
 {
-  pthread_mutex_unlock(&tasklet_lock);
-
   if (!dearmed) {
     htsmsg_t *m = htsmsg_create_map();
 
@@ -412,7 +410,6 @@ dvr_get_disk_space_tcb(void *opaque, int dearmed)
     dvr_disk_space_check();
   }
 
-  pthread_mutex_lock(&tasklet_lock);
   free(opaque);
 }
 

diff --git a/src/main.c b/src/main.c
@@ -448,16 +448,19 @@ tasklet_thread ( void *aux )
       tvh_cond_wait(&tasklet_cond, &tasklet_lock);
       continue;
     }
-    /* the callback might re-initiaze tasklet, save everythin */
+    /* the callback might re-initialize tasklet, save everythin */
     TAILQ_REMOVE(&tasklets, tsk, tsk_link);
     tsk_cb = tsk->tsk_callback;
     opaque = tsk->tsk_opaque;
     tsk->tsk_callback = NULL;
     if (tsk->tsk_allocated)
       free(tsk);
     /* now, the callback can be safely called */
-    if (tsk_cb)
+    if (tsk_cb) {
+      pthread_mutex_unlock(&tasklet_lock);
       tsk_cb(opaque, 0);
+      pthread_mutex_lock(&tasklet_lock);
+    }
   }
   pthread_mutex_unlock(&tasklet_lock);