Merge branch 'wip-merge-2.6.36' of ssh://cvs.cs.unc.edu/cvs/proj/litmus/repo/litmus2010 into wip-merge-2.6.36

2 files changed, 18 insertions, 6 deletions

diff --git a/include/litmus/debug_trace.h b/include/litmus/debug_trace.h
index b743aa96de79..48d086d5a44c 100644
--- a/include/litmus/debug_trace.h
+++ b/include/litmus/debug_trace.h
@@ -12,12 +12,24 @@ void dump_trace_buffer(int max);
 
 extern atomic_t __log_seq_no;
 
-#define TRACE(fmt, args...) \
-        sched_trace_log_message("%d P%d: " fmt, atomic_add_return(1, &__log_seq_no), \
-                                raw_smp_processor_id(), ## args)
+#ifdef CONFIG_SCHED_DEBUG_TRACE_CALLER
+#define TRACE_PREFIX "%d P%d [%s@%s:%d]: "
+#define TRACE_ARGS  atomic_add_return(1, &__log_seq_no),        \
+                raw_smp_processor_id(),                         \
+                __FUNCTION__, __FILE__, __LINE__
+#else
+#define TRACE_PREFIX "%d P%d: "
+#define TRACE_ARGS  atomic_add_return(1, &__log_seq_no), \
+                raw_smp_processor_id()
+#endif
+
+#define TRACE(fmt, args...)                                             \
+        sched_trace_log_message(TRACE_PREFIX fmt,                       \
+                                TRACE_ARGS,  ## args)
 
-#define TRACE_TASK(t, fmt, args...) \
-        TRACE("(%s/%d) " fmt, (t)->comm, (t)->pid, ##args)
+#define TRACE_TASK(t, fmt, args...)                     \
+        TRACE("(%s/%d:%d) " fmt, (t)->comm, (t)->pid,   \
+              (t)->rt_param.job_params.job_no,  ##args)
 
 #define TRACE_CUR(fmt, args...) \
         TRACE_TASK(current, fmt, ## args)
diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index 30f41869b455..246483783fc0 100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
@@ -62,7 +62,7 @@ inline static int budget_exhausted(struct task_struct* t)
 inline static lt_t budget_remaining(struct task_struct* t)
 {
         if (!budget_exhausted(t))
-                return get_exec_time(t) - get_exec_cost(t);
+                return get_exec_cost(t) - get_exec_time(t);
         else
                 /* avoid overflow */
                 return 0;