Changeset 3105

Timestamp:

03/05/10 12:59:21 (6 months ago)

Author:

scdbackup

Message:

Protected blanker and formatter thread from signals

Location:

libburn/trunk

Files:

• cdrskin/cdrskin_timestamp.h (modified) (1 diff)
• libburn/async.c (modified) (8 diffs)

libburn/trunk/cdrskin/cdrskin_timestamp.h

@@ -1 @@
-#define Cdrskin_timestamP "2010.03.05.111712"
+#define Cdrskin_timestamP "2010.03.05.190110"

libburn/trunk/libburn/async.c

@@ -319 +319 @@
 static void *erase_worker_func(struct w_list *w)
 {
+
+#define Libburn_protect_erase_threaD 1
+
+#ifdef Libburn_protect_erase_threaD
+        sigset_t sigset, oldset;
+
+        /* Protect blank thread from being interrupted by external signals */
+        sigfillset(&sigset);
+        sigdelset(&sigset, SIGSEGV);
+        sigdelset(&sigset, SIGILL);
+        pthread_sigmask(SIG_SETMASK, &sigset, &oldset);
+#endif /* Libburn_protect_erase_threaD */
+
         burn_disc_erase_sync(w->u.erase.drive, w->u.erase.fast);
         remove_worker(pthread_self());
+
+#ifdef Libburn_protect_erase_threaD
+        /* (just in case it would not end with all signals blocked) */
+        pthread_sigmask(SIG_SETMASK, &oldset, NULL);
+#endif /* Libburn_protect_erase_threaD */
+
         return NULL;
 }
@@ -391 +410 @@
 static void *format_worker_func(struct w_list *w)
 {
+
+#define Libburn_protect_format_threaD 1
+
+#ifdef Libburn_protect_format_threaD
+        sigset_t sigset, oldset;
+
+        /* Protect format thread from being interrupted by external signals */
+        sigfillset(&sigset);
+        sigdelset(&sigset, SIGSEGV);
+        sigdelset(&sigset, SIGILL);
+        pthread_sigmask(SIG_SETMASK, &sigset, &oldset);
+#endif /* Libburn_protect_format_threaD */
+
         burn_disc_format_sync(w->u.format.drive, w->u.format.size,
                                 w->u.format.flag);
         remove_worker(pthread_self());
+
+#ifdef Libburn_protect_format_threaD
+        /* (just in case it would not end with all signals blocked) */
+        pthread_sigmask(SIG_SETMASK, &oldset, NULL);
+#endif /* Libburn_protect_format_threaD */
+
         return NULL;
 }
@@ -566 +604 @@
                         msg, 0, 0);
 
+        remove_worker(pthread_self());
+        d->busy = BURN_DRIVE_IDLE;
+
 #ifdef Libburn_protect_write_threaD
         /* (just in case it would not end with all signals blocked) */
@@ -571 +612 @@
 #endif /* Libburn_protect_write_threaD */
 
-        remove_worker(pthread_self());
-        d->busy = BURN_DRIVE_IDLE;
         return NULL;
 }
@@ -665 +704 @@
         int old;
 
-        pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old);
-        pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, &old);
-                /* Note: Only burn_fifo_abort() shall cancel the fifo thread */
-
-        burn_fifo_source_shoveller(w->u.fifo.source, w->u.fifo.flag);
-        remove_worker(pthread_self());
-        return NULL;
-}
-
-
-int burn_fifo_start(struct burn_source *source, int flag)
-{
-        struct fifo_opts o;
-        struct burn_source_fifo *fs = source->data;
-
 #define Libburn_protect_fifo_threaD 1
 
@@ -685 +709 @@
         sigset_t sigset, oldset;
 
-        /* Protect write thread from being interrupted by external signals */
+        /* Protect fifo thread from being interrupted by external signals */
         sigfillset(&sigset);
         sigdelset(&sigset, SIGSEGV);
@@ -691 +715 @@
         pthread_sigmask(SIG_SETMASK, &sigset, &oldset);
 #endif /* Libburn_protect_fifo_threaD */
+
+        pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, &old);
+        pthread_setcanceltype(PTHREAD_CANCEL_ASYNCHRONOUS, &old);
+                /* Note: Only burn_fifo_abort() shall cancel the fifo thread */
+
+        burn_fifo_source_shoveller(w->u.fifo.source, w->u.fifo.flag);
+        remove_worker(pthread_self());
+
+#ifdef Libburn_protect_fifo_threaD
+        /* (just in case it would not end with all signals blocked) */
+        pthread_sigmask(SIG_SETMASK, &oldset, NULL);
+#endif /* Libburn_protect_fifo_threaD */
+
+        return NULL;
+}
+
+
+int burn_fifo_start(struct burn_source *source, int flag)
+{
+        struct fifo_opts o;
+        struct burn_source_fifo *fs = source->data;
 
         fs->is_started = -1;
@@ -708 +753 @@
         fs->is_started = 1;
 
-#ifdef Libburn_protect_fifo_threaD
-        /* (just in case it would not end with all signals blocked) */
-        pthread_sigmask(SIG_SETMASK, &oldset, NULL);
-#endif /* Libburn_protect_fifo_threaD */
-
         return 1;
 }