diff --git a/client/scheduler_op.C b/client/scheduler_op.C index e51fd6bf9a..4665cc3a13 100644 --- a/client/scheduler_op.C +++ b/client/scheduler_op.C @@ -309,7 +309,7 @@ bool SCHEDULER_OP::poll() { int retval, nresults; vector urls; bool changed, scheduler_op_done; - bool action = false; + bool action = false, err = false; char err_msg[256],*err_url; switch(state) { @@ -334,6 +334,7 @@ bool SCHEDULER_OP::poll() { // if (project->tentative) { project_add_failed(project); + err = true; } else { project->master_fetch_failures++; backoff(project, "Master file parse failed\n"); @@ -360,7 +361,7 @@ bool SCHEDULER_OP::poll() { // If don't have any schedulers for this project, // it may be the wrong URL. notify the user // - if (project->scheduler_urls.size() == 0) { + if (project->scheduler_urls.size() == 0 && !err) { if (project->tentative) { project_add_failed(project); } else { diff --git a/client/win/wingui_mainwindow.cpp b/client/win/wingui_mainwindow.cpp index 196eb7f8bf..7e2c3ea6b0 100755 --- a/client/win/wingui_mainwindow.cpp +++ b/client/win/wingui_mainwindow.cpp @@ -1155,10 +1155,17 @@ void CMainWindow::OnCommandProjectDetach() if (!proj) return; strBuf.Format("Are you sure you want to detach from the project %s?", proj->get_project_name()); - if(AfxMessageBox(strBuf, MB_YESNO, 0) == IDYES) { - ClearProjectItems(proj->master_url); - gstate.detach_project(proj); - } + if(AfxMessageBox(strBuf, MB_YESNO, 0) == IDYES) DetachProject(proj); +} + +////////// +// CMainWindow::DetachProject +// arguments: void +// returns: void +// function: detaches from a project and clears its items +void CMainWindow::DetachProject(PROJECT *proj) { + ClearProjectItems(proj->master_url); + gstate.detach_project(proj); } ////////// @@ -1735,5 +1742,21 @@ void delete_curtain() { } void project_add_failed(PROJECT* project) { + char buf[512]; + if (project->scheduler_urls.size()) { + sprintf( buf, + "BOINC failed to log in to %s.\n" + "Please check your account ID and try again.", + project->master_url + ); + } else { + sprintf( buf, + "BOINC couldn't get main page for %s.\n" + "Please check the URL and try again.", + project->master_url + ); + } + AfxMessageBox(buf); + g_myWnd->DetachProject(project); // TODO: To be filled in } diff --git a/client/win/wingui_mainwindow.h b/client/win/wingui_mainwindow.h index 0895abd7ea..9334c0d3dc 100755 --- a/client/win/wingui_mainwindow.h +++ b/client/win/wingui_mainwindow.h @@ -88,6 +88,7 @@ public: void MessageUser(char*,char*,int); BOOL IsSuspended(); BOOL RequestNetConnect(); + void DetachProject(PROJECT *); UINT m_nNetActivityMsg; // ID of net activity message CSSWindow* m_pSSWnd; // default graphics window diff --git a/todo b/todo index fa8b6be795..838e7eaf1f 100755 --- a/todo +++ b/todo @@ -3,7 +3,8 @@ BUGS (arranged from high to low priority) ----------------------- Matt's Bugs: 1. suddenly slow graphics (graphics are plotting smoothly, but after -several "show graphics" the plots become really slow). +several "show graphics" the plots become really slow). Graphics getting +reeeeeally slow over time. Even after stop/restart. 3. after minimizing and quitting, when I double click on the system tray icon the window is still minimized - a bit confusing. @@ -21,17 +22,9 @@ the resize buttons, etc. don't work as they are supposed to. 8. "suspend" seems to suspend, but after restart the CPU time jumped up by a significant amount. -9. Graphics getting reeeeeally slow over time. Even after stop/restart. - -10. I was able to sign up for project "http://www.lebofsky.com" which -isn't really a project. I know it's difficult, but there should be *some* -feedback if a URL doesn't immediately resemble a real project. - 11. When trying to detach from "http://www.lebofsky.com" I got a seg fault -and BOINC crashed. - -12. After restarting BOINC I was able to detach from lebofsky.com without -any ado. +and BOINC crashed. After restarting BOINC I was able to detach from +lebofsky.com without any ado. 13. For kicks I was busy running astropulse and then chose to log on to project and entered the astropulse URL again. I was expecting BOINC to @@ -48,6 +41,11 @@ the workunits showed the same CPU time as before, 0% done, and the status results uploaded. So it looks like a state file somewhere is not being deleted. +15. After running all night (on Win98) I shook the mouse to wake up the +blank screen, and all I saw was the top half of the screen was solid +gray, and the bottom half the bottom half of the astropulse graphics. +They weren't moving. The computer was frozen. I had to ctrl-alt-del +to restart. - If BOINC starts up before the taskbar is available, it is inaccessible - GUI client should display "Upload failed" and "Download failed" @@ -61,15 +59,6 @@ deleted. - document and add to global prefs? run_minimized hangup_if_dialed -- consider warning message during windows (and perhaps other platforms) - install that checks to see if the BOINC directory already exists, - and if so, should the user overwrite it? or upgrade it? -- After running all night (on Win98) I shook the mouse to wake up - the blank screen, and all I saw was the top half of the screen - was solid gray, and the bottom half the - bottom half of the astropulse graphics. - They weren't moving. The computer was frozen. - I had to ctrl-alt-del to restart. ----------------------- HIGH-PRIORITY (should do for beta test) @@ -149,8 +138,6 @@ MEDIUM-PRIORITY (should do before public release) change show_message to use vsprintf -fix bug in test_backend.php where result gets sent twice - add an RPC to verify an account ID (returns DB ID for user) needed for multi-project stats sites @@ -293,6 +280,15 @@ test HTTP redirect mechanism for all types of ops Add batch features to ops web +The Windows installer sometimes leave boinc.# files in the BOINC +directory. This is likely due to the installer not being able to +delete the old boinc.dll file + +If a client connects to the scheduling server using default prefs, +use the stored user prefs for determining how much work to send + +Windows client crashes if application fails to start up (CreateProcess) + ----------------------- LONG-TERM IDEAS AND PROJECTS -----------------------