From 85870e7224d703d8785c2b4703e28c6e9b9c4c15 Mon Sep 17 00:00:00 2001 From: Rom Walton Date: Wed, 18 Aug 2004 01:49:46 +0000 Subject: [PATCH] *** empty log message *** svn path=/trunk/boinc/; revision=4073 --- checkin_notes | 7 +++++++ sched/handle_request.C | 2 +- sched/sched_send.C | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/checkin_notes b/checkin_notes index 6faff6b472..895c270bdb 100755 --- a/checkin_notes +++ b/checkin_notes @@ -16475,3 +16475,10 @@ David 17 Aug 2004 net_xfer.C lib/ util.C,h +Rom 17 Aug 2004 + - BugFix: Fix trickle messages from host. + - BugFix: HR fix for the scheduler. + + sched/ + handle_request.C + sched_send.C diff --git a/sched/handle_request.C b/sched/handle_request.C index 2be2415430..ca61f1d733 100644 --- a/sched/handle_request.C +++ b/sched/handle_request.C @@ -768,7 +768,7 @@ void process_request( send_code_sign_key(sreq, reply, code_sign_key); - + handle_msgs_from_host(sreq, reply); if (config.msg_to_host) { handle_msgs_to_host(sreq, reply); } diff --git a/sched/sched_send.C b/sched/sched_send.C index bf3a535054..8f13a1ef24 100644 --- a/sched/sched_send.C +++ b/sched/sched_send.C @@ -431,11 +431,11 @@ bool same_platform(DB_HOST& host, SCHEDULER_REQUEST& sreq) { static bool already_sent_to_different_platform( SCHEDULER_REQUEST& sreq, WORKUNIT& workunit, WORK_REQ& wreq ) { + wreq.homogeneous_redundancy_reject = false; if (workunit.workseq_next != unspec) { if (OS(sreq) + CPU(sreq) != workunit.workseq_next) wreq.homogeneous_redundancy_reject = true; - } - else { + } else { workunit.workseq_next = OS(sreq) + CPU(sreq); DB_WORKUNIT db_wu; db_wu = workunit;