From c0642fd5c2effc87a98b47713649471c75a2c641 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Fri, 19 Dec 2008 21:27:02 +0000 Subject: [PATCH] - scheduler: fix message that showed running_frac as garbage; show FLOPS as GFLOPS svn path=/trunk/boinc/; revision=16729 --- checkin_notes | 8 ++++++++ sched/sched_plan.cpp | 6 ++++-- sched/sched_send.cpp | 8 ++++---- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/checkin_notes b/checkin_notes index f34e9ad1b9..3020f5a619 100644 --- a/checkin_notes +++ b/checkin_notes @@ -10296,3 +10296,11 @@ David 19 Dec 2008 sched/ sched_plan.cpp server_types.cpp + +David 19 Dec 2008 + - scheduler: fix message that showed running_frac as garbage; + show FLOPS as GFLOPS + + sched/ + sched_plan.cpp + sched_send.cpp diff --git a/sched/sched_plan.cpp b/sched/sched_plan.cpp index 42fafdb053..fe7ccd676e 100644 --- a/sched/sched_plan.cpp +++ b/sched/sched_plan.cpp @@ -25,6 +25,7 @@ // (and write-protect that) // In either case, put your version under source-code control, e.g. SVN +#include "str_util.h" #include "sched_config.h" #include "sched_msgs.h" #include "sched_plan.h" @@ -113,8 +114,9 @@ bool app_plan(SCHEDULER_REQUEST& sreq, char* plan_class, HOST_USAGE& hu) { hu.flops = 5e10 * (x/y); if (config.debug_version_select) { log_messages.printf(MSG_DEBUG, - "CUDA app estimated %f FLOPS (clock %d count %d)\n", - hu.flops, cp2->prop.clockRate, cp2->prop.multiProcessorCount + "CUDA app estimated %.2f GFLOPS (clock %d count %d)\n", + hu.flops/GIGA, cp2->prop.clockRate, + cp2->prop.multiProcessorCount ); } return true; diff --git a/sched/sched_send.cpp b/sched/sched_send.cpp index 0c82683536..c209b91804 100644 --- a/sched/sched_send.cpp +++ b/sched/sched_send.cpp @@ -354,10 +354,10 @@ double estimate_duration(WORKUNIT& wu, BEST_APP_VERSION& bav) { // clamp running_frac and DCF to a reasonable range // if (rf > 1) { - log_messages.printf(MSG_NORMAL, "running_frac=%f; setting to 1\n"); + log_messages.printf(MSG_NORMAL, "running_frac=%f; setting to 1\n", rf); rf = 1; } else if (rf < .1) { - log_messages.printf(MSG_NORMAL, "running_frac=%f; setting to 0.1\n"); + log_messages.printf(MSG_NORMAL, "running_frac=%f; setting to 0.1\n", rf); rf = .1; } double ed = edu/rf; @@ -759,10 +759,10 @@ int add_wu_to_reply( g_reply->insert_app_version_unique(*avp2); if (config.debug_send) { log_messages.printf(MSG_DEBUG, - "[HOST#%d] Sending app_version %s %d %d %s; %f FLOPS\n", + "[HOST#%d] Sending app_version %s %d %d %s; %.2f GFLOPS\n", g_reply->host.id, app->name, avp2->platformid, avp2->version_num, avp2->plan_class, - bavp->host_usage.flops + bavp->host_usage.flops/GIGA ); } }