aboutsummaryrefslogtreecommitdiffstats
path: root/include/litmus
diff options
context:
space:
mode:
authorGlenn Elliott <gelliott@cs.unc.edu>2012-12-09 16:53:50 -0500
committerGlenn Elliott <gelliott@cs.unc.edu>2012-12-09 16:55:39 -0500
commitfbd9574e298157b54c38f82f536e5cea8f766dff (patch)
treeab8985a838b6b4c69b99f28d6338a3b9a7721dc4 /include/litmus
parentfccce270a5540021b544d439595fa0a736242ff0 (diff)
Rename klitirqd klmirqd.
Diffstat (limited to 'include/litmus')
-rw-r--r--[-rwxr-xr-x]include/litmus/aux_tasks.h0
-rw-r--r--[-rwxr-xr-x]include/litmus/ikglp_lock.h0
-rw-r--r--[-rwxr-xr-x]include/litmus/litmus.h0
-rw-r--r--include/litmus/litmus_softirq.h42
-rw-r--r--[-rwxr-xr-x]include/litmus/rt_param.h18
-rw-r--r--include/litmus/sched_plugin.h8
6 files changed, 34 insertions, 34 deletions
diff --git a/include/litmus/aux_tasks.h b/include/litmus/aux_tasks.h
index 87745c1c0df0..87745c1c0df0 100755..100644
--- a/include/litmus/aux_tasks.h
+++ b/include/litmus/aux_tasks.h
diff --git a/include/litmus/ikglp_lock.h b/include/litmus/ikglp_lock.h
index af155eadbb35..af155eadbb35 100755..100644
--- a/include/litmus/ikglp_lock.h
+++ b/include/litmus/ikglp_lock.h
diff --git a/include/litmus/litmus.h b/include/litmus/litmus.h
index 711b88e2b3d1..711b88e2b3d1 100755..100644
--- a/include/litmus/litmus.h
+++ b/include/litmus/litmus.h
diff --git a/include/litmus/litmus_softirq.h b/include/litmus/litmus_softirq.h
index 1eb5ea1a6c4b..46fe89148505 100644
--- a/include/litmus/litmus_softirq.h
+++ b/include/litmus/litmus_softirq.h
@@ -13,7 +13,7 @@
13 Tasklets are current scheduled in FIFO order with 13 Tasklets are current scheduled in FIFO order with
14 NO priority inheritance for "blocked" tasklets. 14 NO priority inheritance for "blocked" tasklets.
15 15
16 klitirqd assumes the priority of the owner of the 16 klmirqd assumes the priority of the owner of the
17 tasklet when the tasklet is next to execute. 17 tasklet when the tasklet is next to execute.
18 18
19 Currently, hi-tasklets are scheduled before 19 Currently, hi-tasklets are scheduled before
@@ -21,7 +21,7 @@
21 And likewise, low-tasklets are scheduled before work 21 And likewise, low-tasklets are scheduled before work
22 queue objects. This priority inversion probably needs 22 queue objects. This priority inversion probably needs
23 to be fixed, though it is not an issue if our work with 23 to be fixed, though it is not an issue if our work with
24 GPUs as GPUs are owned (and associated klitirqds) for 24 GPUs as GPUs are owned (and associated klmirqds) for
25 exclusive time periods, thus no inversions can 25 exclusive time periods, thus no inversions can
26 occur. 26 occur.
27 */ 27 */
@@ -30,7 +30,7 @@
30 30
31#define NR_LITMUS_SOFTIRQD CONFIG_NR_LITMUS_SOFTIRQD 31#define NR_LITMUS_SOFTIRQD CONFIG_NR_LITMUS_SOFTIRQD
32 32
33/* Spawns NR_LITMUS_SOFTIRQD klitirqd daemons. 33/* Spawns NR_LITMUS_SOFTIRQD klmirqd daemons.
34 Actual launch of threads is deffered to kworker's 34 Actual launch of threads is deffered to kworker's
35 workqueue, so daemons will likely not be immediately 35 workqueue, so daemons will likely not be immediately
36 running when this function returns, though the required 36 running when this function returns, though the required
@@ -52,43 +52,43 @@
52 FIXME: change array to a CPU topology or array of cpumasks 52 FIXME: change array to a CPU topology or array of cpumasks
53 53
54 */ 54 */
55void spawn_klitirqd(int* affinity); 55void spawn_klmirqd(int* affinity);
56 56
57 57
58/* Raises a flag to tell klitirqds to terminate. 58/* Raises a flag to tell klmirqds to terminate.
59 Termination is async, so some threads may be running 59 Termination is async, so some threads may be running
60 after function return. */ 60 after function return. */
61void kill_klitirqd(void); 61void kill_klmirqd(void);
62 62
63 63
64/* Returns 1 if all NR_LITMUS_SOFTIRQD klitirqs are ready 64/* Returns 1 if all NR_LITMUS_SOFTIRQD klitirqs are ready
65 to handle tasklets. 0, otherwise.*/ 65 to handle tasklets. 0, otherwise.*/
66int klitirqd_is_ready(void); 66int klmirqd_is_ready(void);
67 67
68/* Returns 1 if no NR_LITMUS_SOFTIRQD klitirqs are ready 68/* Returns 1 if no NR_LITMUS_SOFTIRQD klitirqs are ready
69 to handle tasklets. 0, otherwise.*/ 69 to handle tasklets. 0, otherwise.*/
70int klitirqd_is_dead(void); 70int klmirqd_is_dead(void);
71 71
72/* Flushes all pending work out to the OS for regular 72/* Flushes all pending work out to the OS for regular
73 * tasklet/work processing of the specified 'owner' 73 * tasklet/work processing of the specified 'owner'
74 * 74 *
75 * PRECOND: klitirqd_thread must have a clear entry 75 * PRECOND: klmirqd_thread must have a clear entry
76 * in the GPU registry, otherwise this call will become 76 * in the GPU registry, otherwise this call will become
77 * a no-op as work will loop back to the klitirqd_thread. 77 * a no-op as work will loop back to the klmirqd_thread.
78 * 78 *
79 * Pass NULL for owner to flush ALL pending items. 79 * Pass NULL for owner to flush ALL pending items.
80 */ 80 */
81void flush_pending(struct task_struct* klitirqd_thread, 81void flush_pending(struct task_struct* klmirqd_thread,
82 struct task_struct* owner); 82 struct task_struct* owner);
83 83
84struct task_struct* get_klitirqd(unsigned int k_id); 84struct task_struct* get_klmirqd(unsigned int k_id);
85 85
86 86
87extern int __litmus_tasklet_schedule( 87extern int __litmus_tasklet_schedule(
88 struct tasklet_struct *t, 88 struct tasklet_struct *t,
89 unsigned int k_id); 89 unsigned int k_id);
90 90
91/* schedule a tasklet on klitirqd #k_id */ 91/* schedule a tasklet on klmirqd #k_id */
92static inline int litmus_tasklet_schedule( 92static inline int litmus_tasklet_schedule(
93 struct tasklet_struct *t, 93 struct tasklet_struct *t,
94 unsigned int k_id) 94 unsigned int k_id)
@@ -113,7 +113,7 @@ static inline int _litmus_tasklet_schedule(
113extern int __litmus_tasklet_hi_schedule(struct tasklet_struct *t, 113extern int __litmus_tasklet_hi_schedule(struct tasklet_struct *t,
114 unsigned int k_id); 114 unsigned int k_id);
115 115
116/* schedule a hi tasklet on klitirqd #k_id */ 116/* schedule a hi tasklet on klmirqd #k_id */
117static inline int litmus_tasklet_hi_schedule(struct tasklet_struct *t, 117static inline int litmus_tasklet_hi_schedule(struct tasklet_struct *t,
118 unsigned int k_id) 118 unsigned int k_id)
119{ 119{
@@ -138,7 +138,7 @@ extern int __litmus_tasklet_hi_schedule_first(
138 struct tasklet_struct *t, 138 struct tasklet_struct *t,
139 unsigned int k_id); 139 unsigned int k_id);
140 140
141/* schedule a hi tasklet on klitirqd #k_id on next go-around */ 141/* schedule a hi tasklet on klmirqd #k_id on next go-around */
142/* PRECONDITION: Interrupts must be disabled. */ 142/* PRECONDITION: Interrupts must be disabled. */
143static inline int litmus_tasklet_hi_schedule_first( 143static inline int litmus_tasklet_hi_schedule_first(
144 struct tasklet_struct *t, 144 struct tasklet_struct *t,
@@ -178,22 +178,22 @@ static inline int litmus_schedule_work(
178///////////// mutex operations for client threads. 178///////////// mutex operations for client threads.
179 179
180void down_and_set_stat(struct task_struct* t, 180void down_and_set_stat(struct task_struct* t,
181 enum klitirqd_sem_status to_set, 181 enum klmirqd_sem_status to_set,
182 struct mutex* sem); 182 struct mutex* sem);
183 183
184void __down_and_reset_and_set_stat(struct task_struct* t, 184void __down_and_reset_and_set_stat(struct task_struct* t,
185 enum klitirqd_sem_status to_reset, 185 enum klmirqd_sem_status to_reset,
186 enum klitirqd_sem_status to_set, 186 enum klmirqd_sem_status to_set,
187 struct mutex* sem); 187 struct mutex* sem);
188 188
189void up_and_set_stat(struct task_struct* t, 189void up_and_set_stat(struct task_struct* t,
190 enum klitirqd_sem_status to_set, 190 enum klmirqd_sem_status to_set,
191 struct mutex* sem); 191 struct mutex* sem);
192 192
193 193
194 194
195void release_klitirqd_lock(struct task_struct* t); 195void release_klmirqd_lock(struct task_struct* t);
196 196
197int reacquire_klitirqd_lock(struct task_struct* t); 197int reacquire_klmirqd_lock(struct task_struct* t);
198 198
199#endif 199#endif
diff --git a/include/litmus/rt_param.h b/include/litmus/rt_param.h
index aca78a835529..47301c04d862 100755..100644
--- a/include/litmus/rt_param.h
+++ b/include/litmus/rt_param.h
@@ -166,7 +166,7 @@ struct rt_job {
166 166
167struct pfair_param; 167struct pfair_param;
168 168
169enum klitirqd_sem_status 169enum klmirqd_sem_status
170{ 170{
171 NEED_TO_REACQUIRE, 171 NEED_TO_REACQUIRE,
172 REACQUIRING, 172 REACQUIRING,
@@ -223,26 +223,26 @@ struct rt_param {
223 /* proxy threads have minimum priority by default */ 223 /* proxy threads have minimum priority by default */
224 unsigned int is_proxy_thread:1; 224 unsigned int is_proxy_thread:1;
225 225
226 /* pointer to klitirqd currently working on this 226 /* pointer to klmirqd currently working on this
227 task_struct's behalf. only set by the task pointed 227 task_struct's behalf. only set by the task pointed
228 to by klitirqd. 228 to by klmirqd.
229 229
230 ptr only valid if is_proxy_thread == 0 230 ptr only valid if is_proxy_thread == 0
231 */ 231 */
232 struct task_struct* cur_klitirqd; 232 struct task_struct* cur_klmirqd;
233 233
234 /* Used to implement mutual execution exclusion between 234 /* Used to implement mutual execution exclusion between
235 * job and klitirqd execution. Job must always hold 235 * job and klmirqd execution. Job must always hold
236 * it's klitirqd_sem to execute. klitirqd instance 236 * it's klmirqd_sem to execute. klmirqd instance
237 * must hold the semaphore before executing on behalf 237 * must hold the semaphore before executing on behalf
238 * of a job. 238 * of a job.
239 */ 239 */
240 struct mutex klitirqd_sem; 240 struct mutex klmirqd_sem;
241 241
242 /* status of held klitirqd_sem, even if the held klitirqd_sem is from 242 /* status of held klmirqd_sem, even if the held klmirqd_sem is from
243 another task (only proxy threads do this though). 243 another task (only proxy threads do this though).
244 */ 244 */
245 atomic_t klitirqd_sem_stat; 245 atomic_t klmirqd_sem_stat;
246#endif 246#endif
247 247
248#ifdef CONFIG_LITMUS_NVIDIA 248#ifdef CONFIG_LITMUS_NVIDIA
diff --git a/include/litmus/sched_plugin.h b/include/litmus/sched_plugin.h
index 65736b2a9199..e8127f427d56 100644
--- a/include/litmus/sched_plugin.h
+++ b/include/litmus/sched_plugin.h
@@ -79,10 +79,10 @@ typedef void (*nested_increase_prio_t)(struct task_struct* t, struct task_struct
79typedef void (*nested_decrease_prio_t)(struct task_struct* t, struct task_struct* prio_inh, 79typedef void (*nested_decrease_prio_t)(struct task_struct* t, struct task_struct* prio_inh,
80 raw_spinlock_t *to_unlock, unsigned long irqflags); 80 raw_spinlock_t *to_unlock, unsigned long irqflags);
81 81
82typedef void (*increase_prio_klitirq_t)(struct task_struct* klitirqd, 82typedef void (*increase_prio_klitirq_t)(struct task_struct* klmirqd,
83 struct task_struct* old_owner, 83 struct task_struct* old_owner,
84 struct task_struct* new_owner); 84 struct task_struct* new_owner);
85typedef void (*decrease_prio_klitirqd_t)(struct task_struct* klitirqd, 85typedef void (*decrease_prio_klmirqd_t)(struct task_struct* klmirqd,
86 struct task_struct* old_owner); 86 struct task_struct* old_owner);
87 87
88 88
@@ -168,8 +168,8 @@ struct sched_plugin {
168#endif 168#endif
169 169
170#ifdef CONFIG_LITMUS_SOFTIRQD 170#ifdef CONFIG_LITMUS_SOFTIRQD
171 increase_prio_klitirq_t increase_prio_klitirqd; 171 increase_prio_klitirq_t increase_prio_klmirqd;
172 decrease_prio_klitirqd_t decrease_prio_klitirqd; 172 decrease_prio_klmirqd_t decrease_prio_klmirqd;
173#endif 173#endif
174#ifdef CONFIG_LITMUS_PAI_SOFTIRQD 174#ifdef CONFIG_LITMUS_PAI_SOFTIRQD
175 enqueue_pai_tasklet_t enqueue_pai_tasklet; 175 enqueue_pai_tasklet_t enqueue_pai_tasklet;