diff --git a/checkin_notes b/checkin_notes index 4376dcbab0..79ee1bed6d 100644 --- a/checkin_notes +++ b/checkin_notes @@ -6438,3 +6438,9 @@ Rytis 9 Sept 2010 html/user/ host_app_versions.php + +David 9 Sept 2010 + - scheduler: fix "prefer_primary_platform" logic (I hope). + + sched/ + sched_version.cpp diff --git a/sched/sched_version.cpp b/sched/sched_version.cpp index f4eedb3c18..3498d5dcba 100644 --- a/sched/sched_version.cpp +++ b/sched/sched_version.cpp @@ -581,13 +581,6 @@ BEST_APP_VERSION* get_app_version( continue; } - // at this point we know the version is feasible, - // so if config.prefer_primary_platform is set - // we won't look any further. - // (the version may still be ruled out by job limits etc.) - // - found_feasible_version = true; - if (reliable_only && !app_version_is_reliable(av.id)) { if (config.debug_version_select) { log_messages.printf(MSG_NORMAL, @@ -618,6 +611,12 @@ BEST_APP_VERSION* get_app_version( continue; } + // at this point we know the version is feasible, + // so if config.prefer_primary_platform is set + // we won't look any further. + // + found_feasible_version = true; + estimate_flops(host_usage, av); // pick the fastest version