From a1590ff580cb9219eef2a1e206f28781980b8069 Mon Sep 17 00:00:00 2001 From: David Anderson Date: Fri, 28 Sep 2007 18:27:02 +0000 Subject: [PATCH] - scheduler: option wasn't working, because the reply.req structure was getting zeroed AFTER nresults_on_host was being set. svn path=/trunk/boinc/; revision=13712 --- checkin_notes | 10 +++++++++- doc/addon_data.php | 10 ---------- doc/links.php | 3 ++- sched/handle_request.C | 2 ++ sched/sched_send.C | 2 +- 5 files changed, 14 insertions(+), 13 deletions(-) diff --git a/checkin_notes b/checkin_notes index 2e77d1b933..75abd42675 100755 --- a/checkin_notes +++ b/checkin_notes @@ -8929,4 +8929,12 @@ Charlie 28 Sep 2007 api/ graphics2_unix.C - \ No newline at end of file + +David 28 Sept 2007 + - scheduler: option wasn't working, + because the reply.req structure was getting zeroed + AFTER nresults_on_host was being set. + + sched/ + handle_request.C + sched_send.C diff --git a/doc/addon_data.php b/doc/addon_data.php index 95d6a1ccc4..646b37d20f 100644 --- a/doc/addon_data.php +++ b/doc/addon_data.php @@ -10,16 +10,6 @@ // 7 unix date $win = array( -array( - 'http://www.skipsjunk.com/info/boincdv.html', - 'BOINC Debt Viewer', - '0.3.06', - 'BOINC Debt Viewer is a small utility that displays the debt values for each project on a a BOINC host', - 'http://www.skipsjunk.com/info/boincdv.html', - 'Windows', - '', - 1168202706 -), array( 'http://www.weebl00.nl/leiterow/zowtar/BOINC/', 'BOINC mIRC', diff --git a/doc/links.php b/doc/links.php index 175f84616a..f8c426c555 100644 --- a/doc/links.php +++ b/doc/links.php @@ -160,7 +160,8 @@ echo " "; language("Belgium (Dutch/French/English)", array( - site("http://www.boinc.be", "www.boinc.be") + site("http://www.boinc.be", "www.boinc.be"), + seti("http://icewolves.plid.be", "IceWolves"), )); language("Catalan", array( site("http://www.boinc.cat", "BOINC.cat"), diff --git a/sched/handle_request.C b/sched/handle_request.C index 17910b0e71..6bf5a805a4 100644 --- a/sched/handle_request.C +++ b/sched/handle_request.C @@ -1232,6 +1232,8 @@ void process_request( HOST initial_host; unsigned int i; + memset(&reply.wreq, 0, sizeof(reply.wreq)); + // if different major version of BOINC, just send a message // if (wrong_core_client_version(sreq, reply) diff --git a/sched/sched_send.C b/sched/sched_send.C index 80be063e19..7970bdd922 100644 --- a/sched/sched_send.C +++ b/sched/sched_send.C @@ -718,6 +718,7 @@ bool SCHEDULER_REPLY::work_needed(bool locality_sched) { } } + fprintf(stderr, "mwip %d nroh %d\n", config.max_wus_in_progress, wreq.nresults_on_host); if (config.max_wus_in_progress) { if (wreq.nresults_on_host >= config.max_wus_in_progress) { log_messages.printf( @@ -908,7 +909,6 @@ void send_work( ) { char helpful[512]; - memset(&reply.wreq, 0, sizeof(reply.wreq)); reply.wreq.disk_available = max_allowable_disk(sreq, reply); reply.wreq.core_client_version = sreq.core_client_major_version*100 + sreq.core_client_minor_version;