processctl() PCTL_SPAWN cmd, scheduler embryo state, redirected pipes
This commit is contained in:
@ -7,9 +7,10 @@
|
|||||||
#include "errors.h"
|
#include "errors.h"
|
||||||
#include "pipe.h"
|
#include "pipe.h"
|
||||||
|
|
||||||
int32_t ipc_pipeinit(IpcPipe *pipe) {
|
int32_t ipc_pipeinit(IpcPipe *pipe, uint64_t pid) {
|
||||||
hal_memset(pipe, 0, sizeof(*pipe));
|
hal_memset(pipe, 0, sizeof(*pipe));
|
||||||
spinlock_init(&pipe->spinlock);
|
spinlock_init(&pipe->spinlock);
|
||||||
|
pipe->ownerpid = pid;
|
||||||
pipe->rbuf.buffer = dlmalloc(IPC_PIPE_MAX);
|
pipe->rbuf.buffer = dlmalloc(IPC_PIPE_MAX);
|
||||||
if (pipe->rbuf.buffer == NULL) {
|
if (pipe->rbuf.buffer == NULL) {
|
||||||
return E_NOMEMORY;
|
return E_NOMEMORY;
|
||||||
@ -19,7 +20,9 @@ int32_t ipc_pipeinit(IpcPipe *pipe) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void ipc_pipefree(IpcPipe *pipe) {
|
void ipc_pipefree(IpcPipe *pipe) {
|
||||||
|
if (pipe->rbuf.buffer != NULL) {
|
||||||
dlfree(pipe->rbuf.buffer);
|
dlfree(pipe->rbuf.buffer);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t ipc_pipewrite(IpcPipe *pipe, const uint8_t *const buffer, size_t n) {
|
int32_t ipc_pipewrite(IpcPipe *pipe, const uint8_t *const buffer, size_t n) {
|
||||||
|
@ -12,9 +12,10 @@ typedef struct IpcPipe {
|
|||||||
struct IpcPipe *next;
|
struct IpcPipe *next;
|
||||||
RBuf rbuf;
|
RBuf rbuf;
|
||||||
SpinLock spinlock;
|
SpinLock spinlock;
|
||||||
|
uint64_t ownerpid;
|
||||||
} IpcPipe;
|
} IpcPipe;
|
||||||
|
|
||||||
int32_t ipc_pipeinit(IpcPipe *pipe);
|
int32_t ipc_pipeinit(IpcPipe *pipe, uint64_t pid);
|
||||||
void ipc_pipefree(IpcPipe *pipe);
|
void ipc_pipefree(IpcPipe *pipe);
|
||||||
int32_t ipc_pipewrite(IpcPipe *pipe, const uint8_t *const buffer, size_t n);
|
int32_t ipc_pipewrite(IpcPipe *pipe, const uint8_t *const buffer, size_t n);
|
||||||
int32_t ipc_piperead(IpcPipe *pipe, uint8_t *const buffer, size_t n);
|
int32_t ipc_piperead(IpcPipe *pipe, uint8_t *const buffer, size_t n);
|
||||||
|
@ -17,6 +17,7 @@
|
|||||||
#include "ps2kbproc/ps2kbproc.h"
|
#include "ps2kbproc/ps2kbproc.h"
|
||||||
#include "termproc/termproc.h"
|
#include "termproc/termproc.h"
|
||||||
#include "serialproc/serialproc.h"
|
#include "serialproc/serialproc.h"
|
||||||
|
#include "sysdefs/processctl.h"
|
||||||
|
|
||||||
#define PROC_REAPER_FREQ 30
|
#define PROC_REAPER_FREQ 30
|
||||||
|
|
||||||
@ -99,9 +100,10 @@ Proc *proc_spawnkern(void (*ent)(void), char *name) {
|
|||||||
proc->platformdata.trapframe.cs = 0x08;
|
proc->platformdata.trapframe.cs = 0x08;
|
||||||
proc->platformdata.trapframe.rip = (uint64_t)ent;
|
proc->platformdata.trapframe.rip = (uint64_t)ent;
|
||||||
proc->platformdata.cr3 = hal_vmm_current_cr3();
|
proc->platformdata.cr3 = hal_vmm_current_cr3();
|
||||||
proc->state = PROC_READY;
|
proc->state = PROC_EMBRYO;
|
||||||
proc->pid = pids++;
|
proc->pid = pids++;
|
||||||
spinlock_init(&proc->bcast_pipes.spinlock);
|
spinlock_init(&proc->bcast_pipes.spinlock);
|
||||||
|
spinlock_init(&proc->pipes_spinlock);
|
||||||
|
|
||||||
return proc;
|
return proc;
|
||||||
}
|
}
|
||||||
@ -165,9 +167,15 @@ Proc *proc_spawnuser(char *mountpoint, char *path) {
|
|||||||
proc->platformdata.trapframe.rflags = 0x202;
|
proc->platformdata.trapframe.rflags = 0x202;
|
||||||
proc->platformdata.trapframe.cs = 0x18 | 0x3;
|
proc->platformdata.trapframe.cs = 0x18 | 0x3;
|
||||||
proc->platformdata.trapframe.rip = aux.entry;
|
proc->platformdata.trapframe.rip = aux.entry;
|
||||||
proc->state = PROC_READY;
|
proc->state = PROC_EMBRYO;
|
||||||
proc->pid = pids++;
|
proc->pid = pids++;
|
||||||
spinlock_init(&proc->bcast_pipes.spinlock);
|
spinlock_init(&proc->bcast_pipes.spinlock);
|
||||||
|
spinlock_init(&proc->pipes_spinlock);
|
||||||
|
|
||||||
|
proc->pipes[0] = dlmalloc(sizeof(IpcPipe));
|
||||||
|
ipc_pipeinit(proc->pipes[0], proc->pid);
|
||||||
|
proc->pipes[1] = dlmalloc(sizeof(IpcPipe));
|
||||||
|
ipc_pipeinit(proc->pipes[1], proc->pid);
|
||||||
|
|
||||||
return proc;
|
return proc;
|
||||||
}
|
}
|
||||||
@ -184,7 +192,7 @@ Proc *proc_nextready(void) {
|
|||||||
if (proc == NULL) {
|
if (proc == NULL) {
|
||||||
proc = PROCS.procs;
|
proc = PROCS.procs;
|
||||||
}
|
}
|
||||||
if (proc->state != PROC_ZOMBIE) {
|
if (proc->state == PROC_READY) {
|
||||||
return proc;
|
return proc;
|
||||||
}
|
}
|
||||||
proc = proc->next;
|
proc = proc->next;
|
||||||
@ -209,7 +217,7 @@ void proc_reaper(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (size_t i = 0; i < PROC_PIPEHANDLES_MAX; i++) {
|
for (size_t i = 0; i < PROC_PIPEHANDLES_MAX; i++) {
|
||||||
if (zombie->pipes[i] != NULL) {
|
if (zombie->pipes[i] != NULL && zombie->pipes[i]->ownerpid == zombie->pid) {
|
||||||
dlfree(zombie->pipes[i]);
|
dlfree(zombie->pipes[i]);
|
||||||
ipc_pipefree(zombie->pipes[i]);
|
ipc_pipefree(zombie->pipes[i]);
|
||||||
zombie->pipes[i] = NULL;
|
zombie->pipes[i] = NULL;
|
||||||
@ -255,7 +263,6 @@ void proc_sched(void *cpustate) {
|
|||||||
PROCS.current->platformdata.trapframe = *frame;
|
PROCS.current->platformdata.trapframe = *frame;
|
||||||
|
|
||||||
PROCS.current = proc_nextready();
|
PROCS.current = proc_nextready();
|
||||||
PROCS.current->state = PROC_RUNNING;
|
|
||||||
|
|
||||||
hal_switchproc(&PROCS.current->platformdata.trapframe, (void *)PROCS.current->platformdata.cr3);
|
hal_switchproc(&PROCS.current->platformdata.trapframe, (void *)PROCS.current->platformdata.cr3);
|
||||||
}
|
}
|
||||||
@ -294,19 +301,25 @@ void proc_init(void) {
|
|||||||
kproc_init(proc_spawnkern(&kproc_fn, "kproc"));
|
kproc_init(proc_spawnkern(&kproc_fn, "kproc"));
|
||||||
proc_register(KPROC);
|
proc_register(KPROC);
|
||||||
PROCS.current = KPROC;
|
PROCS.current = KPROC;
|
||||||
|
KPROC->state = PROC_READY;
|
||||||
|
|
||||||
ps2kbproc_init(proc_spawnkern(&ps2kbproc_fn, "ps2kbproc"));
|
ps2kbproc_init(proc_spawnkern(&ps2kbproc_fn, "ps2kbproc"));
|
||||||
proc_register(PS2KBPROC);
|
proc_register(PS2KBPROC);
|
||||||
|
PS2KBPROC->state = PROC_READY;
|
||||||
|
|
||||||
termproc_init(proc_spawnkern(&termproc_fn, "termproc"));
|
termproc_init(proc_spawnkern(&termproc_fn, "termproc"));
|
||||||
proc_register(TERMPROC);
|
proc_register(TERMPROC);
|
||||||
|
TERMPROC->state = PROC_READY;
|
||||||
|
|
||||||
serialproc_init(proc_spawnkern(&serialproc_fn, "serialproc"));
|
/* serialproc_init(proc_spawnkern(&serialproc_fn, "serialproc")); */
|
||||||
proc_register(SERIALPROC);
|
/* proc_register(SERIALPROC); */
|
||||||
|
|
||||||
Proc *init = proc_spawnuser("base", "/bin/init");
|
Proc *init = proc_spawnuser("base", "/bin/init");
|
||||||
|
ipc_pipefree(init->pipes[0]);
|
||||||
|
dlfree(init->pipes[0]);
|
||||||
init->pipes[0] = TERMPROC->pipes[1];
|
init->pipes[0] = TERMPROC->pipes[1];
|
||||||
proc_register(init);
|
proc_register(init);
|
||||||
|
init->state = PROC_READY;
|
||||||
|
|
||||||
hal_switchproc(&PROCS.current->platformdata.trapframe, (void *)PROCS.current->platformdata.cr3);
|
hal_switchproc(&PROCS.current->platformdata.trapframe, (void *)PROCS.current->platformdata.cr3);
|
||||||
}
|
}
|
||||||
|
@ -25,10 +25,10 @@ typedef struct {
|
|||||||
} ProcPlatformData;
|
} ProcPlatformData;
|
||||||
|
|
||||||
enum {
|
enum {
|
||||||
PROC_READY,
|
PROC_EMBRYO = 0,
|
||||||
PROC_RUNNING,
|
PROC_READY = 1,
|
||||||
PROC_ZOMBIE,
|
PROC_ZOMBIE = 2,
|
||||||
PROC_WAITING,
|
PROC_WAITING = 3,
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef struct Proc {
|
typedef struct Proc {
|
||||||
@ -46,6 +46,7 @@ typedef struct Proc {
|
|||||||
VfsObj *vobjs[PROC_VFSHANDLES_MAX];
|
VfsObj *vobjs[PROC_VFSHANDLES_MAX];
|
||||||
uint64_t vobjcnt;
|
uint64_t vobjcnt;
|
||||||
IpcPipe *pipes[PROC_PIPEHANDLES_MAX];
|
IpcPipe *pipes[PROC_PIPEHANDLES_MAX];
|
||||||
|
SpinLock pipes_spinlock;
|
||||||
struct {
|
struct {
|
||||||
IpcPipe *list;
|
IpcPipe *list;
|
||||||
SpinLock spinlock;
|
SpinLock spinlock;
|
||||||
|
@ -12,9 +12,9 @@ Proc *SERIALPROC;
|
|||||||
void serialproc_init(Proc *proc) {
|
void serialproc_init(Proc *proc) {
|
||||||
SERIALPROC = proc;
|
SERIALPROC = proc;
|
||||||
SERIALPROC->pipes[0] = dlmalloc(sizeof(IpcPipe));
|
SERIALPROC->pipes[0] = dlmalloc(sizeof(IpcPipe));
|
||||||
ipc_pipeinit(SERIALPROC->pipes[0]);
|
ipc_pipeinit(SERIALPROC->pipes[0], SERIALPROC->pid);
|
||||||
SERIALPROC->pipes[1] = dlmalloc(sizeof(IpcPipe));
|
SERIALPROC->pipes[1] = dlmalloc(sizeof(IpcPipe));
|
||||||
ipc_pipeinit(SERIALPROC->pipes[1]);
|
ipc_pipeinit(SERIALPROC->pipes[1], SERIALPROC->pid);
|
||||||
|
|
||||||
io_out8(SERIAL_PORT + 1, 0x00);
|
io_out8(SERIAL_PORT + 1, 0x00);
|
||||||
io_out8(SERIAL_PORT + 3, 0x80);
|
io_out8(SERIAL_PORT + 3, 0x80);
|
||||||
@ -56,7 +56,10 @@ void serialproc_fn(void) {
|
|||||||
for (;;) {
|
for (;;) {
|
||||||
|
|
||||||
hal_memset(buf, 0, sizeof(buf));
|
hal_memset(buf, 0, sizeof(buf));
|
||||||
int32_t read = ipc_piperead(SERIALPROC->pipes[1], (uint8_t *)buf, sizeof(buf));
|
spinlock_acquire(&SERIALPROC->pipes_spinlock);
|
||||||
|
IpcPipe *inpipe = SERIALPROC->pipes[1];
|
||||||
|
spinlock_release(&SERIALPROC->pipes_spinlock);
|
||||||
|
int32_t read = ipc_piperead(inpipe, (uint8_t *)buf, sizeof(buf));
|
||||||
if (read > 0) {
|
if (read > 0) {
|
||||||
for (size_t i = 0; i < sizeof(buf); i++) {
|
for (size_t i = 0; i < sizeof(buf); i++) {
|
||||||
serialproc_write(buf[i]);
|
serialproc_write(buf[i]);
|
||||||
@ -68,6 +71,9 @@ void serialproc_fn(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
uint8_t inchar = io_in8(SERIAL_PORT);
|
uint8_t inchar = io_in8(SERIAL_PORT);
|
||||||
ipc_pipewrite(SERIALPROC->pipes[0], &inchar, sizeof(inchar));
|
spinlock_acquire(&SERIALPROC->pipes_spinlock);
|
||||||
|
IpcPipe *outpipe = SERIALPROC->pipes[0];
|
||||||
|
spinlock_release(&SERIALPROC->pipes_spinlock);
|
||||||
|
ipc_pipewrite(outpipe, &inchar, sizeof(inchar));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,20 +4,24 @@
|
|||||||
#include "kprintf.h"
|
#include "kprintf.h"
|
||||||
#include "hal/hal.h"
|
#include "hal/hal.h"
|
||||||
#include "dlmalloc/malloc.h"
|
#include "dlmalloc/malloc.h"
|
||||||
|
#include "spinlock/spinlock.h"
|
||||||
|
|
||||||
Proc *TERMPROC;
|
Proc *TERMPROC;
|
||||||
|
|
||||||
void termproc_init(Proc *proc) {
|
void termproc_init(Proc *proc) {
|
||||||
TERMPROC = proc;
|
TERMPROC = proc;
|
||||||
TERMPROC->pipes[1] = dlmalloc(sizeof(IpcPipe));
|
TERMPROC->pipes[1] = dlmalloc(sizeof(IpcPipe));
|
||||||
ipc_pipeinit(TERMPROC->pipes[1]);
|
ipc_pipeinit(TERMPROC->pipes[1], TERMPROC->pid);
|
||||||
}
|
}
|
||||||
|
|
||||||
void termproc_fn(void) {
|
void termproc_fn(void) {
|
||||||
char buf[100];
|
char buf[100];
|
||||||
for (;;) {
|
for (;;) {
|
||||||
hal_memset(buf, 0, sizeof(buf));
|
hal_memset(buf, 0, sizeof(buf));
|
||||||
int32_t read = ipc_piperead(TERMPROC->pipes[1], (uint8_t *)buf, sizeof(buf));
|
spinlock_acquire(&TERMPROC->pipes_spinlock);
|
||||||
|
IpcPipe *inpipe = TERMPROC->pipes[1];
|
||||||
|
spinlock_release(&TERMPROC->pipes_spinlock);
|
||||||
|
int32_t read = ipc_piperead(inpipe, (uint8_t *)buf, sizeof(buf));
|
||||||
if (read > 0) {
|
if (read > 0) {
|
||||||
kprintf("%.*s", read, buf);
|
kprintf("%.*s", read, buf);
|
||||||
}
|
}
|
||||||
|
@ -43,12 +43,14 @@ int32_t SYSCALL5(sys_ipcpipe, pid1, pipenum1, cmd1, buffer1, len1) {
|
|||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
|
|
||||||
if ((ret = ipc_pipeinit(pipe)) < 0) {
|
if ((ret = ipc_pipeinit(pipe, proc->pid)) < 0) {
|
||||||
ret = E_NOMEMORY;
|
ret = E_NOMEMORY;
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
spinlock_acquire(&proc->pipes_spinlock);
|
||||||
proc->pipes[pipenum] = pipe;
|
proc->pipes[pipenum] = pipe;
|
||||||
|
spinlock_release(&proc->pipes_spinlock);
|
||||||
|
|
||||||
ret = E_OK;
|
ret = E_OK;
|
||||||
} break;
|
} break;
|
||||||
@ -64,7 +66,9 @@ int32_t SYSCALL5(sys_ipcpipe, pid1, pipenum1, cmd1, buffer1, len1) {
|
|||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
spinlock_acquire(&proc->pipes_spinlock);
|
||||||
IpcPipe *pipe = proc->pipes[pipenum];
|
IpcPipe *pipe = proc->pipes[pipenum];
|
||||||
|
spinlock_release(&proc->pipes_spinlock);
|
||||||
|
|
||||||
if (pipe == NULL) {
|
if (pipe == NULL) {
|
||||||
ret = E_INVALIDARGUMENT;
|
ret = E_INVALIDARGUMENT;
|
||||||
@ -85,7 +89,9 @@ int32_t SYSCALL5(sys_ipcpipe, pid1, pipenum1, cmd1, buffer1, len1) {
|
|||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
spinlock_acquire(&proc->pipes_spinlock);
|
||||||
IpcPipe *pipe = proc->pipes[pipenum];
|
IpcPipe *pipe = proc->pipes[pipenum];
|
||||||
|
spinlock_release(&proc->pipes_spinlock);
|
||||||
|
|
||||||
if (pipe == NULL) {
|
if (pipe == NULL) {
|
||||||
ret = E_INVALIDARGUMENT;
|
ret = E_INVALIDARGUMENT;
|
||||||
@ -100,7 +106,9 @@ int32_t SYSCALL5(sys_ipcpipe, pid1, pipenum1, cmd1, buffer1, len1) {
|
|||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
spinlock_acquire(&proc->pipes_spinlock);
|
||||||
IpcPipe *pipe = proc->pipes[pipenum];
|
IpcPipe *pipe = proc->pipes[pipenum];
|
||||||
|
spinlock_release(&proc->pipes_spinlock);
|
||||||
|
|
||||||
if (pipe == NULL) {
|
if (pipe == NULL) {
|
||||||
ret = E_INVALIDARGUMENT;
|
ret = E_INVALIDARGUMENT;
|
||||||
@ -125,6 +133,43 @@ int32_t SYSCALL5(sys_ipcpipe, pid1, pipenum1, cmd1, buffer1, len1) {
|
|||||||
|
|
||||||
ret = E_OK;
|
ret = E_OK;
|
||||||
} break;
|
} break;
|
||||||
|
case IPCPIPE_REPLACE: {
|
||||||
|
if (pipenum >= PROC_PIPEHANDLES_MAX) {
|
||||||
|
ret = E_NOMEMORY;
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
|
||||||
|
uint64_t pid2 = buffer1;
|
||||||
|
uint64_t pipenum2 = len1;
|
||||||
|
|
||||||
|
spinlock_acquire(&PROCS.spinlock);
|
||||||
|
Proc *proc2 = NULL;
|
||||||
|
LL_FINDPROP(PROCS.procs, proc2, pid, pid2);
|
||||||
|
spinlock_release(&PROCS.spinlock);
|
||||||
|
|
||||||
|
if (proc2 == NULL) {
|
||||||
|
ret = E_INVALIDARGUMENT;
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (pipenum2 >= PROC_PIPEHANDLES_MAX) {
|
||||||
|
ret = E_NOMEMORY;
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
|
||||||
|
spinlock_acquire(&proc2->pipes_spinlock);
|
||||||
|
spinlock_acquire(&proc->pipes_spinlock);
|
||||||
|
|
||||||
|
if (proc->pipes[pipenum] != NULL) {
|
||||||
|
ipc_pipefree(proc->pipes[pipenum]);
|
||||||
|
dlfree(proc->pipes[pipenum]);
|
||||||
|
proc->pipes[pipenum] = NULL;
|
||||||
|
}
|
||||||
|
proc->pipes[pipenum] = proc2->pipes[pipenum2];
|
||||||
|
|
||||||
|
spinlock_release(&proc->pipes_spinlock);
|
||||||
|
spinlock_release(&proc2->pipes_spinlock);
|
||||||
|
} break;
|
||||||
default: {
|
default: {
|
||||||
ret = E_INVALIDARGUMENT;
|
ret = E_INVALIDARGUMENT;
|
||||||
} break;
|
} break;
|
||||||
|
@ -5,13 +5,19 @@
|
|||||||
#include "errors.h"
|
#include "errors.h"
|
||||||
#include "util/util.h"
|
#include "util/util.h"
|
||||||
#include "sysdefs/processctl.h"
|
#include "sysdefs/processctl.h"
|
||||||
|
#include "vfs/vfs.h"
|
||||||
|
#include "path/path.h"
|
||||||
|
#include "kprintf.h"
|
||||||
|
|
||||||
int32_t SYSCALL3(sys_processctl, pid1, cmd1, optsptr1) {
|
#define PCTL_MP_MAX 0xff
|
||||||
|
#define PCTL_PATH_MAX VFS_PATH_MAX
|
||||||
|
|
||||||
|
int32_t SYSCALL3(sys_processctl, pid1, cmd1, arg1) {
|
||||||
uint64_t pid = pid1;
|
uint64_t pid = pid1;
|
||||||
uint64_t cmd = cmd1;
|
uint64_t cmd = cmd1;
|
||||||
int32_t ret = E_OK;
|
int32_t ret = E_OK;
|
||||||
|
|
||||||
if (pid == -1) {
|
if (pid == (uint64_t)-1) {
|
||||||
pid = PROCS.current->pid;
|
pid = PROCS.current->pid;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -21,6 +27,10 @@ int32_t SYSCALL3(sys_processctl, pid1, cmd1, optsptr1) {
|
|||||||
spinlock_release(&PROCS.spinlock);
|
spinlock_release(&PROCS.spinlock);
|
||||||
|
|
||||||
if (proc == NULL) {
|
if (proc == NULL) {
|
||||||
|
if (cmd == PCTL_POLLSTATE) {
|
||||||
|
ret = 2;
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
ret = E_INVALIDARGUMENT;
|
ret = E_INVALIDARGUMENT;
|
||||||
goto done;
|
goto done;
|
||||||
}
|
}
|
||||||
@ -30,6 +40,36 @@ int32_t SYSCALL3(sys_processctl, pid1, cmd1, optsptr1) {
|
|||||||
proc_kill(proc);
|
proc_kill(proc);
|
||||||
ret = E_DOSCHEDULING;
|
ret = E_DOSCHEDULING;
|
||||||
} break;
|
} break;
|
||||||
|
case PCTL_SPAWN: {
|
||||||
|
const char *opath = (const char *)arg1;
|
||||||
|
|
||||||
|
if (opath == NULL) {
|
||||||
|
ret = E_INVALIDARGUMENT;
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
|
||||||
|
char mp[PCTL_MP_MAX];
|
||||||
|
char path[PCTL_PATH_MAX];
|
||||||
|
|
||||||
|
path_parse(opath, mp, path);
|
||||||
|
|
||||||
|
Proc *newproc = proc_spawnuser(mp, path);
|
||||||
|
if (newproc == NULL) {
|
||||||
|
ret = E_NOMEMORY;
|
||||||
|
goto done;
|
||||||
|
}
|
||||||
|
proc_register(newproc);
|
||||||
|
ret = newproc->pid;
|
||||||
|
} break;
|
||||||
|
case PCTL_POLLSTATE: {
|
||||||
|
ret = proc->state;
|
||||||
|
} break;
|
||||||
|
case PCTL_RUN: {
|
||||||
|
proc->state = PROC_READY;
|
||||||
|
} break;
|
||||||
|
case PCTL_GETPID: {
|
||||||
|
ret = proc->pid;
|
||||||
|
} break;
|
||||||
default: {
|
default: {
|
||||||
ret = E_INVALIDARGUMENT;
|
ret = E_INVALIDARGUMENT;
|
||||||
} break;
|
} break;
|
||||||
|
@ -4,6 +4,6 @@
|
|||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include "syscall.h"
|
#include "syscall.h"
|
||||||
|
|
||||||
int32_t SYSCALL3(sys_processctl, pid1, cmd1, optsptr1);
|
int32_t SYSCALL3(sys_processctl, pid1, cmd1, arg1);
|
||||||
|
|
||||||
#endif // SYSCALL_PROCESSCTL_H_
|
#endif // SYSCALL_PROCESSCTL_H_
|
||||||
|
@ -14,6 +14,7 @@ enum {
|
|||||||
IPCPIPE_READ = 1,
|
IPCPIPE_READ = 1,
|
||||||
IPCPIPE_WRITE = 2,
|
IPCPIPE_WRITE = 2,
|
||||||
IPCPIPE_ADD_BCAST = 3,
|
IPCPIPE_ADD_BCAST = 3,
|
||||||
|
IPCPIPE_REPLACE = 4,
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // SHARE_SYSDEFS_IPCPIPE_H_
|
#endif // SHARE_SYSDEFS_IPCPIPE_H_
|
||||||
|
@ -3,6 +3,10 @@
|
|||||||
|
|
||||||
enum {
|
enum {
|
||||||
PCTL_KILL = 0,
|
PCTL_KILL = 0,
|
||||||
|
PCTL_SPAWN = 1,
|
||||||
|
PCTL_POLLSTATE = 2,
|
||||||
|
PCTL_RUN = 3,
|
||||||
|
PCTL_GETPID = 4,
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // SHARE_HDRS_PROCESSCTL_H_
|
#endif // SHARE_HDRS_PROCESSCTL_H_
|
||||||
|
@ -11,8 +11,8 @@ int32_t ioctl(uint64_t ioh, uint64_t cmd, uint64_t arg1, uint64_t arg2, uint64_t
|
|||||||
return syscall(SYS_IOCTL, ioh, cmd, arg1, arg2, arg3, 0);
|
return syscall(SYS_IOCTL, ioh, cmd, arg1, arg2, arg3, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t processctl(uint64_t pid, uint64_t cmd, void *extra) {
|
int32_t processctl(uint64_t pid, uint64_t cmd, uint64_t arg1) {
|
||||||
return syscall(SYS_PROCESSCTL, pid, cmd, (uint64_t)extra, 0, 0, 0);
|
return syscall(SYS_PROCESSCTL, pid, cmd, arg1, 0, 0, 0);
|
||||||
}
|
}
|
||||||
|
|
||||||
int32_t ipcpipe(uint64_t pid, uint64_t pipenum, uint64_t cmd, uint8_t *buffer, size_t len) {
|
int32_t ipcpipe(uint64_t pid, uint64_t pipenum, uint64_t cmd, uint8_t *buffer, size_t len) {
|
||||||
|
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
void debugprint(const char *string);
|
void debugprint(const char *string);
|
||||||
int32_t ioctl(uint64_t ioh, uint64_t cmd, uint64_t arg1, uint64_t arg2, uint64_t arg3);
|
int32_t ioctl(uint64_t ioh, uint64_t cmd, uint64_t arg1, uint64_t arg2, uint64_t arg3);
|
||||||
int32_t processctl(uint64_t pid, uint64_t cmd, void *extra);
|
int32_t processctl(uint64_t pid, uint64_t cmd, uint64_t arg1);
|
||||||
int32_t ipcpipe(uint64_t pid, uint64_t pipenum, uint64_t cmd, uint8_t *buffer, size_t len);
|
int32_t ipcpipe(uint64_t pid, uint64_t pipenum, uint64_t cmd, uint8_t *buffer, size_t len);
|
||||||
|
|
||||||
#endif // ULIB_SYSTEM_SYSTEM_H_
|
#endif // ULIB_SYSTEM_SYSTEM_H_
|
||||||
|
@ -3,6 +3,7 @@
|
|||||||
#include <system/system.h>
|
#include <system/system.h>
|
||||||
#include <sysdefs/ioctl.h>
|
#include <sysdefs/ioctl.h>
|
||||||
#include <sysdefs/ipcpipe.h>
|
#include <sysdefs/ipcpipe.h>
|
||||||
|
#include <sysdefs/processctl.h>
|
||||||
#include <uprintf.h>
|
#include <uprintf.h>
|
||||||
#include <ansiq/all.h>
|
#include <ansiq/all.h>
|
||||||
|
|
||||||
@ -29,6 +30,11 @@ void main(void) {
|
|||||||
|
|
||||||
uprintf("Hello world using uprintf\n");
|
uprintf("Hello world using uprintf\n");
|
||||||
|
|
||||||
|
int32_t tb = processctl(-1, PCTL_SPAWN, (uint64_t)"base:/bin/tb");
|
||||||
|
ipcpipe(tb, IPCPIPE_OUT, IPCPIPE_REPLACE, (uint8_t *)(uint64_t)processctl(-1, PCTL_GETPID, 0), IPCPIPE_OUT);
|
||||||
|
processctl(tb, PCTL_RUN, 0);
|
||||||
|
while(processctl(tb, PCTL_POLLSTATE, 0) != 2);
|
||||||
|
|
||||||
if (ipcpipe(IPCPIPE_SELFPID, 10, IPCPIPE_MAKE, NULL, 0) < 0) {
|
if (ipcpipe(IPCPIPE_SELFPID, 10, IPCPIPE_MAKE, NULL, 0) < 0) {
|
||||||
uprintf("failed to create 10th pipe\n");
|
uprintf("failed to create 10th pipe\n");
|
||||||
}
|
}
|
||||||
|
2
user/tb/.gitignore
vendored
Normal file
2
user/tb/.gitignore
vendored
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
*.o
|
||||||
|
tb
|
24
user/tb/Makefile
Normal file
24
user/tb/Makefile
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
include $(ROOT)/mk/grabsrc.mk
|
||||||
|
include ../Makefile.inc
|
||||||
|
|
||||||
|
.PHONY: all clean
|
||||||
|
|
||||||
|
TARGET := tb
|
||||||
|
|
||||||
|
LDFLAGS += -L$(ROOT)/ulib -l:libulib.a
|
||||||
|
|
||||||
|
SRCFILES := $(call GRABSRC, .)
|
||||||
|
CFILES := $(call GET_CFILES, $(SRCFILES))
|
||||||
|
OBJ := $(call GET_OBJ, $(SRCFILES))
|
||||||
|
|
||||||
|
%.o: %.c
|
||||||
|
$(CC) $(CFLAGS) -c $< -o $@
|
||||||
|
|
||||||
|
all: $(TARGET)
|
||||||
|
|
||||||
|
$(TARGET): $(OBJ)
|
||||||
|
$(LD) $^ $(LDFLAGS) -o $@
|
||||||
|
echo $$(realpath $(TARGET)) >> $(FILES)
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -f $(OBJ) $(TARGET)
|
5
user/tb/main.c
Normal file
5
user/tb/main.c
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
#include <uprintf.h>
|
||||||
|
|
||||||
|
void main(void) {
|
||||||
|
uprintf("Hello from tb!\n");
|
||||||
|
}
|
Reference in New Issue
Block a user