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

- client: fix bug that caused project attach to fail 

- clientgui: Rom, we should do error-checking of most GUI RPCs;
		look for REPORT ERROR in ProjectProcessingPage.cpp

svn path=/trunk/boinc/; revision=24059
This commit is contained in:
David Anderson 2011-08-27 18:32:47 +00:00
parent bd0897b92c
commit 0476254e15
4 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
checkin_notes
View File

@ -5181,3 +5181,14 @@ David 26 Aug 2011
AccountManagerProcessingPage.cpp,h
client/
client_types.cpp
David 26 Aug 2011
- client: fix bug that caused project attach to fail
- clientgui: Rom, we should do error-checking of most GUI RPCs;
look for REPORT ERROR in ProjectProcessingPage.cpp
client/
acct_setup.cpp
coproc_detect.cpp
clientgui/
ProjectProcessingPage.cpp

12
client/acct_setup.cpp
View File

@ -85,12 +85,12 @@ void ACCOUNT_IN::parse(XML_PARSER& xp) {
user_name = "";
team_name = "";
while (xp.get_tag()) {
if (xp.parse_string("<url>", url)) continue;
if (xp.parse_string("<email_addr>", email_addr)) continue;
if (xp.parse_string("<passwd_hash>", passwd_hash)) continue;
if (xp.parse_string("<user_name>", user_name)) continue;
if (xp.parse_string("<team_name>", team_name)) continue;
while (!xp.get_tag()) {
if (xp.parse_string("url", url)) continue;
if (xp.parse_string("email_addr", email_addr)) continue;
if (xp.parse_string("passwd_hash", passwd_hash)) continue;
if (xp.parse_string("user_name", user_name)) continue;
if (xp.parse_string("team_name", team_name)) continue;
}
canonicalize_master_url(url);
}

1
client/coproc_detect.cpp
View File

@ -753,7 +753,6 @@ void COPROC_NVIDIA::get(
#ifndef SIM
NvAPI_Status nvapiStatus;
NvDisplayHandle hDisplay;
NV_DISPLAY_DRIVER_VERSION Version;
memset(&Version, 0, sizeof(Version));
Version.version = NV_DISPLAY_DRIVER_VERSION_VER;

32
clientgui/ProjectProcessingPage.cpp
View File

@ -357,7 +357,7 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE
wxDateTime dtCurrentExecutionTime;
wxTimeSpan tsExecutionTime;
bool bPostNewEvent = true;
int iReturnValue = 0;
int retval = 0;
bool creating_account = false;
wxASSERT(pDoc);
@ -418,10 +418,10 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE
dtStartExecutionTime = wxDateTime::Now();
dtCurrentExecutionTime = wxDateTime::Now();
tsExecutionTime = dtCurrentExecutionTime - dtStartExecutionTime;
iReturnValue = 0;
retval = 0;
ao->error_num = ERR_RETRY;
while (
!iReturnValue &&
!retval &&
((ERR_IN_PROGRESS == ao->error_num) || (ERR_RETRY == ao->error_num)) &&
tsExecutionTime.GetSeconds() <= 60 &&
!CHECK_CLOSINGINPROGRESS()
@ -432,7 +432,7 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE
dtCurrentExecutionTime = wxDateTime::Now();
tsExecutionTime = dtCurrentExecutionTime - dtStartExecutionTime;
iReturnValue = pDoc->rpc.create_account_poll(*ao);
retval = pDoc->rpc.create_account_poll(*ao);
IncrementProgress(m_pProgressIndicator);
@ -440,7 +440,7 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE
::wxSafeYield(GetParent());
}
if ((!iReturnValue) && !ao->error_num) {
if ((!retval) && !ao->error_num) {
pWA->SetAccountCreatedSuccessfully(true);
}
} else {
@ -450,21 +450,24 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE
dtStartExecutionTime = wxDateTime::Now();
dtCurrentExecutionTime = wxDateTime::Now();
tsExecutionTime = dtCurrentExecutionTime - dtStartExecutionTime;
iReturnValue = 0;
retval = 0;
ao->error_num = ERR_RETRY;
while (
!iReturnValue &&
!retval &&
((ERR_IN_PROGRESS == ao->error_num) || (ERR_RETRY == ao->error_num)) &&
tsExecutionTime.GetSeconds() <= 60 &&
!CHECK_CLOSINGINPROGRESS()
) {
if (ERR_RETRY == ao->error_num) {
pDoc->rpc.lookup_account(*ai);
retval = pDoc->rpc.lookup_account(*ai);
if (retval) {
// REPORT ERROR
}
}
dtCurrentExecutionTime = wxDateTime::Now();
tsExecutionTime = dtCurrentExecutionTime - dtStartExecutionTime;
iReturnValue = pDoc->rpc.lookup_account_poll(*ao);
retval = pDoc->rpc.lookup_account_poll(*ao);
IncrementProgress(m_pProgressIndicator);
@ -473,7 +476,8 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE
}
}
if ((!iReturnValue) && !ao->error_num) {
if ((!retval) && !ao->error_num) {
SetProjectCommunicationsSucceeded(true);
} else {
SetProjectCommunicationsSucceeded(false);
@ -524,10 +528,10 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE
dtStartExecutionTime = wxDateTime::Now();
dtCurrentExecutionTime = wxDateTime::Now();
tsExecutionTime = dtCurrentExecutionTime - dtStartExecutionTime;
iReturnValue = 0;
retval = 0;
reply.error_num = ERR_RETRY;
while (
!iReturnValue &&
!retval &&
((ERR_IN_PROGRESS == reply.error_num) || (ERR_RETRY == reply.error_num)) &&
tsExecutionTime.GetSeconds() <= 60 &&
!CHECK_CLOSINGINPROGRESS()
@ -546,7 +550,7 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE
dtCurrentExecutionTime = wxDateTime::Now();
tsExecutionTime = dtCurrentExecutionTime - dtStartExecutionTime;
iReturnValue = pDoc->rpc.project_attach_poll(reply);
retval = pDoc->rpc.project_attach_poll(reply);
IncrementProgress(m_pProgressIndicator);
@ -554,7 +558,7 @@ void CProjectProcessingPage::OnStateChange( CProjectProcessingPageEvent& WXUNUSE
::wxSafeYield(GetParent());
}
if (!iReturnValue && !reply.error_num) {
if (!retval && !reply.error_num) {
SetProjectAttachSucceeded(true);
pWA->SetAttachedToProjectSuccessfully(true);
pWA->SetProjectURL(wxString(ai->url.c_str(), wxConvUTF8));