From 2b69fa01d38b00dcc104fba700087c338f8c7670 Mon Sep 17 00:00:00 2001 From: Karl Chen Date: Sat, 6 Sep 2003 01:46:08 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=2280 --- checkin_notes | 7 +++++++ sched/handle_request.C | 10 ++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/checkin_notes b/checkin_notes index 2557696027..448c9b79de 100755 --- a/checkin_notes +++ b/checkin_notes @@ -6199,3 +6199,10 @@ Karl 2003/09/05 api/ boinc_api.C guitl.C + +Karl 2003/09/05 + - created COBBLESTONE_FACTOR variable and changed it from 1/3 to 100. + - fixed superfluous authenticator in cgi.log + + Sched/ + handle_request.C diff --git a/sched/handle_request.C b/sched/handle_request.C index 32f0e0c286..2f01b52be4 100644 --- a/sched/handle_request.C +++ b/sched/handle_request.C @@ -44,6 +44,8 @@ const int MIN_SECONDS_TO_SEND = 0; const int MAX_SECONDS_TO_SEND = (28*SECONDS_PER_DAY); const int MAX_WUS_TO_SEND = 10; +const double COBBLESTONE_FACTOR = 100.0; + // if a host has active_frac < 0.5, assume 0.5 so we don't deprive it of work. const double HOST_ACTIVE_FRAC_MIN = 0.5; @@ -400,8 +402,8 @@ new_host: // static void compute_credit_rating(HOST& host) { host.credit_per_cpu_sec = - (fabs(host.p_fpops)/1e9 + fabs(host.p_iops)/1e9 + fabs(host.p_membw)/4e9)/ - (3*SECONDS_PER_DAY); + (fabs(host.p_fpops)/1e9 + fabs(host.p_iops)/1e9 + fabs(host.p_membw)/4e9) + * COBBLESTONE_FACTOR / (SECONDS_PER_DAY); } // Update host record based on request. @@ -822,9 +824,9 @@ bool wrong_major_version(SCHEDULER_REQUEST& sreq, SCHEDULER_REPLY& reply) { strcpy(reply.message_priority, "low"); log_messages.printf( SchedMessages::NORMAL, - "[HOST#%d] Wrong major version '%s' from user: wanted %d, got %d\n", + "[HOST#%d] Wrong major version from user: wanted %d, got %d\n", reply.host.id, - sreq.authenticator, MAJOR_VERSION, sreq.core_client_major_version + MAJOR_VERSION, sreq.core_client_major_version ); return true; }