From 6498b0bba2c621dc4f636651aa80dc5e4df36e72 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Mon, 26 Mar 2012 22:01:31 +0000 Subject: [PATCH] - client: set PROJECT::last_upload_start whenever an upload starts, not just when a result becomes ready to upload. Fix bug where a scheduler RPC to report results is done even though uploads are active. - client: cpu_sched_debug enables messages about not scheduling jobs because of insufficient RAM svn path=/trunk/boinc/; revision=25493 --- checkin_notes | 12 ++++++++++++ client/cpu_sched.cpp | 4 ++-- client/pers_file_xfer.cpp | 3 +++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/checkin_notes b/checkin_notes index 7d585a37f6..6913ecf6bd 100644 --- a/checkin_notes +++ b/checkin_notes @@ -3054,3 +3054,15 @@ David 26 Mar 2012 client/ cs_scheduler.cpp + +David 26 Mar 2012 + - client: set PROJECT::last_upload_start whenever an upload starts, + not just when a result becomes ready to upload. + Fix bug where a scheduler RPC to report results is done + even though uploads are active. + - client: cpu_sched_debug enables messages about not scheduling jobs + because of insufficient RAM + + client/ + pers_file_xfer.cpp + cpu_sched.cpp diff --git a/client/cpu_sched.cpp b/client/cpu_sched.cpp index 6a36dbe6fb..6d98aa5803 100644 --- a/client/cpu_sched.cpp +++ b/client/cpu_sched.cpp @@ -1620,9 +1620,9 @@ bool CLIENT_STATE::enforce_run_list(vector& run_list) { if (atp) { atp->too_large = true; } - if (log_flags.mem_usage_debug) { + if (log_flags.cpu_sched_debug || log_flags.mem_usage_debug) { msg_printf(rp->project, MSG_INFO, - "[mem_usage] enforce: result %s can't run, too big %.2fMB > %.2fMB", + "[cpu_sched_debug] enforce: result %s can't run, too big %.2fMB > %.2fMB", rp->name, wss/MEGA, ram_left/MEGA ); } diff --git a/client/pers_file_xfer.cpp b/client/pers_file_xfer.cpp index 64b2edb23e..1b70d26ca4 100644 --- a/client/pers_file_xfer.cpp +++ b/client/pers_file_xfer.cpp @@ -166,6 +166,9 @@ int PERS_FILE_XFER::create_xfer() { ul.get_current_url(*fip) ); } + if (is_upload) { + fip->project->last_upload_start = gstate.now; + } return 0; }