Ticket #508: recursive-critical-sections3.diff

api/boinc_api.C

@@ -96 +96 @@
 static volatile double fraction_done;
 static volatile double last_checkpoint_cpu_time;
 static volatile bool ready_to_checkpoint = false;
-static volatile bool in_critical_section;
+static volatile int in_critical_section;
 static volatile double last_wu_cpu_time;
 static volatile bool standalone          = false;
 static volatile double initial_wu_cpu_time;
@@ -866 +866 @@
         if (options.handle_trickle_downs) {
             handle_trickle_down_msg();
         }
-        if (!in_critical_section && options.handle_process_control) {
+        if (in_critical_section == 0 && options.handle_process_control) {
             handle_process_control_msg();
         }
         if (options.backwards_compatible_graphics) {
@@ -877 +877 @@
     // see if the core client has died, which means we need to die too
     // (unless we're in a critical section)
     //
-    if (!in_critical_section && options.check_heartbeat && heartbeat_active) {
+    if (in_critical_section == 0 && options.check_heartbeat && heartbeat_active) {
         if (heartbeat_giveup_time < interrupt_count) {
             fprintf(stderr,
                 "No heartbeat from core client for %d sec - exiting\n",
@@ -947 +947 @@
 //
 void worker_signal_handler(int) {
     if (options.direct_process_action) {
-        while (boinc_status.suspended && !in_critical_section) {
+        while (boinc_status.suspended && in_critical_section == 0) {
             sleep(1);   // don't use boinc_sleep() because it does FP math
         }
     }
@@ -1050 +1050 @@
 //
 int boinc_time_to_checkpoint() {
     if (ready_to_checkpoint) {
-        in_critical_section = true;
+        boinc_begin_critical_section();
         return 1;
     }
     return 0;
@@ -1065 +1065 @@
         update_app_progress(last_checkpoint_cpu_time, last_checkpoint_cpu_time);
     }
     time_until_checkpoint = (int)aid.checkpoint_period;
-    in_critical_section = false;
+    boinc_end_critical_section();
     ready_to_checkpoint = false;
 
     return 0;
 }
 
 void boinc_begin_critical_section() {
-    in_critical_section = true;
+    in_critical_section++;
 }
 
 void boinc_end_critical_section() {
-    in_critical_section = false;
+    in_critical_section--;
+    //just in case...
+    if (in_critical_section < 0) {
+        in_critical_section = 0;
+    }
 }
 
 int boinc_fraction_done(double x) {