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

Neater thread creation flags.

Browse Source
This commit is contained in:
Bahadir Balban
2009-10-21 16:58:10 +03:00
parent 2caf0478d8
commit cc2d740900
5 changed files with 64 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
conts/posix/mm0/mm/clone.c
View File

@@ -22,11 +22,6 @@ int sys_fork(struct tcb *parent)
struct tcb *child;
struct exregs_data exregs;
struct task_ids ids;
// = {
// .tid = TASK_ID_INVALID,
// .spid = parent->spid, /* spid to copy from */
// .tgid = TASK_ID_INVALID, /* FIXME: !!! FIX THIS */
// };
/* Make all shadows in this task read-only */
vm_freeze_shadows(parent);
@@ -36,8 +31,8 @@ int sys_fork(struct tcb *parent)
* kernel stack and kernel-side tcb copied
*/
if (IS_ERR(child = task_create(parent, &ids,
THREAD_COPY_SPACE,
TCB_NO_SHARING)))
TCB_NO_SHARING,
TC_COPY_SPACE)))
return (int)child;
/* Set child's fork return value to 0 */
@@ -64,27 +59,17 @@ int sys_fork(struct tcb *parent)
return child->tid;
}
int do_clone(struct tcb *parent,
unsigned long child_stack,
unsigned int flags)
int do_clone(struct tcb *parent, unsigned long child_stack,
unsigned int flags, unsigned int sysflags)
{
struct exregs_data exregs;
struct task_ids ids;
struct tcb *child;
int err;
/*
* Determine whether the cloned
* thread is in parent's thread group
*/
if (flags & TCB_SHARED_TGROUP)
ids.tgid = parent->tgid;
else
ids.tgid = TASK_ID_INVALID;
if (IS_ERR(child = task_create(parent, &ids,
THREAD_SAME_SPACE,
flags)))
flags,
sysflags)))
return (int)child;
/* Set up child stack marks with given stack argument */
@@ -122,23 +107,28 @@ int sys_clone(struct tcb *parent,
unsigned int clone_flags)
{
unsigned int flags = 0;
unsigned int sysflags = 0;
if (!child_stack)
return -EINVAL;
if (clone_flags & CLONE_VM)
if (clone_flags & CLONE_VM) {
flags |= TCB_SHARED_VM;
sysflags |= TC_SHARE_SPACE;
}
if (clone_flags & CLONE_FS)
flags |= TCB_SHARED_FS;
if (clone_flags & CLONE_FILES)
flags |= TCB_SHARED_FILES;
if (clone_flags & CLONE_THREAD)
if (clone_flags & CLONE_THREAD) {
flags |= TCB_SHARED_TGROUP;
sysflags |= TC_SHARE_GROUP;
}
if (clone_flags & CLONE_PARENT)
flags |= TCB_SHARED_PARENT;
return do_clone(parent,
(unsigned long)child_stack,
flags);
flags, sysflags);
}

4
conts/posix/mm0/mm/execve.c
View File

@@ -79,8 +79,8 @@ int init_execve(char *filepath)
vmfile = self->files->fd[fd].vmfile;
if (IS_ERR(new_task = task_create(0, &ids,
THREAD_NEW_SPACE,
TCB_NO_SHARING))) {
TCB_NO_SHARING,
TC_NEW_SPACE))) {
sys_close(self, fd);
return (int)new_task;
}

12
conts/posix/mm0/mm/task.c
View File

@@ -342,7 +342,7 @@ int copy_tcb(struct tcb *to, struct tcb *from, unsigned int share_flags)
}
struct tcb *task_create(struct tcb *parent, struct task_ids *ids,
unsigned int ctrl_flags, unsigned int share_flags)
unsigned int share_flags, unsigned int ctrl_flags)
{
struct tcb *task;
int err;
@@ -354,15 +354,7 @@ struct tcb *task_create(struct tcb *parent, struct task_ids *ids,
if (parent) {
ids->tid = parent->tid;
ids->spid = parent->spid;
/*
* Determine whether the cloned thread
* is in parent's thread group
*/
if (share_flags & TCB_SHARED_TGROUP)
ids->tgid = parent->tgid;
else
ids->tgid = TASK_ID_INVALID;
ids->tgid = parent->tgid;
}
/* Create the thread structures and address space */