3 files changed, 127 insertions, 31 deletions

diff --git a/Makefile b/Makefile
index 8dd3698..c5517b2 100644
--- a/Makefile
+++ b/Makefile
@@ -39,5 +39,5 @@ 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}
 
-liblitmus.a: litmus.o adaptive.o adaptive.h litmus.h edf-hsb.o edf-hsb.h
+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 
diff --git a/include/logformat.h b/include/sched_trace.h
index 3a74bf7..57f7876 100644
--- a/include/logformat.h
+++ b/include/sched_trace.h
@@ -1,37 +1,40 @@
-#ifndef LOGFORMAT_H
-#define LOGFORMAT_H
+#ifndef __SCHED_TRACE_H_
+#define __SCHED_TRACE_H_
 
 #include <linux/types.h>
 
-#include "litmus.h"
-
 typedef __u8  u8;
 typedef __u32 u32;
 typedef __u16 u16;
 
 typedef enum {
-        ST_INVOCATION           = 0,
-        ST_ARRIVAL              = 1,
-        ST_DEPARTURE            = 2,
-        ST_PREEMPTION           = 3,
-        ST_SCHEDULED            = 4,
-        ST_JOB_RELEASE          = 5,
-        ST_JOB_COMPLETION       = 6,
-        ST_CAPACITY_RELEASE     = 7,
-        ST_CAPACITY_ALLOCATION  = 8,
-        ST_LAST_TYPE            = 8
+        ST_INVOCATION           =  0,
+        ST_ARRIVAL              =  1,
+        ST_DEPARTURE            =  2,
+        ST_PREEMPTION           =  3,
+        ST_SCHEDULED            =  4,
+        ST_JOB_RELEASE          =  5,
+        ST_JOB_COMPLETION       =  6,
+        ST_CAPACITY_RELEASE     =  7,
+        ST_CAPACITY_ALLOCATION  =  8,
+        ST_SERVICE_LEVEL_CHANGE =  9,
+        ST_WEIGHT_ERROR         = 10,
+
+
+        ST_MAX
 } trace_type_t;
 
+
 typedef struct {
         trace_type_t            trace:8;
-        unsigned long long      timestamp;
+        unsigned int            size:24;
+        unsigned long long      timestamp;      
 } trace_header_t;
 
-
 typedef struct {
         unsigned int            is_rt:1;
         unsigned int            is_server:1;
-        task_class_t            cls:4;
+        task_class_t            class:4;
         unsigned int            budget:24;
         u32                     deadline;
 
@@ -40,7 +43,7 @@ typedef struct {
 
 typedef struct {
         trace_header_t          header;
-        unsigned long           flags;          
+        unsigned long           flags;
 } invocation_record_t;
 
 typedef struct {
@@ -68,7 +71,7 @@ typedef struct {
         trace_header_t          header;
         task_info_t             task;
         u16                     period;
-        u16                     wcet;   
+        u16                     wcet;
 } release_record_t;
 
 typedef struct {
@@ -92,21 +95,39 @@ typedef struct {
         pid_t                   donor;
 } cap_allocation_record_t;
 
+typedef struct {
+        trace_header_t          header;
+        task_info_t             task;
+        service_level_t         new_level;
+} service_level_change_record_t;
+
+typedef struct {
+        trace_header_t          header;
+        pid_t                   task;
+        fp_t                    estimate;
+        fp_t                    actual;
+} weight_error_record_t;
+
+
+
 
-typedef union {
-        trace_header_t          header;
-        invocation_record_t     invocation;
-        arrival_record_t        arrival;
-        preemption_record_t     preemption;
-        scheduled_record_t      scheduled;
 
-        release_record_t        release;
-        completion_record_t     completion;     
 
-        cap_release_record_t    cap_release;
-        cap_allocation_record_t cap_alloc;
-} trace_record_t;
 
+enum {
+        INVALID_HEADER = 1
+};
+
+typedef int (*record_callback_fn)(trace_header_t* hdr);
+
+typedef struct {
+        record_callback_fn handler[ST_MAX];
+} record_callback_t;
 
+#define init_record_callback(a) memset(a, 0, sizeof(record_callback_t))
+#define set_callback(type, fn, a)    do {(a)->handler[type] = fn; } while (0);
 
+int walk_sched_trace(void* start, void* end, record_callback_t *cb);
+int walk_sched_trace_file(const char* name, int keep_mapped, 
+                          record_callback_t *cb);
 #endif
diff --git a/src/sched_trace.c b/src/sched_trace.c
new file mode 100644
index 0000000..011b13b
--- /dev/null
+++ b/src/sched_trace.c
@@ -0,0 +1,75 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <sys/mman.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+#include "litmus.h"
+#include "adaptive.h"
+#include "sched_trace.h"
+
+
+int walk_sched_trace(void* start, void* end, record_callback_t *cb)
+{
+        void* pos = start;
+        trace_header_t* header;
+        int ret;
+        
+        while (pos < end) {
+                header = (trace_header_t*) pos;
+                if (header->trace >= ST_MAX)
+                        return INVALID_HEADER;
+                if (cb->handler[header->trace])
+                        ret = cb->handler[header->trace](header);
+                if (ret)
+                        return ret;
+                pos += header->size;
+        }
+        return 0;
+}
+
+static int map_file(const char* filename, void **addr, size_t *size) 
+{
+  struct stat info;
+  int error = 0;
+  int fd;
+  
+  error = stat(filename, &info);
+  if (!error) {
+    *size = info.st_size;
+    if (info.st_size > 0) {
+      fd = open(filename, O_RDONLY);
+      if (fd >= 0) {                            
+        *addr = mmap(NULL, *size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
+        if (*addr == MAP_FAILED)
+          error = -1;
+        close(fd);
+      } else
+        error = fd;                     
+    } else
+      *addr = NULL;             
+  }
+  return error;
+}
+
+int walk_sched_trace_file(const char* name, int keep_mapped, 
+                          record_callback_t *cb)
+{
+        int ret;        
+        size_t size;
+        void *start, *end;
+
+        ret = map_file(name, &start, &size);
+        if (!ret) {
+                end = start + size;
+                ret = walk_sched_trace(start, end, cb);
+        }
+        if (!keep_mapped)
+                munmap(start, size);
+        return ret;
+}
+
+