Changeset 15148

Timestamp:

05/08/08 10:48:40 (7 months ago)

Author:

davea

Message:

- scheduler: add new log flags debug_edf_sim_workload, debug_edf_sim_details

for getting info on EDF simulation;
change output from seconds to hours

- API: remove extern "C" from graphics API

(convince me it's needed before restoring)

Files:

• trunk/boinc/api/graphics2.h (modified) (3 diffs)
• trunk/boinc/checkin_notes (modified) (1 diff)
• trunk/boinc/client/makefile_sim (modified) (2 diffs)
• trunk/boinc/lib/diagnostics.C (modified) (2 diffs)
• trunk/boinc/sched/edf_sim.C (modified) (9 diffs)
• trunk/boinc/sched/sched_array.C (modified) (1 diff)
• trunk/boinc/sched/sched_config.C (modified) (1 diff)
• trunk/boinc/sched/sched_config.h (modified) (1 diff)

trunk/boinc/api/graphics2.h

@@ -1 +1 @@
-#ifndef _GRAPHICS2_H_
-#define _GRAPHICS2_H_
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-
-
-// Functions that must be supplied by the app
@@ -26 +20 @@
-extern void boinc_close_window_and_quit();
-
-#ifdef __cplusplus
-}
-#endif
-
-// Implementation stuff
-//
@@ -37 +27 @@
-extern bool throttled_app_render(int, int, double);
-
-
-#endif

trunk/boinc/checkin_notes

@@ -3699 +3699 @@
-    lib/
-        coproc.C
+
+David  May 8 2008
+    - scheduler: add new log flags debug_edf_sim_workload, debug_edf_sim_details
+        for getting info on EDF simulation;
+        change output from seconds to hours
+    - API: remove extern "C" from graphics API
+        (convince me it's needed before restoring)
+
+    api/
+        graphics2.h
+    client/
+        makefile_sim
+    lib/
+        diagnostics.C
+    sched/
+        edf_sim.C
+        sched_array.C
+        sched_config.C,h

trunk/boinc/client/makefile_sim

@@ -13 +13 @@
-    time_stats.o \
-    work_fetch.o \
-
+
+
-    ../lib/mfile.o \
-    ../lib/miofile.o \
@@ -23 +24 @@
-
-sim: $(OBJS)
-
+ -ldl

trunk/boinc/lib/diagnostics.C

@@ -117 +117 @@
-
-
-stub function for initializing the worker
+initialize the app
-//
-int boinc_init_diagnostics(int _flags) {
@@ -125 +125 @@
-
-
-stub function for initializing
+initialize
-//
-int boinc_init_graphics_diagnostics(int _flags) {
-
-
+
+
+
+
-}
-

trunk/boinc/sched/edf_sim.C

@@ -27 +27 @@
-#endif
-
+#ifdef SIM
+#include <stdarg.h>
+#else
+#include "sched_config.h"
+#include "sched_msgs.h"
+#endif
+
-#include "edf_sim.h"
-
-using std::vector;
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-bool lessthan_deadline(const IP_RESULT& p1, const IP_RESULT& p2) {
@@ -51 +83 @@
-    int j;
-
-
-
-
+
-
-    // keeps track of when each cpu is next free
@@ -82 +112 @@
-      
-        booked_to[lowest_booked_cpu] += r.cpu_time_remaining;
-
-
-
+
+
-        );
-#endif
-        if (booked_to[lowest_booked_cpu] > r.computation_deadline) {
-                r.misses_deadline = true;
-                r.estimated_completion_time = booked_to[lowest_booked_cpu];
-
-
-
+
+
-            );
-#endif
-        } else {
-                r.misses_deadline = false;
-
-
-
+
+
-            );
-#endif
-                // if result doesn't miss its deadline,
-            // then the estimated_completion_time is of no use
@@ -108 +132 @@
-}
-
-s
-s if the deadline would be missed by simulating edf
+
+ if the deadline would be missed by simulating EDF
-//
-void init_ip_results(
@@ -118 +142 @@
-    unsigned int i;
-
-
-
-
+
+
+
+
-    for (i=0; i<ip_results.size(); i++) {
-        IP_RESULT& r = ip_results[i];
-        r.computation_deadline = r.report_deadline - work_buf_min;
-
-
-
+
+
-        );
-#endif
-    }
-
@@ -199 +222 @@
-    int j;
-
-
-
-
-
+
+
+
-    );
-#endif
-
-    for (j=0; j<ncpus; j++) {
@@ -231 +252 @@
-        }
-        booked_to[lowest_booked_cpu] += r.cpu_time_remaining;
-
-
-
+
+
-        );
-#endif
-
-        // return false if completion time if > computation_deadline AND
@@ -243 +262 @@
-            && !r.misses_deadline
-        ) {
-
-
-
+
+
+
+
-            );
-#endif
-            return false;
-        }
@@ -256 +275 @@
-            && booked_to[lowest_booked_cpu] > r.estimated_completion_time
-        ){
-
-
-
+
+
+
+
-            return false;
-        }
-    }
-
-
-
+
-    return true;
-}
-
-def TEST
+ 0
-int main() {
-    vector<IP_RESULT> ip_results;

trunk/boinc/sched/sched_array.C

@@ -134 +134 @@
-        retval = wu_is_infeasible_fast(wu, sreq, reply, *app);
-        if (retval) {
-
-
-
-
+
+
+
+
+
+
-            continue;
-        }

trunk/boinc/sched/sched_config.C

@@ -194 +194 @@
-        if (xp.parse_bool(tag, "debug_request_details", debug_request_details)) continue;
-        if (xp.parse_bool(tag, "debug_handle_results", debug_handle_results)) continue;
+        if (xp.parse_bool(tag, "debug_edf_sim_workload", debug_edf_sim_workload)) continue;
+        if (xp.parse_bool(tag, "debug_edf_sim_detail", debug_edf_sim_detail)) continue;
-
-        // don't complain about unparsed XML;

trunk/boinc/sched/sched_config.h

@@ -132 +132 @@
-    bool debug_request_details;
-    bool debug_handle_results;
+    bool debug_edf_sim_workload;    // show workload for EDF sim
+    bool debug_edf_sim_detail;      // show details of EDF sim
-
-    int parse(FILE*);