From 249435f0d8d922afe12e602fa198946e3e782e6e Mon Sep 17 00:00:00 2001 From: David Anderson Date: Wed, 7 Sep 2011 17:37:50 +0000 Subject: [PATCH] - scheduler: fix crashing bug svn path=/trunk/boinc/; revision=24139 --- checkin_notes | 7 +++++++ sched/sched_assign.cpp | 4 +++- sched/sched_version.cpp | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/checkin_notes b/checkin_notes index 5bb224e55d..8e681bbe99 100644 --- a/checkin_notes +++ b/checkin_notes @@ -5669,3 +5669,10 @@ David 6 Sept 2011 db_update.php user/ submit_app.php + +David 7 Sept 2011 + - scheduler: fix crashing bug + + sched/ + sched_version.cpp + sched_assign.cpp diff --git a/sched/sched_assign.cpp b/sched/sched_assign.cpp index b0ac09e29f..caf0e233bf 100644 --- a/sched/sched_assign.cpp +++ b/sched/sched_assign.cpp @@ -76,7 +76,9 @@ static int send_assigned_job(ASSIGNMENT& asg) { rtfpath = config.project_path("%s", wu.result_template_file); sprintf(suffix, "%d_%d_%d", getpid(), (int)time(0), seqno++); - retval = create_result(wu, (char *)rtfpath, suffix, key, config, 0, 0); + retval = create_result( + wu, const_cast(rtfpath), suffix, key, config, 0, 0 + ); if (retval) { log_messages.printf(MSG_CRITICAL, "[WU#%d %s] create_result(): %s\n", wu.id, wu.name, boincerror(retval) diff --git a/sched/sched_version.cpp b/sched/sched_version.cpp index 56e2b39c50..942f1fe8a0 100644 --- a/sched/sched_version.cpp +++ b/sched/sched_version.cpp @@ -295,7 +295,7 @@ void estimate_flops_anon_platform() { if (config.debug_version_select) { log_messages.printf(MSG_NORMAL, "[version] (%s) capping new_flops; %f > 2*%f\n", - new_flops, cav.host_usage.projected_flops + cav.plan_class, new_flops, cav.host_usage.projected_flops ); } new_flops = 2*cav.host_usage.projected_flops;