add stdump filter for adaptive systems2007.2

3 files changed, 56 insertions, 3 deletions

diff --git a/Makefile b/Makefile
index 64d3f25..250820a 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@ CPPFLAGS=-Wall -g
 
 LIBS= ./liblitmus.a
 
-TARGETS = showsched iotest set_rt_mode  run timeout rt_launch edfhsb liblitmus.a wait_test np_test
+TARGETS = showsched iotest set_rt_mode  run timeout rt_launch edfhsb liblitmus.a wait_test np_test stdump
 
 vpath %.h include/
 vpath %.c src/
@@ -22,7 +22,7 @@ iotest: iotest.o litmus.h liblitmus.a
         cc -static -o iotest iotest.o  ${LIBS}
 
 run: run.o
-        cc -o run run.o
+        cc -o run run.o ${LIBS}
 
 set_rt_mode: liblitmus.a set_rt_mode.o
         cc -o set_rt_mode set_rt_mode.o  ${LIBS}
@@ -39,5 +39,8 @@ rt_launch: liblitmus.a litmus.h rt_launch.o
 edfhsb: liblitmus.a edf-hsb.o litmus.h edf-hsb.h hrt.o
         cc -o edfhsb hrt.o edf-hsb.o  ${LIBS}
 
+stdump: liblitmus.a litmus.h sched_trace.h stdump.o
+        cc -o stdump  stdump.o ${LIBS}
+
 liblitmus.a: litmus.o sched_trace.o adaptive.o adaptive.h litmus.h edf-hsb.o edf-hsb.h
-        ${AR} rcs liblitmus.a litmus.o adaptive.o edf-hsb.o 
+        ${AR} rcs liblitmus.a litmus.o adaptive.o edf-hsb.o sched_trace.o
diff --git a/include/adaptive.h b/include/adaptive.h
index 8902da5..360b13e 100644
--- a/include/adaptive.h
+++ b/include/adaptive.h
@@ -12,6 +12,12 @@ static inline fp_t f2fp(double f)
         return (fp_t) {f * (1 << FP_SHIFT)};
 }
 
+static inline double fp2f(fp_t f)
+{
+        return ((double) f.val) / (1 << FP_SHIFT);
+}
+
+
 #define MAX_SERVICE_LEVELS 10
 typedef struct {
         fp_t            weight;
diff --git a/src/stdump.c b/src/stdump.c
new file mode 100644
index 0000000..282fb31
--- /dev/null
+++ b/src/stdump.c
@@ -0,0 +1,44 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+
+#include "litmus.h"
+#include "adaptive.h"
+#include "sched_trace.h"
+
+int show_sl_chg(trace_header_t* hdr)
+{
+        service_level_change_record_t *rec;
+
+        rec = (service_level_change_record_t*) hdr;
+        printf("SL CHANGE : PID=%d PERIOD=%lu\n", rec->task.pid, 
+               rec->new_level.period);
+        return 0;
+}
+
+int show_weight_error(trace_header_t* hdr)
+{
+        weight_error_record_t *rec;
+
+        rec = (weight_error_record_t*) hdr;
+        printf("WEIGHT ERR: PID=%d EST=%5.4f ACT=%5.4f\n", rec->task, 
+               fp2f(rec->estimate), fp2f(rec->actual));
+        return 0;
+}
+
+
+int main(int argc, char** argv)
+{
+        record_callback_t cb;
+        int ret;
+        
+        init_record_callback(&cb);
+        set_callback(ST_SERVICE_LEVEL_CHANGE, show_sl_chg, &cb);
+        set_callback(ST_WEIGHT_ERROR, show_weight_error, &cb);  
+        
+        ret = walk_sched_trace_files_ordered(argv + 1, argc - 1, 0, &cb);
+        if (ret != 0)
+                perror("walk failed");
+        return 0;
+}