Merge branch 'wip-nested-locking' into tegra-nested-lockingwip-nested-locking

Conflicts:
	Makefile
	include/linux/fs.h

1 files changed, 73 insertions, 0 deletions

diff --git a/litmus/jobs.c b/litmus/jobs.c
new file mode 100644
index 00000000000..7bc75bba863
--- /dev/null
+++ b/litmus/jobs.c
@@ -0,0 +1,73 @@
+/* litmus/jobs.c - common job control code
+ */
+
+#include <linux/sched.h>
+
+#include <litmus/litmus.h>
+#include <litmus/jobs.h>
+#include <litmus/trace.h>
+
+static inline void setup_release(struct task_struct *t, lt_t release)
+{
+        /* prepare next release */
+        tsk_rt(t)->job_params.release   = release;
+        tsk_rt(t)->job_params.deadline += release + get_rt_period(t);
+        tsk_rt(t)->job_params.exec_time = 0;
+        /* update job sequence number */
+        tsk_rt(t)->job_params.job_no++;
+
+        /* don't confuse Linux */
+        t->rt.time_slice = 1;
+}
+
+void prepare_for_next_period(struct task_struct *t)
+{
+        BUG_ON(!t);
+
+        /* Record lateness before we set up the next job's
+         * release and deadline. Lateness may be negative.
+         */
+        t->rt_param.job_params.lateness =
+                (long long)litmus_clock() - 
+                (long long)t->rt_param.job_params.deadline;
+
+        setup_release(t, get_release(t) + get_rt_period(t));
+}
+
+void release_at(struct task_struct *t, lt_t start)
+{
+        BUG_ON(!t);
+        setup_release(t, start);
+        tsk_rt(t)->completed = 0;
+}
+
+
+/*
+ *      Deactivate current task until the beginning of the next period.
+ */
+long complete_job(void)
+{
+        lt_t amount;
+        lt_t now = litmus_clock();
+        lt_t exec_time = tsk_rt(current)->job_params.exec_time;
+
+        tsk_rt(current)->tot_exec_time += exec_time;
+        if (lt_before(tsk_rt(current)->max_exec_time, exec_time))
+                tsk_rt(current)->max_exec_time = exec_time;
+
+        if (is_tardy(current, now)) {
+                amount = now - get_deadline(current);
+                if (lt_after(amount, tsk_rt(current)->max_tardy))
+                        tsk_rt(current)->max_tardy = amount;
+                tsk_rt(current)->total_tardy += amount;
+                ++tsk_rt(current)->missed;
+        }
+
+        /* Mark that we do not excute anymore */
+        tsk_rt(current)->completed = 1;
+        /* call schedule, this will return when a new job arrives
+         * it also takes care of preparing for the next release
+         */
+        schedule();
+        return 0;
+}