Added preemptive locking.

Currently is always preempting. This needs to be configurable via proc.

4 files changed, 62 insertions, 5 deletions

diff --git a/include/litmus/dgl.h b/include/litmus/dgl.h
index 1721fd978c06..458b9b789a4e 100644
--- a/include/litmus/dgl.h
+++ b/include/litmus/dgl.h
@@ -4,7 +4,13 @@
 #include <litmus/color.h>
 #include <linux/list.h>
 
-typedef void (*acquired_t)(int cpu);
+struct dgl;
+struct dgl_group_req;
+
+typedef void (*acquired_t)(struct dgl_group_req *greq);
+typedef void (*preempted_t)(struct dgl_group_req *greq);
+typedef unsigned long long (*prio_t)(struct dgl *dgl,
+                                     struct dgl_group_req *greq);
 
 /*
  * A request for @replica amount of a single resource.
@@ -13,6 +19,8 @@ struct dgl_req {
         unsigned short          replicas;
         struct list_head        list;
         struct dgl_group_req    *greq;
+
+        int                     satisfied:1;
 };
 
 /*
@@ -25,7 +33,7 @@ struct dgl_group_req {
 
         struct dgl_req          *requests;
 
-        unsigned long long      ts;
+        unsigned long long      priority;
         struct task_struct      *task;
 };
 
@@ -35,6 +43,7 @@ struct dgl_group_req {
 struct dgl_resource {
         unsigned long           free_replicas;
         struct list_head        waiting;
+        struct list_head        acquired;
 };
 
 /*
@@ -51,7 +60,11 @@ struct dgl {
         unsigned long           num_resources;
         unsigned long           num_replicas;
 
+        int                     sid_start;
+
         acquired_t              cpu_acquired;
+        prio_t                  assign_priority;
+        preempted_t             cpu_preempted;
 };
 
 void dgl_init(struct dgl *dgl, unsigned long num_resources,
diff --git a/include/litmus/preempt.h b/include/litmus/preempt.h
index 5b69e26fc57d..cbf315aa01e9 100644
--- a/include/litmus/preempt.h
+++ b/include/litmus/preempt.h
@@ -13,8 +13,7 @@ extern DEFINE_PER_CPU_SHARED_ALIGNED(atomic_t, resched_state);
 
 #ifdef CONFIG_PREEMPT_STATE_TRACE
 const char* sched_state_name(int s);
-//#define TRACE_STATE(fmt, args...) TRACE("SCHED_STATE " fmt, args)
-#define TRACE_STATE(fmt, args...) /* ignore */
+#define TRACE_STATE(fmt, args...) TRACE("SCHED_STATE " fmt, args)
 #else
 #define TRACE_STATE(fmt, args...) /* ignore */
 #endif
diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h
index ae925fbda849..59fa5db6f40c 100644
--- a/include/litmus/sched_trace.h
+++ b/include/litmus/sched_trace.h
@@ -209,7 +209,8 @@ feather_callback void do_sched_trace_task_tardy(unsigned long id,
 #define trace_litmus_server_switch_away(sid, job, tid, tjob)
 #define trace_litmus_server_release(sid, job, release, deadline)
 #define trace_litmus_server_completion(sid, job)
-
+#define trace_litmus_server_block(sid)
+#define trace_litmus_server_resume(sid)
 #endif
 
 
@@ -348,6 +349,16 @@ feather_callback void do_sched_trace_task_tardy(unsigned long id,
                 trace_litmus_server_completion(sid, job);               \
         } while (0)
 
+#define sched_trace_server_resume(sid)                          \
+        do {                                                            \
+                trace_litmus_server_resume(sid);                        \
+        } while (0)
+
+#define sched_trace_server_block(sid)                                   \
+        do {                                                            \
+                trace_litmus_server_block(sid);                         \
+        } while (0)
+
 #define sched_trace_quantum_boundary() /* NOT IMPLEMENTED */
 
 #endif /* __KERNEL__ */
diff --git a/include/trace/events/litmus.h b/include/trace/events/litmus.h
index 58ffdcd4c546..f7143aa0d184 100644
--- a/include/trace/events/litmus.h
+++ b/include/trace/events/litmus.h
@@ -437,6 +437,40 @@ TRACE_EVENT(litmus_server_completion,
         TP_printk("completion(server(%d, %d))\n", __entry->sid, __entry->job)
 );
 
+TRACE_EVENT(litmus_server_resume,
+
+        TP_PROTO(int sid),
+
+        TP_ARGS(sid),
+
+        TP_STRUCT__entry(
+                __field( int, sid)
+        ),
+
+        TP_fast_assign(
+                __entry->sid = sid;
+        ),
+
+        TP_printk("resume(server(%d))\n", __entry->sid)
+);
+
+TRACE_EVENT(litmus_server_block,
+
+        TP_PROTO(int sid),
+
+        TP_ARGS(sid),
+
+        TP_STRUCT__entry(
+                __field( int, sid)
+        ),
+
+        TP_fast_assign(
+                __entry->sid = sid;
+        ),
+
+        TP_printk("block(server(%d))\n", __entry->sid)
+);
+
 #endif /* _SCHED_TASK_TRACEPOINT_H */
 
 /* Must stay outside the protection */