Ticket #139: trac139_6_8.patch

client/boinc_cmd.cpp

@@ -72 +72 @@
- --result url result_name op        job operation\n\
-   op = suspend | resume | abort | graphics_window | graphics_fullscreen\n\
- --project URL op                   project operation\n\
-
+etwork_suspend | network_resume | n
- --file_transfer URL filename op    file transfer operation\n\
-   op = retry | abort\n\
- --set_run_mode mode duration       set run mode for given duration\n\
@@ -268 +268 @@
-            retval = rpc.project_op(project, "suspend");
-        } else if (!strcmp(op, "resume")) {
-            retval = rpc.project_op(project, "resume");
+        } else if (!strcmp(op, "network_suspend")) {
+            retval = rpc.project_op(project, "network_suspend");
+        } else if (!strcmp(op, "network_resume")) {
+            retval = rpc.project_op(project, "network_resume");
-        } else if (!strcmp(op, "detach")) {
-            retval = rpc.project_op(project, "detach");
-        } else if (!strcmp(op, "update")) {
-            retval = rpc.project_op(project, "update");
-        } else if (!strcmp(op, "suspend")) {
-            retval = rpc.project_op(project, "suspend");
-        } else if (!strcmp(op, "resume")) {
-            retval = rpc.project_op(project, "resume");
-        } else if (!strcmp(op, "nomorework")) {
-            retval = rpc.project_op(project, "nomorework");
-        } else if (!strcmp(op, "allowmorework")) {

client/client_types.cpp

@@ -102 +102 @@
-    send_time_stats_log = 0;
-    send_job_log = 0;
-    suspended_via_gui = false;
+    network_suspended_via_gui = false;
-    dont_request_more_work = false;
-    detach_when_done = false;
-    attached_via_acct_mgr = false;
@@ -181 +182 @@
-        if (parse_bool(buf, "non_cpu_intensive", non_cpu_intensive)) continue;
-        if (parse_bool(buf, "verify_files_on_app_start", verify_files_on_app_start)) continue;
-        if (parse_bool(buf, "suspended_via_gui", suspended_via_gui)) continue;
+        if (parse_bool(buf, "network_suspended_via_gui", network_suspended_via_gui)) continue;
-        if (parse_bool(buf, "dont_request_more_work", dont_request_more_work)) continue;
-        if (parse_bool(buf, "detach_when_done", detach_when_done)) continue;
-        if (parse_bool(buf, "ended", ended)) continue;
@@ -253 +255 @@
-                "    <sched_rpc_pending>%d</sched_rpc_pending>\n"
-                "    <send_time_stats_log>%d</send_time_stats_log>\n"
-                "    <send_job_log>%d</send_job_log>\n"
-
+%s
-        master_url,
-        project_name,
-        symstore,
@@ -289 +291 @@
-        non_cpu_intensive?"    <non_cpu_intensive/>\n":"",
-        verify_files_on_app_start?"    <verify_files_on_app_start/>\n":"",
-        suspended_via_gui?"    <suspended_via_gui/>\n":"",
+        network_suspended_via_gui?"    <network_suspended_via_gui/>\n":"",
-        dont_request_more_work?"    <dont_request_more_work/>\n":"",
-        detach_when_done?"    <detach_when_done/>\n":"",
-        ended?"    <ended/>\n":"",
@@ -365 +368 @@
-    non_cpu_intensive = p.non_cpu_intensive;
-    verify_files_on_app_start = p.verify_files_on_app_start;
-    suspended_via_gui = p.suspended_via_gui;
+    network_suspended_via_gui = p.network_suspended_via_gui;
-    dont_request_more_work = p.dont_request_more_work;
-    detach_when_done = p.detach_when_done;
-    attached_via_acct_mgr = p.attached_via_acct_mgr;

client/client_types.h

@@ -266 +266 @@
-    int send_job_log;
-
-    bool suspended_via_gui;
+    bool network_suspended_via_gui;
-        /// Return work, but don't request more
-        /// Used for a clean exit to a project,
-        /// or if a user wants to pause doing work for the project

client/cs_files.cpp

@@ -262 +262 @@
-            fip->pers_file_xfer = pfx;
-            pers_file_xfers->insert(fip->pers_file_xfer);
-            action = true;
-
+
+
+
+
-            pfx = new PERS_FILE_XFER;
-            pfx->init(fip, true);
-            fip->pers_file_xfer = pfx;
@@ -279 +282 @@
-    iter = pers_file_xfers->pers_file_xfers.begin();
-    while (iter != pers_file_xfers->pers_file_xfers.end()) {
-        pfx = *iter;
+        fip = pfx->fip;
-
-        // If the transfer finished, remove the PERS_FILE_XFER object
-        // from the set and delete it
-        //
-        if (pfx->pers_xfer_done) {
-            fip = pfx->fip;
-            if (fip->generated_locally || fip->upload_when_present) {
-                // file has been uploaded - delete if not sticky
-                //
@@ -331 +334 @@
-            action = true;
-            // `delete pfx' should have set pfx->fip->pfx to NULL
-            assert (fip == NULL || fip->pers_file_xfer == NULL);
+        } else if ((!pfx->fxp || pfx->fxp->http_op_done()) &&
+                   pfx->is_upload &&
+                   fip->project->network_suspended_via_gui) {
+            // Reset persistent file upload if networking
+            // has been disabled for the project
+            msg_printf(fip->project, MSG_INFO,
+                "Project networking suspended, suspend upload and reset timer for %s", fip->name
+            );
+            iter = pers_file_xfers->pers_file_xfers.erase(iter);
+            delete pfx;
+            action = true;
+            // `delete pfx' should have set pfx->fip->pfx to NULL
+            assert (fip == NULL || fip->pers_file_xfer == NULL);
-        } else {
-            iter++;
-        }

client/cs_scheduler.cpp

@@ -1006 +1006 @@
-        p = projects[i];
-        if (p->waiting_until_min_rpc_time()) continue;
-        if (p->suspended_via_gui) continue;
+        if (p->network_suspended_via_gui) continue;
-        if (p->master_url_fetch_pending) {
-            return p;
-        }
@@ -1058 +1059 @@
-        if (honor_suspend && p->suspended_via_gui) {
-            continue;
-        }
+        if (honor_suspend && p->network_suspended_via_gui) {
+            continue;
+        }
-        if (p->sched_rpc_pending) {
-            return p;
-        }
@@ -1073 +1077 @@
-        p = projects[i];
-        if (p->waiting_until_min_rpc_time()) continue;
-        if (p->suspended_via_gui) continue;
+        if (p->network_suspended_via_gui) continue;
-        if (p->trickle_up_pending) {
-            return p;
-        }
@@ -1099 +1104 @@
-        PROJECT* p = r->project;
-        if (p->waiting_until_min_rpc_time()) continue;
-        if (p->suspended_via_gui) continue;
+        if (p->network_suspended_via_gui) continue;
-
-        if (config.report_results_immediately) {
-            return p;

client/gui_rpc_server_ops.cpp

@@ -258 +258 @@
-        p->suspended_via_gui = false;
-        gstate.request_schedule_cpus("project resumed by user");
-        gstate.request_work_fetch("project resumed by user");
+    } else if (!strcmp(op, "network_suspend")) {
+        msg_printf(p, MSG_INFO, "network activity suspended by user");
+        p->network_suspended_via_gui = true;
+    } else if (!strcmp(op, "network_resume")) {
+        msg_printf(p, MSG_INFO, "network activity resumed by user");
+        p->network_suspended_via_gui = false;
-    } else if (!strcmp(op, "detach")) {
-        if (p->attached_via_acct_mgr) {
-            msg_printf(p, MSG_USER_ERROR,
@@ -1173 +1179 @@
-        handle_project_op(request_msg, mf, "suspend");
-    } else if (match_tag(request_msg, "<project_resume")) {
-        handle_project_op(request_msg, mf, "resume");
+    } else if (match_tag(request_msg, "<project_network_suspend")) {
+        handle_project_op(request_msg, mf, "network_suspend");
+    } else if (match_tag(request_msg, "<project_network_resume")) {
+        handle_project_op(request_msg, mf, "network_resume");
-    } else if (match_tag(request_msg, "<set_run_mode")) {
-        handle_set_run_mode(request_msg, mf);
-    } else if (match_tag(request_msg, "<quit")) {

client/scheduler_op.cpp

@@ -210 +210 @@
-int SCHEDULER_OP::start_rpc(PROJECT* p) {
-    int retval;
-    char request_file[1024], reply_file[1024], buf[256];
+    char *trickle_up_msg;
-
-    safe_strcpy(scheduler_url, p->get_scheduler_url(url_index, url_random));
-    if (log_flags.sched_ops) {
-        msg_printf(p, MSG_INFO,
-            "Sending scheduler request: %s.", rpc_reason_string(reason)
-        );
+        if (p->trickle_up_pending && reason != RPC_REASON_TRICKLE_UP) {
+            trickle_up_msg = ", sending trickle-up message";
+        } else {
+            trickle_up_msg = "";
+        }
-        if (cpu_work_fetch.req_secs || cuda_work_fetch.req_secs) {
-            if (coproc_cuda) {
-                if (cpu_work_fetch.req_secs && cuda_work_fetch.req_secs) {
@@ -230 +236 @@
-            }
-            if (p->nresults_returned) {
-                msg_printf(p, MSG_INFO,
-
-
+%s
+, trickle_up_msg
-                );
-            } else {
-", buf
+%s", buf, trickle_up_msg
-            }
-        } else {
-            if (p->nresults_returned) {
-                msg_printf(p, MSG_INFO,
-
-
+%s
+, trickle_up_msg
-                );
-            } else {
-"
+%s", trickle_up_msg
-            }
-        }
-    }

client/sim.h

@@ -194 +194 @@
-    bool possibly_schedule_cpus();
-    void schedule_cpus();
-    bool enforce_schedule();
+    void append_unfinished_time_slice(vector<RESULT*>&);
-    bool no_work_for_a_cpu();
-    void append_unfinished_time_slice(vector<RESULT*> &runnable_jobs);
-    void print_deadline_misses();

client/sim_util.cpp

@@ -138 +138 @@
-    short_term_debt = 0;
-    send_file_list = false;
-    suspended_via_gui = false;
+    network_suspended_via_gui = false;
-    dont_request_more_work = false;
-    detach_when_done = false;
-    attached_via_acct_mgr = false;

client/work_fetch.cpp

@@ -105 +105 @@
-bool PROJECT_WORK_FETCH::compute_can_fetch_work(PROJECT* p) {
-    if (p->non_cpu_intensive) return false;
-    if (p->suspended_via_gui) return false;
+    if (p->network_suspended_via_gui && p->sched_rpc_pending != RPC_REASON_USER_REQ) return false;
-    if (p->master_url_fetch_pending) return false;
-    if (p->min_rpc_time > gstate.now) return false;
-    if (p->dont_request_more_work) return false;
@@ -311 +312 @@
-        RSC_PROJECT_WORK_FETCH& pwf = project_state(p);
-        double bt = pwf.backoff_time>gstate.now?pwf.backoff_time-gstate.now:0;
-        msg_printf(p, MSG_INFO,
-
+%s
-            name,
-            pwf.fetchable_share, pwf.debt, bt, pwf.backoff_interval,
-            p->suspended_via_gui?" (susp via GUI)":"",
+            p->network_suspended_via_gui?" (net susp via GUI)":"",
-            p->master_url_fetch_pending?" (master fetch pending)":"",
-            p->min_rpc_time > gstate.now?" (comm deferred)":"",
-            p->dont_request_more_work?" (no new tasks)":"",
@@ -815 +817 @@
-
-bool PROJECT::can_request_work() {
-    if (suspended_via_gui) return false;
+    if (network_suspended_via_gui && sched_rpc_pending != RPC_REASON_USER_REQ) return false;
-    if (master_url_fetch_pending) return false;
-    if (min_rpc_time > gstate.now) return false;
-    if (dont_request_more_work) return false;

clientgui/DlgItemProperties.cpp

@@ -114 +114 @@
-    addProperty(_("Computer ID"), wxString::Format(wxT("%d"), project->hostid));
-        addProperty(_("Non CPU intensive"),project->non_cpu_intensive ? _("yes") : _("no"));
-        addProperty(_("Suspended via GUI"),project->suspended_via_gui ? _("yes") : _("no"));
+        addProperty(_("Network activity suspended via GUI"),project->network_suspended_via_gui ? _("yes") : _("no"));
-        addProperty(_("Don't request more work"),project->dont_request_more_work ? _("yes") : _("no"));
-        addProperty(_("Scheduler call in progress"),project->scheduler_rpc_in_progress ? _("yes") : _("no"));
+        addProperty(_("Trickle-up pending"),project->trickle_up_pending ? _("yes") : _("no"));
-        addProperty(_("Attached via account manager"),project->attached_via_acct_mgr ? _("yes") : _("no"));
-        addProperty(_("Detach when done"),project->detach_when_done ? _("yes") : _("no"));
-        addProperty(_("Ended"),project->ended ? _("yes") : _("no"));

clientgui/Events.h

@@ -91 +91 @@
-#define ID_TASK_PROJECT_RESET                   9006
-#define ID_TASK_PROJECT_DETACH                  9007
-#define ID_TASK_PROJECT_SHOW_PROPERTIES         9008
+#define ID_TASK_PROJECT_SUSPEND_NETWORK         9009
+#define ID_TASK_PROJECT_RESUME_NETWORK          9010
-#define ID_TASK_PROJECT_WEB_PROJDEF_MIN         9100
-#define ID_TASK_PROJECT_WEB_PROJDEF_MAX         9150
-#define ID_TASK_WORK_SUSPEND                    9200

clientgui/MainDocument.cpp

@@ -1311 +1311 @@
-    return iRetVal;
-}
-
+int CMainDocument::ProjectSuspendNetwork(int iIndex) {
+    PROJECT* pProject = NULL;
+    int iRetVal = -1;
+
+    pProject = project(iIndex);
+
+    if (pProject)
+        iRetVal = rpc.project_op((*pProject), "network_suspend");
+
+    return iRetVal;
+}
+
+int CMainDocument::ProjectSuspendNetwork(const wxString& projectname) {
+    PROJECT* pProject = NULL;
+    int iRetVal = -1;
+
+    pProject = project(projectname);
+
+    if (pProject)
+        iRetVal = rpc.project_op((*pProject), "network_suspend");
+
+    return iRetVal;
+}
+
+int CMainDocument::ProjectResumeNetwork(int iIndex) {
+    PROJECT* pProject = NULL;
+    int iRetVal = -1;
+
+    pProject = project(iIndex);
+
+    if (pProject)
+        iRetVal = rpc.project_op((*pProject), "network_resume");
+
+    return iRetVal;
+}
+
+int CMainDocument::ProjectResumeNetwork(const wxString& projectname) {
+    PROJECT* pProject = NULL;
+    int iRetVal = -1;
+
+    pProject = project(projectname);
+
+    if (pProject)
+        iRetVal = rpc.project_op((*pProject), "network_resume");
+
+    return iRetVal;
+}
+
-int CMainDocument::ProjectNoMoreWork(int iIndex) {
-    PROJECT* pProject = NULL;
-    int iRetVal = -1;

clientgui/MainDocument.h

@@ -229 +229 @@
-        int                         ProjectSuspend(const wxString& projectname);
-    int                         ProjectResume(int iIndex);
-        int                         ProjectResume(const wxString& projectname);
+    int                         ProjectSuspendNetwork(int iIndex);
+        int                         ProjectSuspendNetwork(const wxString& projectname);
+    int                         ProjectResumeNetwork(int iIndex);
+        int                         ProjectResumeNetwork(const wxString& projectname);
-
-
-    //

clientgui/ViewProjects.cpp

@@ -48 +48 @@
-#define GRP_WEBSITES 1
-
-// buttons in the "tasks" area
-
-
-
-
-
-
+
+
+
+
+
+
+
-
-
-CProject::CProject() {
@@ -77 +78 @@
-BEGIN_EVENT_TABLE (CViewProjects, CBOINCBaseView)
-    EVT_BUTTON(ID_TASK_PROJECT_UPDATE, CViewProjects::OnProjectUpdate)
-    EVT_BUTTON(ID_TASK_PROJECT_SUSPEND, CViewProjects::OnProjectSuspend)
+    EVT_BUTTON(ID_TASK_PROJECT_SUSPEND_NETWORK, CViewProjects::OnProjectSuspendNetwork)
-    EVT_BUTTON(ID_TASK_PROJECT_NONEWWORK, CViewProjects::OnProjectNoNewWork)
-    EVT_BUTTON(ID_TASK_PROJECT_RESET, CViewProjects::OnProjectReset)
-    EVT_BUTTON(ID_TASK_PROJECT_DETACH, CViewProjects::OnProjectDetach)
@@ -183 +185 @@
-    );
-    pGroup->m_Tasks.push_back( pItem );
-
+    pItem = new CTaskItem(
+        _("Suspend network"),
+        _("Suspend network activity for this project.  Stop uploads and reset their timers, block scheduler requests.  Downloads will be completed."),
+        ID_TASK_PROJECT_SUSPEND_NETWORK
+    );
+    pGroup->m_Tasks.push_back( pItem );
+
-        pItem = new CTaskItem(
-        _("No new tasks"),
-        _("Don't get new tasks for this project."),
@@ -354 +363 @@
-}
-
-
+void CViewProjects::OnProjectSuspendNetwork( wxCommandEvent& WXUNUSED(event) ) {
+    wxLogTrace(wxT("Function Start/End"), wxT("CViewProjects::OnProjectSuspendNetwork - Function Begin"));
+
+    CMainDocument*  pDoc   = wxGetApp().GetDocument();
+    CAdvancedFrame* pFrame = wxDynamicCast(GetParent()->GetParent()->GetParent(), CAdvancedFrame);
+    int row;
+
+    wxASSERT(pDoc);
+    wxASSERT(wxDynamicCast(pDoc, CMainDocument));
+    wxASSERT(pFrame);
+    wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame));
+    wxASSERT(m_pListPane);
+
+    row = -1;
+    while (1) {
+        // Step through all selected items
+        row = m_pListPane->GetNextItem(row, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+        if (row < 0) break;
+        
+        PROJECT* project = pDoc->project(m_iSortedIndexes[row]);
+        if (project) {
+            if (project->network_suspended_via_gui) {
+                pFrame->UpdateStatusText(_("Resuming project network activity..."));
+                pDoc->ProjectResumeNetwork(m_iSortedIndexes[row]);
+                pFrame->UpdateStatusText(wxT(""));
+            } else {
+                pFrame->UpdateStatusText(_("Suspending project network activity..."));
+                pDoc->ProjectSuspendNetwork(m_iSortedIndexes[row]);
+                pFrame->UpdateStatusText(wxT(""));
+            }
+        }
+    }
+    
+    m_bForceUpdateSelection = true;
+    UpdateSelection();
+    pFrame->FireRefreshView();
+
+    wxLogTrace(wxT("Function Start/End"), wxT("CViewProjects::OnProjectSuspendNetwork - Function End"));
+}
+
+
-void CViewProjects::OnProjectNoNewWork( wxCommandEvent& WXUNUSED(event) ) {
-    wxLogTrace(wxT("Function Start/End"), wxT("CViewProjects::OnProjectNoNewWork - Function Begin"));
-
@@ -652 +702 @@
-    PROJECT*            project = NULL;
-    CMainDocument*      pDoc = wxGetApp().GetDocument();
-    int                 i, n, row;
-
+etworkSuspended=false, wasN
-    bool                enableUpdate = false;
-    bool                enableSuspendResume = false;
+    bool                enableNetworkSuspendResume = false;
-    bool                enableNoNewTasks = false;
-    bool                enableReset = false;
-    bool                enableDetach = false;
@@ -675 +726 @@
-    if (n > 0) {
-        enableUpdate = true;
-        enableSuspendResume = true;
+        enableNetworkSuspendResume = true;
-        enableNoNewTasks = true;
-        enableReset = true;
-        enableDetach = true;
@@ -715 +767 @@
-        }
-
-        if (i == 0) {
+            wasNetworkSuspended = project->network_suspended_via_gui;
+             if (project->network_suspended_via_gui) {
+                m_pTaskPane->UpdateTask(
+                    pGroup->m_Tasks[BTN_SUSPEND_NETWORK], _("Resume network"), _("Resume network activity for this project.")
+                );
+            } else {
+                m_pTaskPane->UpdateTask(
+                    pGroup->m_Tasks[BTN_SUSPEND_NETWORK],
+                    _("Suspend network"),
+                    _("Suspend network activity for this project.  Stop uploads and reset their timers, block scheduler requests.  Downloads will be completed.")
+                );
+            }
+        } else {
+            if (wasNetworkSuspended != project->network_suspended_via_gui) {
+                // Disable Suspend / Resume button if the multiple selection
+                // has a mix of suspended and not suspended projects
+                enableNetworkSuspendResume = false;
+            }
+        }
+
+        if (i == 0) {
-            wasNoNewWork = project->dont_request_more_work;
-            if (project->dont_request_more_work) {
-                m_pTaskPane->UpdateTask(
@@ -755 +828 @@
-    // To minimize flicker, set each button only once to the final desired state
-    pGroup->m_Tasks[BTN_UPDATE]->m_pButton->Enable(enableUpdate);
-    pGroup->m_Tasks[BTN_SUSPEND]->m_pButton->Enable(enableSuspendResume);
+    pGroup->m_Tasks[BTN_SUSPEND_NETWORK]->m_pButton->Enable(enableNetworkSuspendResume);
-    pGroup->m_Tasks[BTN_NOWORK]->m_pButton->Enable(enableNoNewTasks);
-    pGroup->m_Tasks[BTN_RESET]->m_pButton->Enable(enableReset);
-    pGroup->m_Tasks[BTN_DETACH]->m_pButton->Enable(enableDetach);
@@ -1050 +1124 @@
-        if (project->suspended_via_gui) {
-            append_to_status(strBuffer, _("Suspended by user"));
-        }
+        else if (project->network_suspended_via_gui && project->sched_rpc_pending != RPC_REASON_USER_REQ) {
+            append_to_status(strBuffer, _("Network activity suspended by user"));
+        }
-        if (project->dont_request_more_work) {
-            append_to_status(strBuffer, _("Won't get new tasks"));
-        }
@@ -1061 +1138 @@
-        }
-        if (project->sched_rpc_pending) {
-            append_to_status(strBuffer, _("Scheduler request pending"));
-                       
+            
-        }
+        if (project->trickle_up_pending &&
+            !project->scheduler_rpc_in_progress &&
+            project->sched_rpc_pending != RPC_REASON_TRICKLE_UP) {
+            append_to_status(strBuffer, _("Trickle upload pending"));
+        }
-        if (project->scheduler_rpc_in_progress) {
-            append_to_status(strBuffer, _("Scheduler request in progress"));
-        }

clientgui/ViewProjects.h

@@ -65 +65 @@
-
-    void                    OnProjectUpdate( wxCommandEvent& event );
-    void                    OnProjectSuspend( wxCommandEvent& event );
+    void                    OnProjectSuspendNetwork( wxCommandEvent& event );
-    void                    OnProjectNoNewWork( wxCommandEvent& event );
-    void                    OnProjectReset( wxCommandEvent& event );
-    void                    OnProjectDetach( wxCommandEvent& event );

clientgui/ViewProjectsBase.cpp

@@ -47 +47 @@
-#define GRP_WEBSITES 1
-
-// buttons in the "tasks" area
-
-
-
-
-
+
+
+
+
+
+
-
-
-CProject::CProject() {
@@ -74 +75 @@
-BEGIN_EVENT_TABLE (CViewProjects, CBOINCBaseView)
-    EVT_BUTTON(ID_TASK_PROJECT_UPDATE, CViewProjects::OnProjectUpdate)
-    EVT_BUTTON(ID_TASK_PROJECT_SUSPEND, CViewProjects::OnProjectSuspend)
+    EVT_BUTTON(ID_TASK_PROJECT_SUSPEND_NETWORK, CViewProjects::OnProjectSuspendNetwork)
-    EVT_BUTTON(ID_TASK_PROJECT_NONEWWORK, CViewProjects::OnProjectNoNewWork)
-    EVT_BUTTON(ID_TASK_PROJECT_RESET, CViewProjects::OnProjectReset)
-    EVT_BUTTON(ID_TASK_PROJECT_DETACH, CViewProjects::OnProjectDetach)
@@ -118 +120 @@
-    );
-    pGroup->m_Tasks.push_back( pItem );
-
+    pItem = new CTaskItem(
+        _("Suspend network"),
+        _("Suspend network activity for this project.  Stop uploads and reset their timers, block scheduler requests.  Downloads will be completed."),
+        ID_TASK_PROJECT_SUSPEND_NETWORK 
+    );
+    pGroup->m_Tasks.push_back( pItem );
+
-        pItem = new CTaskItem(
-        _("No new tasks"),
-        _("Don't get new tasks for this project."),
@@ -238 +247 @@
-}
-
-
+void CViewProjects::OnProjectSuspendNetwork( wxCommandEvent& WXUNUSED(event) ) {
+    wxLogTrace(wxT("Function Start/End"), wxT("CViewProjects::OnProjectSuspendNetwork - Function Begin"));
+
+    CMainDocument*  pDoc   = wxGetApp().GetDocument();
+    CAdvancedFrame* pFrame = wxDynamicCast(GetParent()->GetParent()->GetParent(), CAdvancedFrame);
+
+    wxASSERT(pDoc);
+    wxASSERT(wxDynamicCast(pDoc, CMainDocument));
+    wxASSERT(pFrame);
+    wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame));
+    wxASSERT(m_pListPane);
+
+    PROJECT* project = pDoc->project(m_pListPane->GetFirstSelected());
+    if (project->network_suspended_via_gui) {
+        pFrame->UpdateStatusText(_("Resuming project network activity..."));
+        pDoc->ProjectResumeNetwork(m_pListPane->GetFirstSelected());
+        pFrame->UpdateStatusText(wxT(""));
+    } else {
+        pFrame->UpdateStatusText(_("Suspending project network activity..."));
+        pDoc->ProjectSuspendNetwork(m_pListPane->GetFirstSelected());
+        pFrame->UpdateStatusText(wxT(""));
+    }
+
+    m_bForceUpdateSelection = true;
+    UpdateSelection();
+    pFrame->FireRefreshView();
+
+    wxLogTrace(wxT("Function Start/End"), wxT("CViewProjects::OnProjectSuspendNetwork - Function End"));
+}
+
+
-void CViewProjects::OnProjectNoNewWork( wxCommandEvent& WXUNUSED(event) ) {
-    wxLogTrace(wxT("Function Start/End"), wxT("CViewProjects::OnProjectNoNewWork - Function Begin"));
-
@@ -561 +601 @@
-                );
-            }
-        }
+        m_pTaskPane->EnableTask(pGroup->m_Tasks[BTN_SUSPEND_NETWORK]);
+        if (project) {
+            if (project->suspended_via_gui) {
+                m_pTaskPane->UpdateTask(
+                    pGroup->m_Tasks[BTN_SUSPEND_NETWORK], _("Resume network"), _("Resume network activity for this project.")
+                );
+            } else {
+                m_pTaskPane->UpdateTask(
+                    pGroup->m_Tasks[BTN_SUSPEND_NETWORK],
+                    _("Suspend network"),
+                    _("Suspend network activity for this project.  Stop uploads and reset their timers, block scheduler requests.  Downloads will be completed.")
+                );
+            }
+        }
-        m_pTaskPane->EnableTask(pGroup->m_Tasks[BTN_NOWORK]);
-        if (project) {
-            if (project->dont_request_more_work) {
@@ -673 +727 @@
-        if (project->suspended_via_gui) {
-            append_to_status(status, _("Suspended by user"));
-        }
+        else if (project->network_suspended_via_gui && project->sched_rpc_pending != RPC_REASON_USER_REQ) {
+            append_to_status(status, _("Network activity suspended by user"));
+        }
-        if (project->dont_request_more_work) {
-            append_to_status(status, _("Won't get new tasks"));
-        }
@@ -684 +741 @@
-        }
-        if (project->sched_rpc_pending) {
-            append_to_status(status, _("Scheduler request pending"));
-                       
+            
-        }
+        if (project->trickle_up_pending &&
+            !project->scheduler_rpc_in_progress &&
+            project->sched_rpc_pending != RPC_REASON_TRICKLE_UP) {
+            append_to_status(status, _("Trickle upload pending"));
+        }
-        if (project->scheduler_rpc_in_progress) {
-            append_to_status(status, _("Scheduler request in progress"));
-        }

clientgui/ViewProjectsBase.h

@@ -58 +58 @@
-
-    void                    OnProjectUpdate( wxCommandEvent& event );
-    void                    OnProjectSuspend( wxCommandEvent& event );
+    void                    OnProjectSuspendNetwork( wxCommandEvent& event );
-    void                    OnProjectNoNewWork( wxCommandEvent& event );
-    void                    OnProjectReset( wxCommandEvent& event );
-    void                    OnProjectDetach( wxCommandEvent& event );

clientgui/ViewProjectsGrid.cpp

@@ -49 +49 @@
-#define GRP_WEBSITES 1
-
-// buttons in the "tasks" area
-
-
-
-
-
+
+
+
+
+
+
-
-
-IMPLEMENT_DYNAMIC_CLASS(CViewProjectsGrid, CBOINCBaseView)
@@ -61 +62 @@
-BEGIN_EVENT_TABLE (CViewProjectsGrid, CBOINCBaseView)
-    EVT_BUTTON(ID_TASK_PROJECT_UPDATE, CViewProjectsGrid::OnProjectUpdate)
-    EVT_BUTTON(ID_TASK_PROJECT_SUSPEND, CViewProjectsGrid::OnProjectSuspend)
+    EVT_BUTTON(ID_TASK_PROJECT_SUSPEND_NETWORK, CViewProjectsGrid::OnProjectSuspendNetwork)
-    EVT_BUTTON(ID_TASK_PROJECT_NONEWWORK, CViewProjectsGrid::OnProjectNoNewWork)
-    EVT_BUTTON(ID_TASK_PROJECT_RESET, CViewProjectsGrid::OnProjectReset)
-    EVT_BUTTON(ID_TASK_PROJECT_DETACH, CViewProjectsGrid::OnProjectDetach)
@@ -130 +132 @@
-    );
-    pGroup->m_Tasks.push_back( pItem );
-
+    pItem = new CTaskItem(
+        _("Suspend network"),
+        _("Suspend network activity for this project.  Stop uploads and reset their timers, block scheduler requests.  Downloads will be completed."),
+        ID_TASK_PROJECT_SUSPEND_NETWORK
+    );
+    pGroup->m_Tasks.push_back( pItem );
+
-        pItem = new CTaskItem(
-        _("No new tasks"),
-        _("Don't get new tasks for this project."),
@@ -285 +294 @@
-}
-
-
+void CViewProjectsGrid::OnProjectSuspendNetwork( wxCommandEvent& WXUNUSED(event) ) {
+    wxLogTrace(wxT("Function Start/End"), wxT("CViewProjectsGrid::OnProjectSuspendNetwork - Function Begin"));
+
+    wxString        strProjectURL  = wxEmptyString;
+    CMainDocument*  pDoc           = wxGetApp().GetDocument();
+    CAdvancedFrame* pFrame         = wxDynamicCast(GetParent()->GetParent()->GetParent(), CAdvancedFrame);
+    int i, n;
+
+    wxASSERT(pDoc);
+    wxASSERT(wxDynamicCast(pDoc, CMainDocument));
+    wxASSERT(pFrame);
+    wxASSERT(wxDynamicCast(pFrame, CAdvancedFrame));
+    wxASSERT(m_pGridPane);
+
+    wxArrayInt arrSelRows = m_pGridPane->GetSelectedRows2();
+    n = (int)arrSelRows.GetCount();
+    for(i=0; i<n; i++) {
+        strProjectURL = 
+            HtmlEntityEncode(
+                m_pGridPane->GetCellValue(
+                    arrSelRows[i],
+                    COLUMN_HIDDEN_URL
+                ).Trim(false)
+            );
+        PROJECT* project = pDoc->project(strProjectURL);
+        
+        if (project->network_suspended_via_gui) {
+            pFrame->UpdateStatusText(_("Resuming project network activity..."));
+            pDoc->ProjectResumeNetwork(strProjectURL);
+        } else {
+            pFrame->UpdateStatusText(_("Suspending project network activity..."));
+            pDoc->ProjectSuspendNetwork(strProjectURL);
+        }
+    }
+    pFrame->UpdateStatusText(wxT(""));
+
+    m_bForceUpdateSelection = true;
+    UpdateSelection();
+    pFrame->FireRefreshView();
+
+    wxLogTrace(wxT("Function Start/End"), wxT("CViewProjectsGrid::OnProjectSuspendNetwork - Function End"));
+}
+
+
-void CViewProjectsGrid::OnProjectNoNewWork( wxCommandEvent& WXUNUSED(event) ) {
-    wxLogTrace(wxT("Function Start/End"), wxT("CViewProjectsGrid::OnProjectNoNewWork - Function Begin"));
-
@@ -496 +549 @@
-    PROJECT*        project = NULL;
-    CMainDocument*  pDoc = wxGetApp().GetDocument();
-    int             i, n;
-
+etworkSuspended=false, wasN
-    static int      lastCount = 0;
-
-    wxASSERT(pDoc);
@@ -569 +622 @@
-        }
-
-        if (i == 0) {
+            wasNetworkSuspended = project->network_suspended_via_gui;
+             if (project->network_suspended_via_gui) {
+                m_pTaskPane->UpdateTask(
+                    pGroup->m_Tasks[BTN_SUSPEND_NETWORK], _("Resume network"), _("Resume network activity for this project.")
+                );
+            } else {
+                m_pTaskPane->UpdateTask(
+                    pGroup->m_Tasks[BTN_SUSPEND_NETWORK],
+                    _("Suspend network"),
+                    _("Suspend network activity for this project.  Stop uploads and reset their timers, block scheduler requests.  Downloads will be completed.")
+                );
+            }
+        } else {
+            if (wasNetworkSuspended != project->network_suspended_via_gui) {
+                // Disable Suspend / Resume button if the multiple selection
+                // has a mix of suspended and not suspended projects
+                m_pTaskPane->DisableTask(pGroup->m_Tasks[BTN_SUSPEND_NETWORK]);
+            }
+        }
+
+        if (i == 0) {
-            wasNoNewWork = project->dont_request_more_work;
-            if (project->dont_request_more_work) {
-                m_pTaskPane->UpdateTask(
@@ -727 +801 @@
-        if (project->suspended_via_gui) {
-            append_to_status(strBuffer, _("Suspended by user"));
-        }
+        else if (project->network_suspended_via_gui && project->sched_rpc_pending != RPC_REASON_USER_REQ) {
+            append_to_status(strBuffer, _("Network activity suspended by user"));
+        }
-        if (project->dont_request_more_work) {
-            append_to_status(strBuffer, _("Won't get new tasks"));
-        }
@@ -738 +815 @@
-        }
-        if (project->sched_rpc_pending) {
-            append_to_status(strBuffer, _("Scheduler request pending"));
-                       
+            
-        }
+        if (project->trickle_up_pending &&
+            !project->scheduler_rpc_in_progress &&
+            project->sched_rpc_pending != RPC_REASON_TRICKLE_UP) {
+            append_to_status(strBuffer, _("Trickle upload pending"));
+        }
-        if (project->scheduler_rpc_in_progress) {
-            append_to_status(strBuffer, _("Scheduler request in progress"));
-        }

clientgui/ViewProjectsGrid.h

@@ -47 +47 @@
-    void                    OnProjectUpdate( wxCommandEvent& event );
-    void                    OnProjectSuspend( wxCommandEvent& event );
-    void                    OnProjectNoNewWork( wxCommandEvent& event );
+    void                    OnProjectSuspendNetwork( wxCommandEvent& event );
-    void                    OnProjectReset( wxCommandEvent& event );
-    void                    OnProjectDetach( wxCommandEvent& event );
-

clientgui/ViewTransfers.cpp

@@ -440 +440 @@
-
-void CViewTransfers::UpdateSelection() {
-    CTaskItemGroup* pGroup = m_TaskGroups[0];
+    CMainDocument*  pDoc = wxGetApp().GetDocument();
+    FILE_TRANSFER*  transfer;
+    int             i, n, row;
+    bool            enableButtons = false;
-
+    wxASSERT(pDoc);
+    wxASSERT(wxDynamicCast(pDoc, CMainDocument));
+    wxASSERT(m_pTaskPane);
+    wxASSERT(m_pListPane);
+
-    CBOINCBaseView::PreUpdateSelection();
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        m_pTaskPane->EnableTaskGroupTasks(pGroup);
-    } else {
-        m_pTaskPane->DisableTaskGroupTasks(pGroup);
@@ -758 +787 @@
-            } else {
-                if (transfer->xfer_active) {
-                    strBuffer = transfer->generated_locally? _("Uploading") : _("Downloading");
+                } else if (transfer->generated_locally) {
+                    strBuffer = _("Upload pending");
+                    if (transfer->project != NULL && transfer->project->network_suspended_via_gui) {
+                        strBuffer += _(", project networking suspended");
+                    }
-                } else {
-transfer->generated_locally? _("Upload pending") : 
+
-                }
-            }
-        }
@@ -779 +813 @@
-
-    if (transfer) {
-        strBuffer = wxString(transfer->project_url.c_str(), wxConvUTF8);
+        transfer->project = pDoc->state.lookup_project(transfer->project_url);
-    }
-}
-

clientgui/ViewTransfersGrid.cpp

@@ -253 +253 @@
-
-void CViewTransfersGrid::UpdateSelection() {
-    CTaskItemGroup* pGroup = m_TaskGroups[0];
+    CMainDocument*  pDoc = wxGetApp().GetDocument();
+    FILE_TRANSFER*  transfer;
+    int             i, n, row;
+    bool            enableButtons = false;
-
+    wxASSERT(pDoc);
+    wxASSERT(wxDynamicCast(pDoc, CMainDocument));
+    wxASSERT(m_pTaskPane);
+    wxASSERT(m_pListPane);
+
-    CBOINCBaseView::PreUpdateSelection();
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        m_pTaskPane->EnableTaskGroupTasks(pGroup);
-    } else {
-        m_pTaskPane->DisableTaskGroupTasks(pGroup);
@@ -427 +456 @@
-            } else {
-                if (transfer->xfer_active) {
-                    strBuffer = transfer->generated_locally? _("Uploading") : _("Downloading");
+                } else if (transfer->generated_locally) {
+                    strBuffer = _("Upload pending");
+                    if (transfer->project != NULL && transfer->project->network_suspended_via_gui) {
+                        strBuffer += _(", project networking suspended");
+                    }
-                } else {
-transfer->generated_locally? _("Upload pending") : 
+
-                }
-            }
-        }
@@ -447 +481 @@
-
-    if (transfer) {
-        strBuffer = wxString(transfer->project_url.c_str(), wxConvUTF8);
+        transfer->project = pDoc->state.lookup_project(transfer->project_url);
-    }
-
-    return 0;

clientgui/ViewWork.cpp

@@ -1085 +1085 @@
-        if (result->ready_to_report) {
-            strBuffer += _("Upload failed");
-        } else {
+            PROJECT* project;
+
-            strBuffer += _("Uploading");
+            project = doc->state.lookup_project(result->project_url);
+            if (project->network_suspended_via_gui)
+            {
+                strBuffer += _(", project networking suspended");
+            }
-        }
-        break;
-    case RESULT_ABORTED:

clientgui/ViewWorkGrid.cpp

@@ -838 +838 @@
-        if (result->ready_to_report) {
-            strBuffer = _("Upload failed");
-        } else {
-
+
+
+
+
+
+
+
+
-        }
-        break;
-    case RESULT_ABORTED:

lib/gui_rpc_client.h

@@ -119 +119 @@
-
-    bool master_url_fetch_pending; // need to fetch and parse the master URL
-    int sched_rpc_pending;      // need to contact scheduling server
+    bool trickle_up_pending;    // need to upload trickles
-    bool non_cpu_intensive;
-    bool suspended_via_gui;
+    bool network_suspended_via_gui;
-    bool dont_request_more_work;
-    bool scheduler_rpc_in_progress;
-    bool attached_via_acct_mgr;

lib/gui_rpc_client_ops.cpp

@@ -206 +206 @@
-        if (parse_double(buf, "<duration_correction_factor>", duration_correction_factor)) continue;
-        if (parse_bool(buf, "master_url_fetch_pending", master_url_fetch_pending)) continue;
-        if (parse_int(buf, "<sched_rpc_pending>", sched_rpc_pending)) continue;
+        if (parse_bool(buf, "trickle_up_pending", trickle_up_pending)) continue;
-        if (parse_bool(buf, "non_cpu_intensive", non_cpu_intensive)) continue;
-        if (parse_bool(buf, "suspended_via_gui", suspended_via_gui)) continue;
+        if (parse_bool(buf, "network_suspended_via_gui", network_suspended_via_gui)) continue;
-        if (parse_bool(buf, "dont_request_more_work", dont_request_more_work)) continue;
-        if (parse_bool(buf, "ended", ended)) continue;
-        if (parse_bool(buf, "scheduler_rpc_in_progress", scheduler_rpc_in_progress)) continue;
@@ -256 +258 @@
-    duration_correction_factor = 0;
-    master_url_fetch_pending = false;
-    sched_rpc_pending = 0;
+    trickle_up_pending = false;
-    ended = false;
-    non_cpu_intensive = false;
-    suspended_via_gui = false;
+    network_suspended_via_gui = false;
-    dont_request_more_work = false;
-    scheduler_rpc_in_progress = false;
-    attached_via_acct_mgr = false;
@@ -1488 +1492 @@
-    } else if (!strcmp(op, "resume")) {
-        tag = "project_resume";
-        project.suspended_via_gui = false;
+    } else if (!strcmp(op, "network_suspend")) {
+        tag = "project_network_suspend";
+        project.network_suspended_via_gui = true;
+    } else if (!strcmp(op, "network_resume")) {
+        tag = "project_network_resume";
+        project.network_suspended_via_gui = false;
-    } else if (!strcmp(op, "allowmorework")) {
-        tag = "project_allowmorework";
-        project.dont_request_more_work = false;

lib/gui_rpc_client_print.cpp

@@ -74 +74 @@
-    printf("   master_fetch_failures: %d\n", master_fetch_failures);
-    printf("   master fetch pending: %s\n", master_url_fetch_pending?"yes":"no");
-    printf("   scheduler RPC pending: %s\n", sched_rpc_pending?"yes":"no");
+    printf("   trickle upload pending: %s\n", trickle_up_pending?"yes":"no");
-    printf("   attached via Account Manager: %s\n", attached_via_acct_mgr?"yes":"no");
-    printf("   ended: %s\n", ended?"yes":"no");
-    printf("   suspended via GUI: %s\n", suspended_via_gui?"yes":"no");
+    printf("   network activity suspended via GUI: %s\n", network_suspended_via_gui?"yes":"no");
-    printf("   don't request more work: %s\n", dont_request_more_work?"yes":"no");
-    printf("   disk usage: %f\n", disk_usage);
-    printf("   last RPC: %f\n", last_rpc_time);