Merge lp:~marcustomlinson/process-cpp/set_mask_on_restore into lp:process-cpp

[Marcus Tomlinson]

Use SIG_BLOCK when adding to the signal mask, and SIG_SETMASK when restoring the old mask.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:55
http://jenkins.qa.ubuntu.com/job/process-cpp-ci/72/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/process-cpp-utopic-amd64-ci/11
    FAILURE: http://jenkins.qa.ubuntu.com/job/process-cpp-utopic-armhf-ci/11/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/process-cpp-utopic-i386-ci/11/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/process-cpp-ci/72/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:55
http://jenkins.qa.ubuntu.com/job/process-cpp-ci/73/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/process-cpp-utopic-amd64-ci/12
    FAILURE: http://jenkins.qa.ubuntu.com/job/process-cpp-utopic-armhf-ci/12/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/process-cpp-utopic-i386-ci/12

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/process-cpp-ci/73/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:55
http://jenkins.qa.ubuntu.com/job/process-cpp-ci/74/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/process-cpp-utopic-amd64-ci/13
    FAILURE: http://jenkins.qa.ubuntu.com/job/process-cpp-utopic-armhf-ci/13/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/process-cpp-utopic-i386-ci/13

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/process-cpp-ci/74/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:55
http://jenkins.qa.ubuntu.com/job/process-cpp-ci/75/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/process-cpp-utopic-amd64-ci/14
    SUCCESS: http://jenkins.qa.ubuntu.com/job/process-cpp-utopic-armhf-ci/14
        deb: http://jenkins.qa.ubuntu.com/job/process-cpp-utopic-armhf-ci/14/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/process-cpp-utopic-i386-ci/14

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/process-cpp-ci/75/rebuild

review: Approve (continuous-integration)

Unmerged revisions

55. By Marcus Tomlinson on 2014-08-08

Use SIG_BLOCK when adding to the signal mask, and SIG_SETMASK when restoring the old mask.

=== modified file 'src/core/posix/signal.cpp'
--- src/core/posix/signal.cpp	2014-03-25 13:23:46 +0000
+++ src/core/posix/signal.cpp	2014-08-08 08:01:25 +0000
@@ -31,11 +31,21 @@
 {
 void set_thread_signal_mask(::sigset_t* new_mask, ::sigset_t* old_mask)
 {
+    ::pthread_sigmask(SIG_SETMASK, new_mask, old_mask);
+}
+
+void add_thread_signal_mask(::sigset_t* new_mask, ::sigset_t* old_mask)
+{
     ::pthread_sigmask(SIG_BLOCK, new_mask, old_mask);
 }
 
 void set_process_signal_mask(::sigset_t* new_mask, ::sigset_t* old_mask)
 {
+    ::sigprocmask(SIG_SETMASK, new_mask, old_mask);
+}
+
+void add_process_signal_mask(::sigset_t* new_mask, ::sigset_t* old_mask)
+{
     ::sigprocmask(SIG_BLOCK, new_mask, old_mask);
 }
 
@@ -70,10 +80,10 @@
         switch (scope)
         {
         case Scope::process:
-            set_process_signal_mask(&blocked_signals_mask, &old_signals_mask);
+            add_process_signal_mask(&blocked_signals_mask, &old_signals_mask);
             break;
         case Scope::thread:
-            set_thread_signal_mask(&blocked_signals_mask, &old_signals_mask);
+            add_thread_signal_mask(&blocked_signals_mask, &old_signals_mask);
             break;
         }
     }