[SCM] BOINC packaging branch, master, updated. debian/6.10.17+dfsg-3-211-ge598e81

[Steffen Moeller]

The following commit has been merged in the master branch:
commit c06794518c2342a226881d44b1a36a8189d6257e
Merge: db13c2cd935132ce9dcd93db9924d73d128cbe5a 6b9a242ebe3feeb92671baa2964c339c416624ef
Author: Steffen Moeller <moeller at debian.org>
Date:   Tue Mar 29 16:59:40 2011 +0200

    Merge commit 'upstream/6.12.19+dfsg'

diff --combined clientscr/mac_saver_module.cpp
index 52e2b68,b59ad77..abc962e
--- a/clientscr/mac_saver_module.cpp
+++ b/clientscr/mac_saver_module.cpp
@@@ -30,6 -30,7 +30,6 @@@
  #include <unistd.h>
  #include <limits.h>
  #include <sys/stat.h>
 -#include <sys/param.h>  // for MAXPATHLEN
  
  #include "gui_rpc_client.h"
  #include "common_defs.h"
@@@ -230,7 -231,8 +230,8 @@@ CScreensaver::CScreensaver() 
      m_CoreClientPID = nil;
      setSSMessageText(0);
      m_CurrentBannerMessage = 0;
-     m_QuitDataManagementProc = false;
+     m_bQuitDataManagementProc = false;
+     m_bDataManagementProcStopped = false;
      m_BrandText = "BOINC";
      
      m_hDataManagementThread = NULL;
@@@ -295,7 -297,8 +296,8 @@@ int CScreensaver::Create() 
          if (saverState == SaverState_LaunchingCoreClient)
          {
              SetError(FALSE, 0);
-             m_QuitDataManagementProc = false;
+             m_bQuitDataManagementProc = false;
+             m_bDataManagementProcStopped = false;
              if (rpc == NULL) {
                  rpc = new RPC_CLIENT;
              }
@@@ -562,7 -565,7 +564,7 @@@ void CScreensaver::ShutdownSaver() 
      m_CoreClientPID = 0;
  //    gQuitCounter = 0;
      m_wasAlreadyRunning = false;
-     m_QuitDataManagementProc = false;
+     m_bQuitDataManagementProc = false;
      saverState = SaverState_Idle;
  }
  
@@@ -603,7 -606,7 +605,7 @@@ void CScreensaver::HandleRPCError() 
      // If Core Client is hung, it might cause RPCs to hang, preventing us from 
      // shutting down the Data Management Thread, so don't reinitialize the RPC 
      // client if we have told the Data Management Thread to exit.
-     if (m_QuitDataManagementProc) {
+     if (m_bQuitDataManagementProc) {
          return;
      }
      
@@@ -638,20 -641,19 +640,19 @@@ bool CScreensaver::CreateDataManagement
  
  
  bool CScreensaver::DestroyDataManagementThread() {
-     int i;
-     
-     m_QuitDataManagementProc = true;  // Tell DataManagementProc thread to exit
-     
-     for (i=0; i<10; i++) {  // Wait up to 1 second for DataManagementProc thread to exit
-         if (m_hDataManagementThread == NULL) return true;
+     m_bQuitDataManagementProc = true;  // Tell DataManagementProc thread to exit
+     for (int i=0; i<10; i++) {  // Wait up to 1 second for DataManagementProc thread to exit
+         if (m_bDataManagementProcStopped) return true;
          boinc_sleep(0.1);
      }
+ 
      rpc->close();    // In case DataManagementProc is hung waiting for RPC
      m_hDataManagementThread = NULL; // Don't delay more if this routine is called again.
      if (m_hGraphicsApplication) {
          terminate_screensaver(m_hGraphicsApplication, NULL);
          m_hGraphicsApplication = 0;
      }
+ 
      return true;
  }
  
@@@ -869,4 -871,4 +870,4 @@@ void PrintBacktrace(void) 
  // Dummy routine to satisfy linker
  }
  
- const char *BOINC_RCSID_7ce0778d35="$Id: mac_saver_module.cpp 22679 2010-11-11 11:58:41Z charlief $";
+ const char *BOINC_RCSID_7ce0778d35="$Id: mac_saver_module.cpp 23274 2011-03-25 18:03:01Z romw $";

-- 
BOINC packaging