Skip to content

Commit b616303

Browse files
committed
fixup: naming conventions with sched lock
1 parent 71347fa commit b616303

1 file changed

Lines changed: 11 additions & 10 deletions

File tree

src/ipc.c

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,14 @@ rt_inline rt_err_t _ipc_object_init(struct rt_ipc_object *ipc)
104104
*/
105105
struct rt_thread *rt_susp_list_dequeue(rt_susp_list_head_t *susp_list, rt_err_t thread_error)
106106
{
107-
rt_sched_lock_level_t level;
107+
rt_sched_lock_level_t slvl;
108108
rt_thread_t thread;
109109
rt_err_t error;
110110

111111
RT_SCHED_DEBUG_IS_UNLOCKED;
112112
RT_ASSERT(susp_list != RT_NULL);
113113

114-
rt_sched_lock(&level);
114+
rt_sched_lock(&slvl);
115115
if (!rt_list_isempty(susp_list))
116116
{
117117
thread = RT_THREAD_LIST_NODE_ENTRY(susp_list->next);
@@ -138,7 +138,7 @@ struct rt_thread *rt_susp_list_dequeue(rt_susp_list_head_t *susp_list, rt_err_t
138138
{
139139
thread = RT_NULL;
140140
}
141-
rt_sched_unlock(level);
141+
rt_sched_unlock(slvl);
142142

143143
LOG_D("resume thread:%s\n", thread->parent.name);
144144

@@ -244,11 +244,11 @@ rt_err_t rt_susp_list_enqueue(rt_susp_list_head_t *susp_list, rt_thread_t thread
244244
*/
245245
void rt_susp_list_print(rt_susp_list_head_t *list)
246246
{
247-
rt_sched_lock_level_t level;
247+
rt_sched_lock_level_t slvl;
248248
struct rt_thread *thread;
249249
struct rt_list_node *node;
250250

251-
rt_sched_lock(&level);
251+
rt_sched_lock(&slvl);
252252

253253
for (node = list->next; node != list; node = node->next)
254254
{
@@ -259,7 +259,7 @@ void rt_susp_list_print(rt_susp_list_head_t *list)
259259
rt_kprintf("/");
260260
}
261261

262-
rt_sched_unlock(level);
262+
rt_sched_unlock(slvl);
263263
}
264264

265265

@@ -1889,7 +1889,8 @@ rt_err_t rt_event_send(rt_event_t event, rt_uint32_t set)
18891889
{
18901890
struct rt_list_node *n;
18911891
struct rt_thread *thread;
1892-
rt_sched_lock_level_t level;
1892+
rt_sched_lock_level_t slvl;
1893+
rt_base_t level;
18931894
rt_base_t status;
18941895
rt_bool_t need_schedule;
18951896
rt_uint32_t need_clear_set = 0;
@@ -1910,7 +1911,7 @@ rt_err_t rt_event_send(rt_event_t event, rt_uint32_t set)
19101911

19111912
RT_OBJECT_HOOK_CALL(rt_object_put_hook, (&(event->parent.parent)));
19121913

1913-
rt_sched_lock(&level);
1914+
rt_sched_lock(&slvl);
19141915
if (!rt_list_isempty(&event->parent.suspend_thread))
19151916
{
19161917
/* search thread list to resume thread */
@@ -1942,7 +1943,7 @@ rt_err_t rt_event_send(rt_event_t event, rt_uint32_t set)
19421943
}
19431944
else
19441945
{
1945-
rt_sched_unlock(level);
1946+
rt_sched_unlock(slvl);
19461947
rt_spin_unlock_irqrestore(&(event->spinlock), level);
19471948

19481949
return -RT_EINVAL;
@@ -1973,7 +1974,7 @@ rt_err_t rt_event_send(rt_event_t event, rt_uint32_t set)
19731974
}
19741975
}
19751976

1976-
rt_sched_unlock(level);
1977+
rt_sched_unlock(slvl);
19771978
rt_spin_unlock_irqrestore(&(event->spinlock), level);
19781979

19791980
/* do a schedule */

0 commit comments

Comments
 (0)