From f9d03a24ac952cd2f5e2acbe7fb4db203bc615b4 Mon Sep 17 00:00:00 2001 From: Walt Gribben Date: Tue, 14 Mar 2006 00:46:41 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=9643 --- api/boinc_api.C | 5 ++++- checkin_notes | 12 ++++++++++++ client/client_state.C | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/api/boinc_api.C b/api/boinc_api.C index 3d4b351b54..723b101b3f 100644 --- a/api/boinc_api.C +++ b/api/boinc_api.C @@ -394,12 +394,15 @@ void boinc_exit(int status) { // file_lock.unlock(LOCKFILE); + // flush all the output buffers + // + fflush(NULL); + // on Mac, calling exit() can lead to infinite exit-atexit loops, // while _exit() seems to behave nicely. // This is not pretty but unless someone finds a cleaner solution, // we handle the Mac-case separately . #ifdef __APPLE_CC__ - fflush(NULL); _exit(status); #else #ifdef _WIN32 diff --git a/checkin_notes b/checkin_notes index 16c5450af2..410b674704 100755 --- a/checkin_notes +++ b/checkin_notes @@ -2821,3 +2821,15 @@ David 13 Mar 2006 api/ boinc_api.C,h graphics_lib.C + +Walt 13 Mar 2006 + - Bug Fix: in boinc-exit, all platforms, call fflush(NULL) so + output buffers get flushed. Moves the call outside the #ifdef. + - Bug Fix: Account manager shouldn't be contacted if the network + is suspended. This affects the automatic (every hour) + connections only. + + api/ + boinc_api.C + client/ + client_state.C diff --git a/client/client_state.C b/client/client_state.C index 43be467771..d018608b48 100644 --- a/client/client_state.C +++ b/client/client_state.C @@ -497,9 +497,9 @@ bool CLIENT_STATE::poll_slow_events() { POLL_ACTION(garbage_collect , garbage_collect ); POLL_ACTION(update_results , update_results ); POLL_ACTION(gui_http , gui_http.poll ); - POLL_ACTION(acct_mgr , acct_mgr_info.poll ); if (!network_suspended) { net_stats.poll(*file_xfers, *net_xfers); + POLL_ACTION(acct_mgr , acct_mgr_info.poll ); POLL_ACTION(file_xfers , file_xfers->poll ); POLL_ACTION(pers_file_xfers , pers_file_xfers->poll ); POLL_ACTION(handle_pers_file_xfers , handle_pers_file_xfers );