Timer merging

4 files changed, 60 insertions, 13 deletions

diff --git a/include/litmus/event_group.h b/include/litmus/event_group.h
index 58692a11b683..37d5012d770e 100644
--- a/include/litmus/event_group.h
+++ b/include/litmus/event_group.h
@@ -3,13 +3,14 @@
 
 #define EVENT_QUEUE_SLOTS 127 /* prime */
 
-typedef void (*fire_event_t)(void *data);
+struct rt_event;
+typedef void (*fire_event_t)(struct rt_event *e);
 
 struct event_group {
         lt_t                    res;
         int                     cpu;
         struct list_head        event_queue[EVENT_QUEUE_SLOTS];
-        raw_spinlock_t  queue_lock;
+        raw_spinlock_t          queue_lock;
 };
 
 /**
@@ -23,8 +24,8 @@ struct event_list {
         struct hrtimer                  timer;
         struct hrtimer_start_on_info    info;
 
-        struct list_head list;  /* For event_queue */
-        struct event_group *group; /* For callback    */
+        struct list_head    list;  /* For event_queue */
+        struct event_group* group; /* For callback    */
 };
 
 /**
@@ -32,10 +33,8 @@ struct event_list {
  */
 struct rt_event {
         /* Function to call on event expiration */
-        fire_event_t     fire;
-        /* To be passed into fire */
-        void            *data;
-        /* Priority of this event (lower is better */
+        fire_event_t     function;
+        /* Priority of this event (lower is better) */
         int              prio;
 
         /* For membership in the event_list */
@@ -48,9 +47,38 @@ struct rt_event {
         struct event_list *event_list;
 };
 
-void init_event_group(struct event_group*, lt_t, int);
-void add_event(struct event_group*, struct rt_event*, lt_t);
-void cancel_event(struct event_group*, struct rt_event*);
+/**
+ * init_event_group() - Prepare group for events.
+ * @group       Group to prepare
+ * @res         Timer resolution. Two events of @res distance will be merged
+ * @cpu         Cpu on which to fire timers
+ */
+void init_event_group(struct event_group* group, lt_t res, int cpu);
+
+/**
+ * add_event() - Add timer to event group.
+ * @group       Group with which to merge event
+ * @e           Event to be fired at a specific time
+ * @time        Time to fire event
+ */
+void add_event(struct event_group* group, struct rt_event* e, lt_t time);
+
+/**
+ * cancel_event() - Remove event from the group.
+ */
+void cancel_event(struct rt_event*);
+
+/**
+ * init_event() - Create an event.
+ * @e           Event to create
+ * @prio        Priority of the event (lower is better)
+ * @function    Function to fire when event expires
+ * @el          Pre-allocated event list for timer merging
+ */
+void init_event(struct rt_event* e, int prio, fire_event_t function,
+                struct event_list *el);
+
 struct event_list* event_list_alloc(int);
+void event_list_free(struct event_list *el);
 
 #endif
diff --git a/include/litmus/rt_domain.h b/include/litmus/rt_domain.h
index 0e4e75cd1e67..59350fb78d4f 100644
--- a/include/litmus/rt_domain.h
+++ b/include/litmus/rt_domain.h
@@ -7,6 +7,7 @@
 
 #include <litmus/bheap.h>
 #include <litmus/domain.h>
+#include <litmus/event_group.h>
 
 #define RELEASE_QUEUE_SLOTS 127 /* prime */
 
@@ -30,7 +31,10 @@ typedef struct _rt_domain {
         raw_spinlock_t                  release_lock;
         struct release_queue            release_queue;
 
-#ifdef CONFIG_RELEASE_MASTER
+#ifdef CONFIG_MERGE_TIMERS
+        struct event_group*             event_group;
+        int                             prio;
+#elif  CONFIG_RELEASE_MASTER
         int                             release_master;
 #endif
 
@@ -54,13 +58,18 @@ struct release_heap {
         lt_t                            release_time;
         /* all tasks to be released at release_time */
         struct bheap                    heap;
+
+#ifdef CONFIG_MERGE_TIMERS
+        /* used to merge timer calls */
+        struct rt_event                 event;
+#else
         /* used to trigger the release */
         struct hrtimer                  timer;
-
 #ifdef CONFIG_RELEASE_MASTER
         /* used to delegate releases */
         struct hrtimer_start_on_info    info;
 #endif
+#endif
         /* required for the timer callback */
         rt_domain_t*                    dom;
 };
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index e247fb515e8c..e6288e8807f0 100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -123,6 +123,9 @@ struct rt_param {
         /* mixed criticality specific data */
         struct mc_data *mc_data;
 #endif
+#ifdef CONFIG_MERGE_TIMERS
+        struct rt_event *event;
+#endif
 
         /* user controlled parameters */
         struct rt_task          task_params;
diff --git a/include/litmus/sched_mc.h b/include/litmus/sched_mc.h
index 95cd22cd7202..9ddf860c83a7 100644
--- a/include/litmus/sched_mc.h
+++ b/include/litmus/sched_mc.h
@@ -31,6 +31,13 @@ struct mc_data {
 #define tsk_mc_data(t)   (tsk_rt(t)->mc_data)
 #define tsk_mc_crit(t)   (tsk_mc_data(t)->mc_task.crit)
 #define is_ghost(t)      (tsk_mc_data(t)->mc_job.is_ghost)
+#define TS "(%s/%d:%d:%s)"
+#define TA(t) (t) ? (is_ghost(t)) ? "ghost" : t->comm : "NULL", \
+              (t) ? t->pid : 1,                                 \
+              (t) ? t->rt_param.job_params.job_no : 1,          \
+              (t && get_task_domain(t)) ? get_task_domain(t)->name : ""
+#define TRACE_MC_TASK(t, fmt, args...)                          \
+        TRACE(TS " " fmt "\n", TA(t), ##args)
 
 /*
  * Cache the budget along with the struct PID for a task so that we don't need