diff --git a/checkin_notes b/checkin_notes index 5619bc469c..06a671027f 100644 --- a/checkin_notes +++ b/checkin_notes @@ -427,4 +427,14 @@ Rom 14 Jan 2010 clientgui/ ViewNotices.cpp,h - \ No newline at end of file + +David 15 Jan 2010 + - web DB code: fix PHP warning when enumeration returns nothing. + From Nicolas. fixes #974 + - client: tiny code shuffle + + client/ + work_fetch.cpp + cpu_sched.cpp + html/inc/ + db_conn.inc diff --git a/client/cpu_sched.cpp b/client/cpu_sched.cpp index ddd99c91f1..c382b6ab19 100644 --- a/client/cpu_sched.cpp +++ b/client/cpu_sched.cpp @@ -827,7 +827,7 @@ static inline bool more_important(RESULT* r0, RESULT* r1) { if (miss0 && !miss1) return true; if (!miss0 && miss1) return false; - // favor coproc jobs, so that if we're RAM-limited + // favor coproc jobs, so that e.g. if we're RAM-limited // we'll use the GPU instead of the CPU // bool cp0 = r0->uses_coprocs(); diff --git a/client/work_fetch.cpp b/client/work_fetch.cpp index 825d80b95c..3e42811f6d 100644 --- a/client/work_fetch.cpp +++ b/client/work_fetch.cpp @@ -254,6 +254,11 @@ void RSC_WORK_FETCH::update_busy_time(double dur, double nused) { busy_time_estimator.update(dur, nused); } +static bool wacky_dcf(PROJECT* p) { + double dcf = p->duration_correction_factor; + return (dcf < 0.02 || dcf > 80.0); +} + // Choose the best project to ask for work for this resource, // given the specific criterion // @@ -283,6 +288,10 @@ PROJECT* RSC_WORK_FETCH::choose_project(int criterion) { switch (criterion) { case FETCH_IF_MINOR_SHORTFALL: if (rpwf.overworked()) continue; + if (wacky_dcf(p)) continue; + break; + case FETCH_IF_MAJOR_SHORTFALL: + if (wacky_dcf(p)) continue; break; case FETCH_IF_PROJECT_STARVED: if (rpwf.overworked()) continue; @@ -340,8 +349,7 @@ void RSC_WORK_FETCH::set_request(PROJECT* p) { if (!w.may_have_work) return; if (w.overworked()) return; if (shortfall) { - double dcf = p->duration_correction_factor; - if (dcf < 0.02 || dcf > 80.0) { + if (wacky_dcf(p)) { // if project's DCF is too big or small, // its completion time estimates are useless; just ask for 1 second // diff --git a/doc/addon_data.php b/doc/addon_data.php index c3956f2751..d5d44c0d8c 100644 --- a/doc/addon_data.php +++ b/doc/addon_data.php @@ -43,16 +43,16 @@ array( '', 1234896753 ), -array( - 'http://www.weebl00.nl/leiterow/zowtar/BOINC/', - 'BOINC mIRC', - '0.1', - 'MRC file for sending your BOINC status on IRC', - 'http://www.weebl00.nl/leiterow/zowtar/BOINC/', - 'all', - '', - 1177964485 -), +//array( +// 'http://www.weebl00.nl/leiterow/zowtar/BOINC/', +// 'BOINC mIRC', +// '0.1', +// 'MRC file for sending your BOINC status on IRC', +// 'http://www.weebl00.nl/leiterow/zowtar/BOINC/', +// 'all', +// '', +// 1177964485 +//), //array('boinc-irc.exe', // 'Boinc mIRC', // '1.0', diff --git a/doc/index.php b/doc/index.php index 95540dac5c..b4ab739207 100644 --- a/doc/index.php +++ b/doc/index.php @@ -130,11 +130,6 @@ function show_create() {
  • Companies: use BOINC for desktop Grid computing. - Related software: - "; } @@ -147,8 +142,20 @@ function show_other() { +
    + + +

    "; diff --git a/html/inc/db_conn.inc b/html/inc/db_conn.inc index 47d568c3bc..3fdbc5de49 100644 --- a/html/inc/db_conn.inc +++ b/html/inc/db_conn.inc @@ -83,6 +83,7 @@ class DbConn { function enum_general($classname, $query) { $result = $this->do_query($query); if (!$result) return null; + $x = array(); while ($obj = mysql_fetch_object($result, $classname)) { $x[] = $obj; } @@ -100,6 +101,7 @@ class DbConn { $query = "select $fields from DBNAME.$table $where_clause $order_clause"; $result = $this->do_query($query); if (!$result) return null; + $x = array(); while ($obj = mysql_fetch_object($result, $classname)) { $x[] = $obj; }