1 files changed, 41 insertions, 38 deletions
diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h
index cb8758f8aebf..0580340d0170 100644
--- a/include/litmus/sched_trace.h
+++ b/include/litmus/sched_trace.h
@@ -51,6 +51,7 @@ struct st_switch_away_data {	/* A process was switched away from on a given CPU.
        u64     exec_time;
 };
+/* changed: like everything */
 struct st_completion_data {     /* A job completed. */
        u32     exec;
        u16     flush_work;
@@ -76,8 +77,8 @@ struct st_resume_data {		/* A task resumes. */
 struct st_action_data {
        u64     when;
-        u32     action;
+        u8      action;
-        u8      __unused[4];
+        u8      __unused[7];
 };
 struct st_sys_release_data {
@@ -85,11 +86,13 @@ struct st_sys_release_data {
        u64     release;
 };
+/* changed: easy enough to remove */
 struct st_task_exit_data {
        u64     avg_exec_time;
        u64     max_exec_time;
 };
+/* changed: calculate yoself */
 struct st_task_tardy_data {
        u64     total_tardy;
        u32     max_tardy;
@@ -232,26 +235,26 @@ feather_callback void do_sched_trace_task_tardy(unsigned long id,
                trace_litmus_task_param(t);                             \
        } while (0)
-#define sched_trace_task_release(t)/*                                   \ */
+#define sched_trace_task_release(t)                                     \
-        /* do {                                                         \ */
+        do {                                                            \
-        /*      SCHED_TRACE(SCHED_TRACE_BASE_ID + 3,                    \ */
+                SCHED_TRACE(SCHED_TRACE_BASE_ID + 3,                    \
-        /*                      do_sched_trace_task_release, t);        \ */
+                                do_sched_trace_task_release, t);        \
-        /*      trace_litmus_task_release(t);                           \ */
+                trace_litmus_task_release(t);                           \
-        /* } while (0) */
+        } while (0)
-#define sched_trace_task_switch_to(t)/*                                         \ */
+#define sched_trace_task_switch_to(t)                                   \
-        /* do {                                                         \ */
+        do {                                                            \
-        /*      SCHED_TRACE(SCHED_TRACE_BASE_ID + 4,                    \ */
+                SCHED_TRACE(SCHED_TRACE_BASE_ID + 4,                    \
-        /*              do_sched_trace_task_switch_to, t);              \ */
+                        do_sched_trace_task_switch_to, t);              \
-        /*      trace_litmus_switch_to(t);                              \ */
+                trace_litmus_switch_to(t);                              \
-        /* } while (0) */
+        } while (0)
-#define sched_trace_task_switch_away(t)/*                                       \ */
+#define sched_trace_task_switch_away(t)                                 \
-        /* do {                                                         \ */
+        do {                                                            \
-        /*      SCHED_TRACE(SCHED_TRACE_BASE_ID + 5,                    \ */
+                SCHED_TRACE(SCHED_TRACE_BASE_ID + 5,                    \
-        /*              do_sched_trace_task_switch_away, t);            \ */
+                        do_sched_trace_task_switch_away, t);            \
-        /*      trace_litmus_switch_away(t);                            \ */
+                trace_litmus_switch_away(t);                            \
-        /* } while (0) */
+        } while (0)
 #define sched_trace_task_completion(t, forced)                          \
        do {                                                            \
@@ -261,30 +264,30 @@ feather_callback void do_sched_trace_task_tardy(unsigned long id,
                trace_litmus_task_completion(t, forced);                \
        } while (0)
-#define sched_trace_task_block_on(t, i)/*                                       \ */
+#define sched_trace_task_block_on(t, i)                                 \
-        /* do {                                                         \ */
+        do {                                                            \
-        /*      SCHED_TRACE(SCHED_TRACE_BASE_ID + 7,                    \ */
+                SCHED_TRACE(SCHED_TRACE_BASE_ID + 7,                    \
-        /*              do_sched_trace_task_block, t);                  \ */
+                        do_sched_trace_task_block, t);                  \
-        /*      trace_litmus_task_block(t, i);                          \ */
+                trace_litmus_task_block(t, i);                          \
-        /* } while (0) */
+        } while (0)
 #define sched_trace_task_block(t)                                       \
        sched_trace_task_block_on(t, 0)
-#define sched_trace_task_resume_on(t, i)/*                              \ */
+#define sched_trace_task_resume_on(t, i)                                \
-        /* do {                                                         \ */
+        do {                                                            \
-        /*      SCHED_TRACE(SCHED_TRACE_BASE_ID + 8,                    \ */
+                SCHED_TRACE(SCHED_TRACE_BASE_ID + 8,                    \
-        /*                      do_sched_trace_task_resume, t);         \ */
+                                do_sched_trace_task_resume, t);         \
-        /*      trace_litmus_task_resume(t, i);                         \ */
+                trace_litmus_task_resume(t, i);                         \
-        /* } while (0) */
+        } while (0)
 #define sched_trace_task_resume(t)                                      \
        sched_trace_task_resume_on(t, 0)
-#define sched_trace_resource_acquire(t, i)/*                            \ */
+#define sched_trace_resource_acquire(t, i)                              \
-        /* do {                                                         \ */
+        do {                                                            \
-        /*      trace_litmus_resource_acquire(t, i);                    \ */
+                trace_litmus_resource_acquire(t, i);                    \
-        /* } while (0) */
+        } while (0)
 #define sched_trace_resource_released(t, i)                             \
        do {                                                            \

diff --git a/include/litmus/sched_trace.h b/include/litmus/sched_trace.h index cb8758f8aebf..0580340d0170 100644 --- a/include/litmus/sched_trace.h +++ b/include/litmus/sched_trace.h
@@ -51,6 +51,7 @@ struct st_switch_away_data { /* A process was switched away from on a given CPU.
51	u64 exec_time;	51	u64 exec_time;
52	};	52	};
53		53
		54	/* changed: like everything */
54	struct st_completion_data { /* A job completed. */	55	struct st_completion_data { /* A job completed. */
55	u32 exec;	56	u32 exec;
56	u16 flush_work;	57	u16 flush_work;
@@ -76,8 +77,8 @@ struct st_resume_data { /* A task resumes. */
76		77
77	struct st_action_data {	78	struct st_action_data {
78	u64 when;	79	u64 when;
79	u32 action;	80	u8 action;
80	u8 __unused[4];	81	u8 __unused[7];
81	};	82	};
82		83
83	struct st_sys_release_data {	84	struct st_sys_release_data {
@@ -85,11 +86,13 @@ struct st_sys_release_data {
85	u64 release;	86	u64 release;
86	};	87	};
87		88
		89	/* changed: easy enough to remove */
88	struct st_task_exit_data {	90	struct st_task_exit_data {
89	u64 avg_exec_time;	91	u64 avg_exec_time;
90	u64 max_exec_time;	92	u64 max_exec_time;
91	};	93	};
92		94
		95	/* changed: calculate yoself */
93	struct st_task_tardy_data {	96	struct st_task_tardy_data {
94	u64 total_tardy;	97	u64 total_tardy;
95	u32 max_tardy;	98	u32 max_tardy;
@@ -232,26 +235,26 @@ feather_callback void do_sched_trace_task_tardy(unsigned long id,
232	trace_litmus_task_param(t); \	235	trace_litmus_task_param(t); \
233	} while (0)	236	} while (0)
234		237
235	#define sched_trace_task_release(t)/* \ */	238	#define sched_trace_task_release(t) \
236	/* do { \ */	239	do { \
237	/* SCHED_TRACE(SCHED_TRACE_BASE_ID + 3, \ */	240	SCHED_TRACE(SCHED_TRACE_BASE_ID + 3, \
238	/* do_sched_trace_task_release, t); \ */	241	do_sched_trace_task_release, t); \
239	/* trace_litmus_task_release(t); \ */	242	trace_litmus_task_release(t); \
240	/* } while (0) */	243	} while (0)
241		244
242	#define sched_trace_task_switch_to(t)/* \ */	245	#define sched_trace_task_switch_to(t) \
243	/* do { \ */	246	do { \
244	/* SCHED_TRACE(SCHED_TRACE_BASE_ID + 4, \ */	247	SCHED_TRACE(SCHED_TRACE_BASE_ID + 4, \
245	/* do_sched_trace_task_switch_to, t); \ */	248	do_sched_trace_task_switch_to, t); \
246	/* trace_litmus_switch_to(t); \ */	249	trace_litmus_switch_to(t); \
247	/* } while (0) */	250	} while (0)
248		251
249	#define sched_trace_task_switch_away(t)/* \ */	252	#define sched_trace_task_switch_away(t) \
250	/* do { \ */	253	do { \
251	/* SCHED_TRACE(SCHED_TRACE_BASE_ID + 5, \ */	254	SCHED_TRACE(SCHED_TRACE_BASE_ID + 5, \
252	/* do_sched_trace_task_switch_away, t); \ */	255	do_sched_trace_task_switch_away, t); \
253	/* trace_litmus_switch_away(t); \ */	256	trace_litmus_switch_away(t); \
254	/* } while (0) */	257	} while (0)
255		258
256	#define sched_trace_task_completion(t, forced) \	259	#define sched_trace_task_completion(t, forced) \
257	do { \	260	do { \
@@ -261,30 +264,30 @@ feather_callback void do_sched_trace_task_tardy(unsigned long id,
261	trace_litmus_task_completion(t, forced); \	264	trace_litmus_task_completion(t, forced); \
262	} while (0)	265	} while (0)
263		266
264	#define sched_trace_task_block_on(t, i)/* \ */	267	#define sched_trace_task_block_on(t, i) \
265	/* do { \ */	268	do { \
266	/* SCHED_TRACE(SCHED_TRACE_BASE_ID + 7, \ */	269	SCHED_TRACE(SCHED_TRACE_BASE_ID + 7, \
267	/* do_sched_trace_task_block, t); \ */	270	do_sched_trace_task_block, t); \
268	/* trace_litmus_task_block(t, i); \ */	271	trace_litmus_task_block(t, i); \
269	/* } while (0) */	272	} while (0)
270		273
271	#define sched_trace_task_block(t) \	274	#define sched_trace_task_block(t) \
272	sched_trace_task_block_on(t, 0)	275	sched_trace_task_block_on(t, 0)
273		276
274	#define sched_trace_task_resume_on(t, i)/* \ */	277	#define sched_trace_task_resume_on(t, i) \
275	/* do { \ */	278	do { \
276	/* SCHED_TRACE(SCHED_TRACE_BASE_ID + 8, \ */	279	SCHED_TRACE(SCHED_TRACE_BASE_ID + 8, \
277	/* do_sched_trace_task_resume, t); \ */	280	do_sched_trace_task_resume, t); \
278	/* trace_litmus_task_resume(t, i); \ */	281	trace_litmus_task_resume(t, i); \
279	/* } while (0) */	282	} while (0)
280		283
281	#define sched_trace_task_resume(t) \	284	#define sched_trace_task_resume(t) \
282	sched_trace_task_resume_on(t, 0)	285	sched_trace_task_resume_on(t, 0)
283		286
284	#define sched_trace_resource_acquire(t, i)/* \ */	287	#define sched_trace_resource_acquire(t, i) \
285	/* do { \ */	288	do { \
286	/* trace_litmus_resource_acquire(t, i); \ */	289	trace_litmus_resource_acquire(t, i); \
287	/* } while (0) */	290	} while (0)
288		291
289	#define sched_trace_resource_released(t, i) \	292	#define sched_trace_resource_released(t, i) \
290	do { \	293	do { \