Rooba
/
boinc
mirror of https://github.com/BOINC/boinc.git
1
0
Fork 0
Code Issues 1 Packages Projects Releases Wiki Activity

- API: critical section begin/end calls can be nested 

Fixes #508 (from Nicolas)

svn path=/trunk/boinc/; revision=14694
This commit is contained in:
David Anderson 2008-02-06 20:39:10 +00:00
parent 69cfcebef4
commit 54dc8c531a
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
api/boinc_api.C
View File

@ -95,7 +95,7 @@ static volatile int time_until_fraction_done_update;
static volatile double fraction_done; static volatile double fraction_done;
static volatile double last_checkpoint_cpu_time; static volatile double last_checkpoint_cpu_time;
static volatile bool ready_to_checkpoint = false; static volatile bool ready_to_checkpoint = false;
static volatile bool in_critical_section; static volatile int in_critical_section=0;
static volatile double last_wu_cpu_time; static volatile double last_wu_cpu_time;
static volatile bool standalone = false; static volatile bool standalone = false;
static volatile double initial_wu_cpu_time; static volatile double initial_wu_cpu_time;
@ -846,7 +846,7 @@ static void timer_handler() {
if (options.handle_trickle_downs) { if (options.handle_trickle_downs) {
handle_trickle_down_msg(); 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(); handle_process_control_msg();
} }
if (options.backwards_compatible_graphics) { if (options.backwards_compatible_graphics) {
@ -869,7 +869,7 @@ static void timer_handler() {
// see if the core client has died, which means we need to die too // see if the core client has died, which means we need to die too
// (unless we're in a critical section) // (unless we're in a critical section)
// //
if (!in_critical_section && options.check_heartbeat) { if (in_critical_section==0 && options.check_heartbeat) {
if (heartbeat_giveup_time < interrupt_count) { if (heartbeat_giveup_time < interrupt_count) {
fprintf(stderr, fprintf(stderr,
"No heartbeat from core client for 30 sec - exiting\n" "No heartbeat from core client for 30 sec - exiting\n"
@ -942,7 +942,7 @@ static void worker_signal_handler(int) {
boinc_exit(worker_thread_exit_status); boinc_exit(worker_thread_exit_status);
} }
if (options.direct_process_action) { 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 sleep(1); // don't use boinc_sleep() because it does FP math
} }
} }
@ -1045,7 +1045,7 @@ int boinc_send_trickle_up(char* variety, char* p) {
int boinc_time_to_checkpoint() { int boinc_time_to_checkpoint() {
if (ready_to_checkpoint) { if (ready_to_checkpoint) {
in_critical_section = true; boinc_begin_critical_section();
return 1; return 1;
} }
return 0; return 0;
@ -1057,18 +1057,21 @@ int boinc_checkpoint_completed() {
last_wu_cpu_time = cur_cpu + aid.wu_cpu_time; last_wu_cpu_time = cur_cpu + aid.wu_cpu_time;
last_checkpoint_cpu_time = last_wu_cpu_time; last_checkpoint_cpu_time = last_wu_cpu_time;
time_until_checkpoint = (int)aid.checkpoint_period; time_until_checkpoint = (int)aid.checkpoint_period;
in_critical_section = false; boinc_end_critical_section();
ready_to_checkpoint = false; ready_to_checkpoint = false;
return 0; return 0;
} }
void boinc_begin_critical_section() { void boinc_begin_critical_section() {
in_critical_section = true; in_critical_section++;
} }
void boinc_end_critical_section() { void boinc_end_critical_section() {
in_critical_section = false; in_critical_section--;
if (in_critical_section < 0) {
in_critical_section = 0; // just in case
}
} }
int boinc_fraction_done(double x) { int boinc_fraction_done(double x) {

7
checkin_notes
View File

@ -1250,3 +1250,10 @@ David Feb 6 2008
setup_project.py setup_project.py
tools/ tools/
sign_executable.C sign_executable.C
David Feb 6 2008
- API: critical section begin/end calls can be nested
Fixes #508 (from Nicolas)
api/
boinc_api.C