- feeder: error out if an ordering option (e.g. --priority)

is used in combination with homogeneous redundancy.
    HR requires a cyclic scan of all sendable results.

svn path=/trunk/boinc/; revision=21973

checkin_notes

@@ -5202,3 +5202,13 @@ Charlie 16 Jul 2010
 
     clientgui/
         DlgEventLog.cpp, .h
+
+David  16 Jul 2010
+    - feeder: error out if an ordering option (e.g. --priority)
+        is used in combination with homogeneous redundancy.
+        HR requires a cyclic scan of all sendable results.
+
+    sched/
+        feeder.cpp
+    tools/
+        backend_lib.cpp

sched/feeder.cpp

@@ -856,6 +856,14 @@ int main(int argc, char** argv) {
     }
 
     hr_init();
+
+    if (using_hr && strlen(order_clause)) {
+        log_messages.printf(MSG_CRITICAL,
+            "Can't use ordering options together with homogeneous redundancy\n"
+        );
+        exit(1);
+    }
+
     if (config.job_size_matching) {
         retval = ssp->perf_info.read_file();
         if (retval) {

tools/backend_lib.cpp

@@ -460,7 +460,7 @@ int create_result(
 
     result.clear();
     initialize_result(result, wu);
-    result.priority = result.priority + priority_increase;
+    result.priority += priority_increase;
     sprintf(result.name, "%s_%s", wu.name, result_name_suffix);
     sprintf(base_outfile_name, "%s_", result.name);
     retval = read_filename(