aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/litmus/clock.h1
-rw-r--r--include/litmus/color_queue.h3
-rw-r--r--include/litmus/debug_trace.h18
-rw-r--r--include/litmus/lockdown.h2
-rw-r--r--include/litmus/sched_trace.h79
5 files changed, 59 insertions, 44 deletions
diff --git a/include/litmus/clock.h b/include/litmus/clock.h
index 9b285db7f60c..bb493e73d502 100644
--- a/include/litmus/clock.h
+++ b/include/litmus/clock.h
@@ -2,6 +2,7 @@
2#define _LITMUS_CLOCK_H_ 2#define _LITMUS_CLOCK_H_
3 3
4#if defined(CONFIG_EXYNOS_MCT) 4#if defined(CONFIG_EXYNOS_MCT)
5
5/* 6/*
6 * Only used if we are using the EXYNOS MCT clock. 7 * Only used if we are using the EXYNOS MCT clock.
7 */ 8 */
diff --git a/include/litmus/color_queue.h b/include/litmus/color_queue.h
index 95dd395c0b9c..7a49afedf929 100644
--- a/include/litmus/color_queue.h
+++ b/include/litmus/color_queue.h
@@ -60,4 +60,7 @@ int color_queue_enqueue_flush(struct task_struct *ts);
60 60
61void cleanup_color_page_infos(struct list_head *head); 61void cleanup_color_page_infos(struct list_head *head);
62 62
63int color_cache_task(struct task_struct *t);
64int color_uncache_task(struct task_struct *t);
65
63#endif 66#endif
diff --git a/include/litmus/debug_trace.h b/include/litmus/debug_trace.h
index ee4a7b4844c8..2808bf66f55a 100644
--- a/include/litmus/debug_trace.h
+++ b/include/litmus/debug_trace.h
@@ -17,10 +17,22 @@ extern atomic_t __log_seq_no;
17#define TRACE_ARGS atomic_add_return(1, &__log_seq_no), \ 17#define TRACE_ARGS atomic_add_return(1, &__log_seq_no), \
18 raw_smp_processor_id(), \ 18 raw_smp_processor_id(), \
19 __FUNCTION__, __FILE__, __LINE__ 19 __FUNCTION__, __FILE__, __LINE__
20#define STRACE(fmt, args...) \
21 sched_trace_log_message("%d P%d [%s@%s:%d]: " fmt, \
22 TRACE_ARGS, ## args)
23#define STRACE2(fmt, args...) \
24 sched_trace_log_message("%d P%d [%s@%s:%d]: " fmt, \
25 TRACE_ARGS, ## args)
20#else 26#else
21#define TRACE_PREFIX "%d P%d: " 27#define TRACE_PREFIX "%d P%d: "
22#define TRACE_ARGS atomic_add_return(1, &__log_seq_no), \ 28#define TRACE_ARGS atomic_add_return(1, &__log_seq_no), \
23 raw_smp_processor_id() 29 raw_smp_processor_id()
30#define STRACE(fmt, args...) \
31 sched_trace_log_message("%d P%d : " fmt, \
32 TRACE_ARGS, ## args)
33#define STRACE2(fmt, args...) \
34 sched_trace_log_message("%d P%d : " fmt, \
35 TRACE_ARGS, ## args)
24#endif 36#endif
25 37
26#define TRACE(fmt, args...) \ 38#define TRACE(fmt, args...) \
@@ -33,12 +45,6 @@ extern atomic_t __log_seq_no;
33 45
34#define TRACE_CUR(fmt, args...) \ 46#define TRACE_CUR(fmt, args...) \
35 TRACE_TASK(current, fmt, ## args) 47 TRACE_TASK(current, fmt, ## args)
36#define STRACE(fmt, args...) \
37 sched_trace_log_message("%d P%d [%s@%s:%d]: " fmt, \
38 TRACE_ARGS, ## args)
39#define STRACE2(fmt, args...) \
40 sched_trace_log_message("%d P%d [%s@%s:%d]: " fmt, \
41 TRACE_ARGS, ## args)
42 48
43 49
44 50
diff --git a/include/litmus/lockdown.h b/include/litmus/lockdown.h
index 78cd9c856571..ddd50accd2c9 100644
--- a/include/litmus/lockdown.h
+++ b/include/litmus/lockdown.h
@@ -4,8 +4,10 @@
4#include <linux/types.h> 4#include <linux/types.h>
5 5
6#define UNLOCK_ALL 0x00000000 /* allocation in any way */ 6#define UNLOCK_ALL 0x00000000 /* allocation in any way */
7#define LOCK_ALL (~UNLOCK_ALL)
7 8
8u32 color_read_in_mem(u32 lock_val, u32 unlock_val, void *start, void *end); 9u32 color_read_in_mem(u32 lock_val, u32 unlock_val, void *start, void *end);
10u32 color_read_in_mem_lock(u32 lock_val, u32 unlock_val, void *start, void *end);
9 11
10void set_lockdown(u32 lockdown_state); 12void set_lockdown(u32 lockdown_state);
11 13
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 */
54struct st_completion_data { /* A job completed. */ 55struct 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
77struct st_action_data { 78struct 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
83struct st_sys_release_data { 84struct 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 */
88struct st_task_exit_data { 90struct 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 */
93struct st_task_tardy_data { 96struct 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 { \
generated by cgit v1.2.2 (git 2.25.0) at 2024-11-26 02:20:23 -0500