sambuc/codezero
1
0
Fork 0
mirror of https://github.com/drasko/codezero.git synced 2026-01-12 10:53:16 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added thread_wait

Browse Source 
modified:   conts/test/main.c
	modified:   scripts/kernel/generate_kernel_cinfo.py
	modified:   src/api/thread.c
	modified:   src/generic/capability.c
This commit is contained in:
Bahadir Balban
2009-10-31 01:44:32 +02:00
parent 2839f46245
commit 5c93d9b8ba
4 changed files with 63 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
src/api/thread.c
View File

@@ -49,6 +49,48 @@ int thread_signal_sync(struct ktcb *task, unsigned int flags,
return ret;
}
int thread_wait(struct task_ids *ids)
{
struct ktcb *task, *n;
int ret;
if (!(task = tcb_find(ids->tid))) {
/* Retry in own queue till we find it */
retry:
spin_lock(&current->child_exit_list.list_lock);
list_foreach_removable_struct(task, n,
&current->child_exit_list.list,
task_list) {
if (task->tid == ids->tid) {
printk("%s: Found (%d) in exit queue.\n",
__FUNCTION__, task->tid);
list_remove(&task->task_list);
tcb_delete(task);
spin_unlock(&current->child_exit_list.list_lock);
return 0;
}
}
spin_unlock(&current->child_exit_list.list_lock);
schedule();
goto retry;
}
printk("%s: Found (%d) in global queue.\n",
__FUNCTION__, task->tid);
/* Got a handle on the task, wait on it conditionally */
WAIT_EVENT(&task->wqh_pager,
task->state == TASK_INACTIVE, ret);
/*
* We found it in global queue but
* now it must be in exit queue
*/
ktcb_list_remove(task, &current->child_exit_list);
tcb_delete(task);
return 0;
}
int thread_suspend(struct ktcb *task)
{
return thread_signal_sync(task, TASK_SUSPENDING, TASK_INACTIVE);
@@ -130,8 +172,10 @@ int thread_destroy(struct ktcb *task)
if (child->pagerid == current->tid &&
child != current) {
spin_unlock(&curcont->ktcb_list.list_lock);
/* Its a bug since nobody can interrupt us */
BUG_ON(thread_signal_sync(child, TASK_EXITING,
TASK_INACTIVE) < 0);
TASK_INACTIVE) < 0);
spin_lock(&curcont->ktcb_list.list_lock);
}
}
@@ -370,7 +414,8 @@ int sys_thread_control(unsigned int flags, struct task_ids *ids)
MAP_USR_RW_FLAGS, 1)) < 0)
return err;
if ((flags & THREAD_ACTION_MASK) != THREAD_CREATE)
if ((flags & THREAD_ACTION_MASK) != THREAD_CREATE &&
(flags & THREAD_ACTION_MASK) != THREAD_WAIT)
if (!(task = tcb_find(ids->tid)))
return -ESRCH;
@@ -393,6 +438,9 @@ int sys_thread_control(unsigned int flags, struct task_ids *ids)
case THREAD_RECYCLE:
ret = thread_recycle(task);
break;
case THREAD_WAIT:
ret = thread_wait(ids);
break;
default:
ret = -EINVAL;

9
src/generic/capability.c
View File

@@ -447,10 +447,13 @@ struct capability *cap_match_thread(struct capability *cap,
}
/* If no target and create, or vice versa, it really is a bug */
BUG_ON(!target && action_flags != THREAD_CREATE);
BUG_ON(target && action_flags == THREAD_CREATE);
BUG_ON(!target && (action_flags != THREAD_CREATE &&
action_flags != THREAD_WAIT));
BUG_ON(target && (action_flags == THREAD_CREATE ||
action_flags == THREAD_WAIT));
if (action_flags == THREAD_CREATE) {
if (action_flags == THREAD_CREATE ||
action_flags == THREAD_WAIT) {
/*
* FIXME: Add cid to task_ids arg.
*