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

MGR: Delete RPCThread::OnExit(); add new source files to XCode Project 

svn path=/trunk/boinc/; revision=17604
This commit is contained in:
Charlie Fenton 2009-03-17 08:38:18 +00:00
parent 737fe593bc
commit d37dfda290
4 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
checkin_notes
View File

@ -3065,3 +3065,15 @@ Charlie 16 Mar 2009
clientgui/
AsyncRPC.cpp
Charlie 17 Mar 2009
- MGR: Delete RPCThread::OnExit() because it is not called on Windows
for some reason.
- Mac: add new source files ViewNews.cpp, ViewNews.h to XCode Project.
clientgui/
AsyncRPC.cpp
mac_build/
boinc.xcodeproj/
project.pbxproj

12
clientgui/AsyncRPC.cpp
View File

@ -115,12 +115,6 @@ RPCThread::RPCThread(CMainDocument *pDoc,
}
void RPCThread::OnExit() {
// Tell CMainDocument that thread has gracefully ended
m_pDoc->m_RPCThread = NULL;
}
void *RPCThread::Entry() {
int retval = 0;
CRPCFinishedEvent RPC_done_event( wxEVT_RPC_FINISHED );
@ -139,6 +133,10 @@ void *RPCThread::Entry() {
wxASSERT(condErr == wxCOND_NO_ERROR);
if (m_pDoc->m_bShutDownRPCThread) {
m_pRPC_Thread_Mutex->Unlock(); // Just for safety - not really needed
// Tell CMainDocument that thread has gracefully ended
// We do this here because OnExit() is not called on Windows
m_pDoc->m_RPCThread = NULL;
Exit();
}
@ -614,8 +612,8 @@ void CMainDocument::KillRPCThread() {
current_rpc_request.clear();
wxStopWatch ThreadDeleteTimer = wxStopWatch();
// RPC thread sets m_RPCThread to NULL when it exits
// RPC thread sets m_RPCThread to NULL when it exits
while (m_RPCThread) {
// Wait up to RPC_KILL_DELAY for thread to exit on its own
if (ThreadDeleteTimer.Time() > RPC_KILL_DELAY) {

1
clientgui/AsyncRPC.h
View File

@ -294,7 +294,6 @@ public:
wxCondition* RPC_Request_Condition
);
virtual void *Entry();
virtual void OnExit();
private:
int ProcessRPCRequest();

6
mac_build/boinc.xcodeproj/project.pbxproj
View File

@ -60,6 +60,7 @@
DD33C6F808B5BB4500768630 /* acct_setup.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD33C6F708B5BB4500768630 /* acct_setup.cpp */; };
DD33C70408B5BEDE00768630 /* http_curl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD33C70208B5BEDE00768630 /* http_curl.cpp */; };
DD35353607E1E13F00C4718D /* boinc_api.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F5755AD302FE063A012012A7 /* boinc_api.cpp */; };
DD377E090F6F95650089CE9A /* ViewNews.cpp in Sources */ = {isa = PBXBuildFile; fileRef = DD377E070F6F95650089CE9A /* ViewNews.cpp */; };
DD3E14DB0A774397007E0084 /* boinc in Resources */ = {isa = PBXBuildFile; fileRef = DDD74D8707CF482E0065AC9D /* boinc */; };
DD3E14DC0A774397007E0084 /* BOINCMgr.icns in Resources */ = {isa = PBXBuildFile; fileRef = DDF3028907CCCE2C00701169 /* BOINCMgr.icns */; };
DD3E14DD0A774397007E0084 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F51BDF4903086C46012012A7 /* InfoPlist.strings */; };
@ -652,6 +653,8 @@
DD344BEE07C5B1770043025C /* proxy_info.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = proxy_info.h; path = ../lib/proxy_info.h; sourceTree = SOURCE_ROOT; };
DD344BEF07C5B1770043025C /* proxy_info.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = proxy_info.cpp; sourceTree = "<group>"; };
DD35353107E1E05C00C4718D /* libboinc_api.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libboinc_api.a; sourceTree = BUILT_PRODUCTS_DIR; };
DD377E070F6F95650089CE9A /* ViewNews.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ViewNews.cpp; path = ../clientgui/ViewNews.cpp; sourceTree = SOURCE_ROOT; };
DD377E080F6F95650089CE9A /* ViewNews.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ViewNews.h; path = ../clientgui/ViewNews.h; sourceTree = SOURCE_ROOT; };
DD3E15420A774397007E0084 /* BOINCManager.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BOINCManager.app; sourceTree = BUILT_PRODUCTS_DIR; };
DD407A4A07D2FB1200163EF5 /* libboinc.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libboinc.a; sourceTree = BUILT_PRODUCTS_DIR; };
DD407AB707D2FC7D00163EF5 /* mem_usage.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = mem_usage.cpp; sourceTree = "<group>"; };
@ -1350,6 +1353,8 @@
DD81C46507C5D29F0098A04D /* ValidateURL.h */,
DD81C42507C5D1D70098A04D /* ViewMessages.cpp */,
DD81C46407C5D29F0098A04D /* ViewMessages.h */,
DD377E070F6F95650089CE9A /* ViewNews.cpp */,
DD377E080F6F95650089CE9A /* ViewNews.h */,
DDD52DC40C03CAE6009B5FC0 /* ViewProjects.cpp */,
DDD52DC50C03CAE6009B5FC0 /* ViewProjects.h */,
DD81C42307C5D1D70098A04D /* ViewResources.cpp */,
@ -2400,6 +2405,7 @@
DDC132F30E2DAB1B0014D305 /* AsyncRPC.cpp in Sources */,
DDDE43B10EC04C1800083520 /* DlgExitMessage.cpp in Sources */,
DDC836E60EDEA5DB001C2EF9 /* TermsOfUsePage.cpp in Sources */,
DD377E090F6F95650089CE9A /* ViewNews.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};