innov/xiuos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

minor fix

Browse Source
This commit is contained in:
TXuian
2024-12-24 16:48:52 +08:00
parent 74da96e1f1
commit 6b636dfde0
4 changed files with 11 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ubiquitous/XiZi_AIoT/softkernel/task/schedule.c
+2 -3
View File
@@ -122,10 +122,9 @@ void task_dead(struct Thread* thd)
assert(thd != NULL);
struct ScheduleNode* snode = &thd->snode;
assert(snode->state == READY);
assert(snode->state == INIT || snode->state == READY);
bool trans_res = task_trans_sched_state(snode, //
&g_scheduler.snode_state_pool[READY], //
&g_scheduler.snode_state_pool[snode->state], //
&g_scheduler.snode_state_pool[DEAD], DEAD);
assert(trans_res = true);
assert(RBTTREE_DELETE_SUCC == rbt_delete(&g_scheduler.snode_state_pool[DEAD], snode->snode_id));
Ubiquitous/XiZi_AIoT/softkernel/task/semaphore.c
+3 -2
View File
@@ -106,7 +106,8 @@ bool ksemaphore_wait(struct XiziSemaphorePool* sem_pool, struct Thread* thd, sem
// waiting at the sem
sem->val--;
THREAD_TRANS_STATE(thd, BLOCKED);
assert(RBTTREE_INSERT_SECC == rbt_insert(&sem->wait_thd_tree, thd->tid, thd));
int rbt_insert_res = rbt_insert(&sem->wait_thd_tree, thd->tid, thd);
assert(RBTTREE_INSERT_SECC == rbt_insert_res || RBTTREE_INSERT_EXISTED == rbt_insert_res);
return true;
}
@@ -119,7 +120,7 @@ bool ksemaphore_signal(struct XiziSemaphorePool* sem_pool, sem_id_t sem_id)
return false;
}
if (sem->val < 0) {
if (sem->val < 0 && !rbt_is_empty(&sem->wait_thd_tree)) {
assert(!rbt_is_empty(&sem->wait_thd_tree));
RbtNode* root = sem->wait_thd_tree.root;
struct Thread* thd = (struct Thread*)root->data;
Ubiquitous/XiZi_AIoT/softkernel/task/task.c
+2 -2
View File
@@ -185,7 +185,7 @@ static void _free_thread(struct Thread* task)
if (task->memspace->thread_to_notify != NULL) {
if (task->memspace->thread_to_notify != task) {
if (task->memspace->thread_to_notify->snode.state == BLOCKED) {
THREAD_TRANS_STATE(task->memspace->thread_to_notify, READY);
THREAD_TRANS_STATE(task->memspace->thread_to_notify, TRANS_WAKING);
} else {
task->memspace->thread_to_notify->advance_unblock = true;
}
@@ -323,7 +323,7 @@ static void central_trans_task_state()
if (snode->state == RUNNING || snode->state == READY) {
task_into_ready(thd);
} else {
ERROR("Thread %s(%d) Error trans to READY\n", thd->name, thd->tid);
ERROR("Thread %s(%d) Error trans to READY(from %d)\n", thd->name, thd->tid, snode->state);
}
break;
}