From ca652519cf7566235d6ddc566200199a934cb328 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 7 Nov 2012 13:50:41 -0800 Subject: [PATCH] - scheduler: log message tweaks - Some C++ files in client had execute permissions (??). Clear them. --- checkin_notes | 8 ++++++++ clientgui/sg_BoincSimpleFrame.cpp | 0 clientgui/sg_PanelBase.cpp | 0 clientgui/sg_PanelBase.h | 0 clientgui/sg_ProjectPanel.cpp | 0 clientgui/sg_ProjectPanel.h | 0 clientgui/sg_TaskPanel.cpp | 0 clientgui/sg_TaskPanel.h | 0 sched/sched_array.cpp | 30 ++++++++++++++++++------------ sched/sched_send.cpp | 10 ++++++---- 10 files changed, 32 insertions(+), 16 deletions(-) mode change 100755 => 100644 clientgui/sg_BoincSimpleFrame.cpp mode change 100755 => 100644 clientgui/sg_PanelBase.cpp mode change 100755 => 100644 clientgui/sg_PanelBase.h mode change 100755 => 100644 clientgui/sg_ProjectPanel.cpp mode change 100755 => 100644 clientgui/sg_ProjectPanel.h mode change 100755 => 100644 clientgui/sg_TaskPanel.cpp mode change 100755 => 100644 clientgui/sg_TaskPanel.h diff --git a/checkin_notes b/checkin_notes index bb6782f01b..8c3c662441 100644 --- a/checkin_notes +++ b/checkin_notes @@ -6661,3 +6661,11 @@ David 7 Nov 2012 sched_config.cpp,h sched_array.cpp - remote job submission: show 20 batches, with link to show all + +David 7 Nov 2012 + - scheduler: log message tweaks + - Some C++ files in client had execute permissions (??). Clear them. + + sched/ + sched_array.cpp + sched_send.cpp diff --git a/clientgui/sg_BoincSimpleFrame.cpp b/clientgui/sg_BoincSimpleFrame.cpp old mode 100755 new mode 100644 diff --git a/clientgui/sg_PanelBase.cpp b/clientgui/sg_PanelBase.cpp old mode 100755 new mode 100644 diff --git a/clientgui/sg_PanelBase.h b/clientgui/sg_PanelBase.h old mode 100755 new mode 100644 diff --git a/clientgui/sg_ProjectPanel.cpp b/clientgui/sg_ProjectPanel.cpp old mode 100755 new mode 100644 diff --git a/clientgui/sg_ProjectPanel.h b/clientgui/sg_ProjectPanel.h old mode 100755 new mode 100644 diff --git a/clientgui/sg_TaskPanel.cpp b/clientgui/sg_TaskPanel.cpp old mode 100755 new mode 100644 diff --git a/clientgui/sg_TaskPanel.h b/clientgui/sg_TaskPanel.h old mode 100755 new mode 100644 diff --git a/sched/sched_array.cpp b/sched/sched_array.cpp index de17ed53d3..0fc3ddd320 100644 --- a/sched/sched_array.cpp +++ b/sched/sched_array.cpp @@ -491,14 +491,20 @@ void send_work_old() { // if (g_wreq->has_reliable_version) { g_wreq->reliable_only = true; - if (config.debug_send) { + if (config.debug_array) { log_messages.printf(MSG_NORMAL, - "[send] scanning for jobs that need reliable host\n" + "[array] scanning for jobs that need reliable host\n" ); } if (scan_work_array()) return; g_wreq->reliable_only = false; g_wreq->best_app_versions.clear(); + } else { + if (config.debug_array) { + log_messages.printf(MSG_NORMAL, + "[array] host has no reliable app versions; skipping\n" + ); + } } // give 2nd priority to results for a beta app @@ -507,9 +513,9 @@ void send_work_old() { // if (g_wreq->allow_beta_work) { g_wreq->beta_only = true; - if (config.debug_send) { + if (config.debug_array) { log_messages.printf(MSG_NORMAL, - "[send] host will accept beta jobs. Scanning for them.\n" + "[array] host will accept beta jobs. Scanning for them.\n" ); } if (scan_work_array()) return; @@ -519,9 +525,9 @@ void send_work_old() { // give next priority to results that were infeasible for some other host // g_wreq->infeasible_only = true; - if (config.debug_send) { + if (config.debug_array) { log_messages.printf(MSG_NORMAL, - "[send] Scanning for jobs that were infeasible for another host.\n" + "[array] Scanning for jobs that were infeasible for another host.\n" ); } if (scan_work_array()) return; @@ -531,9 +537,9 @@ void send_work_old() { // make a pass accepting only jobs for which the client has a file // if (ssp->locality_sched_lite) { - if (config.debug_send) { + if (config.debug_array) { log_messages.printf(MSG_NORMAL, - "[send] Scanning for locality sched Lite jobs.\n" + "[array] Scanning for locality sched Lite jobs.\n" ); } g_wreq->locality_sched_lite = true; @@ -543,9 +549,9 @@ void send_work_old() { // end of high-priority cases. Now do general scan. // - if (config.debug_send) { + if (config.debug_array) { log_messages.printf(MSG_NORMAL, - "[send] doing general job scan.\n" + "[array] Scanning: general case.\n" ); } if (scan_work_array()) return; @@ -556,9 +562,9 @@ void send_work_old() { if (!g_wreq->njobs_sent && g_wreq->allow_non_preferred_apps ) { g_wreq->user_apps_only = false; preferred_app_message_index = g_wreq->no_work_messages.size(); - if (config.debug_send) { + if (config.debug_array) { log_messages.printf(MSG_NORMAL, - "[send] scanning for jobs from non-preferred applications\n" + "[array] scanning for jobs from non-preferred applications\n" ); } scan_work_array(); diff --git a/sched/sched_send.cpp b/sched/sched_send.cpp index 688e9c4eb1..069d07c815 100644 --- a/sched/sched_send.cpp +++ b/sched/sched_send.cpp @@ -111,9 +111,11 @@ void add_job_files_to_host(WORKUNIT& wu) { if (retval) continue; if (!fi.sticky) continue; if (!file_present_on_host(fi.name)) { - log_messages.printf(MSG_NORMAL, - "Adding file %s to host file list\n", fi.name - ); + if (config.debug_send) { + log_messages.printf(MSG_NORMAL, + "[send] Adding file %s to host file list\n", fi.name + ); + } g_request->file_infos.push_back(fi); } } @@ -1299,7 +1301,7 @@ int add_result_to_reply( double est_dur = estimate_duration(wu, *bavp); if (config.debug_send) { log_messages.printf(MSG_NORMAL, - "[HOST#%d] Sending [RESULT#%d %s] (est. dur. %.2f seconds)\n", + "[send] [HOST#%d] sending [RESULT#%d %s] (est. dur. %.2f seconds)\n", g_reply->host.id, result.id, result.name, est_dur ); }