Einstein@home extensions:

- protect malloc.h
- validator: allow to update 'random' result field
- assimilator: add global variables results_prefix and transcripts_prefix

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

checkin_notes

@@ -1670,3 +1670,18 @@ David  16 Mar 2011
         wrapper.cpp
     client/
         sim.cpp
+
+Bernd  18 Mar 2011
+    Einstein@home extensions:
+      - protect malloc.h
+      - validator: allow to update 'random' result field
+      - assimilator: add global variables results_prefix and transcripts_prefix,
+        set on command-line
+
+    sched/
+        assimilator.cpp
+        assimilate_handler.h
+        hr_info.cpp
+    db/
+        boinc_db.cpp
+

db/boinc_db.cpp

@@ -1593,13 +1593,14 @@ int DB_VALIDATOR_ITEM_SET::update_result(RESULT& res) {
 
     sprintf(query,
         "update result set validate_state=%d, granted_credit=%.15e, "
-        "server_state=%d, outcome=%d, opaque=%lf "
+        "server_state=%d, outcome=%d, opaque=%lf, random=%d "
         "where id=%d",
         res.validate_state,
         res.granted_credit,
         res.server_state,
         res.outcome,
         res.opaque,
+        res.random,
         res.id
     );
     int retval = db->do_query(query);

sched/assimilate_handler.h

@@ -36,3 +36,5 @@ extern int assimilate_handler(
 
 extern int g_argc;
 extern char** g_argv;
+extern char* results_prefix;
+extern char* transcripts_prefix;

sched/assimilator.cpp

@@ -53,6 +53,8 @@ int sleep_interval = SLEEP_INTERVAL;
 int one_pass_N_WU=0;
 int g_argc;
 char** g_argv;
+char* results_prefix = NULL;
+char* transcripts_prefix = NULL;
 
 void usage(char** argv) {
     fprintf(stderr,
@@ -242,6 +244,10 @@ int main(int argc, char** argv) {
         } else if (is_arg(argv[i], "v") || is_arg(argv[i], "version")) {
             printf("%s\n", SVN_VERSION);
             exit(0);
+	} else if (is_arg(argv[i], "results_prefix")) {
+	    results_prefix=argv[++i];
+	} else if (is_arg(argv[i], "transcripts_prefix")) {
+            transcripts_prefix=argv[++i];
         } else {
             log_messages.printf(MSG_CRITICAL, "Unrecognized arg: %s\n", argv[i]);
             usage(argv);

sched/hr_info.cpp

@@ -19,7 +19,9 @@
 #else
 #include "boinc_fcgi.h"
 #endif
+#if HAVE_MALLOC_H
 #include <malloc.h>
+#endif
 #include <cmath>
 
 #include "error_numbers.h"