Adopt pipe handle inheritance
This commit is contained in:
@ -1,2 +1,3 @@
|
|||||||
@print "this is an init script!"
|
@print "this is an init script!"
|
||||||
base:/bin/pctl ls
|
base:/bin/pctl ls
|
||||||
|
base:/bin/tb -m interactive
|
||||||
|
@ -10,34 +10,18 @@
|
|||||||
#include <dlmalloc/malloc.h>
|
#include <dlmalloc/malloc.h>
|
||||||
#include <errors.h>
|
#include <errors.h>
|
||||||
|
|
||||||
#define SUBPROC_PIPE_OUT 0x1f
|
|
||||||
|
|
||||||
uint64_t PID;
|
uint64_t PID;
|
||||||
|
|
||||||
void main(void) {
|
void tb_runinitscript(void) {
|
||||||
PID = (uint64_t)processctl(-1, PCTL_GETPID, 0, 0, 0);
|
|
||||||
|
|
||||||
ipcpipe(PID, SUBPROC_PIPE_OUT, IPCPIPE_MAKE, NULL, 0);
|
|
||||||
|
|
||||||
char *tbargs[] = { "-m", "runfile", "-f", "base:/scripts/init.tb", "-logcmds", "yes" };
|
char *tbargs[] = { "-m", "runfile", "-f", "base:/scripts/init.tb", "-logcmds", "yes" };
|
||||||
int32_t tb = processctl(-1, PCTL_SPAWN, (uint64_t)"base:/bin/tb", (uint64_t)&tbargs, ARRLEN(tbargs));
|
int32_t tb = processctl(-1, PCTL_SPAWN, (uint64_t)"base:/bin/tb", (uint64_t)&tbargs, ARRLEN(tbargs));
|
||||||
ipcpipe(tb, IPCPIPE_OUT, IPCPIPE_REPLACE, (uint8_t *)PID, SUBPROC_PIPE_OUT);
|
|
||||||
|
|
||||||
ipcpipe(IPCPIPE_SELFPID, 10, IPCPIPE_MAKE, NULL, 0);
|
ipcpipe(IPCPIPE_SELFPID, 10, IPCPIPE_MAKE, NULL, 0);
|
||||||
ipcpipe(IPCPIPE_SELFPID, 10, IPCPIPE_ADD_BCAST, NULL, 1);
|
ipcpipe(IPCPIPE_SELFPID, 10, IPCPIPE_ADD_BCAST, NULL, 1);
|
||||||
|
|
||||||
#define OUTBUF_MAX 1024
|
|
||||||
char *outbuf = dlmalloc(OUTBUF_MAX);
|
|
||||||
|
|
||||||
processctl(tb, PCTL_RUN, 0, 0, 0);
|
processctl(tb, PCTL_RUN, 0, 0, 0);
|
||||||
|
|
||||||
for(;;) {
|
while(processctl(tb, PCTL_POLLSTATE, 0, 0, 0) != 4) {
|
||||||
string_memset(outbuf, 0, OUTBUF_MAX);
|
|
||||||
int32_t nrd = ipcpipe(PID, SUBPROC_PIPE_OUT, IPCPIPE_READ, (uint8_t *)outbuf, sizeof(outbuf));
|
|
||||||
if (nrd > 0) {
|
|
||||||
uprintf("%s", outbuf);
|
|
||||||
}
|
|
||||||
|
|
||||||
int32_t kbchr;
|
int32_t kbchr;
|
||||||
int32_t read = ipcpipe(IPCPIPE_SELFPID, 10, IPCPIPE_READ, (uint8_t *)&kbchr, sizeof(kbchr));
|
int32_t read = ipcpipe(IPCPIPE_SELFPID, 10, IPCPIPE_READ, (uint8_t *)&kbchr, sizeof(kbchr));
|
||||||
if (read > 0) {
|
if (read > 0) {
|
||||||
@ -49,6 +33,14 @@ void main(void) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void main(void) {
|
||||||
|
PID = (uint64_t)processctl(-1, PCTL_GETPID, 0, 0, 0);
|
||||||
|
|
||||||
|
tb_runinitscript();
|
||||||
|
|
||||||
|
uprintf("Shell exited! Please reboot the system.\n");
|
||||||
|
|
||||||
for(;;);
|
for(;;);
|
||||||
}
|
}
|
||||||
|
@ -13,7 +13,7 @@
|
|||||||
#include "interp.h"
|
#include "interp.h"
|
||||||
#include "runtime.h"
|
#include "runtime.h"
|
||||||
|
|
||||||
#define SUBPROC_PIPE_OUT 0x1f
|
/* #define SUBPROC_PIPE_OUT 31 */
|
||||||
|
|
||||||
extern uint64_t PID;
|
extern uint64_t PID;
|
||||||
|
|
||||||
@ -210,34 +210,18 @@ bool interp_runstring(const char *string, InterpResult **res, bool logcmds) {
|
|||||||
argtk = argtk->next;
|
argtk = argtk->next;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define OUTBUF_MAX 1024
|
int32_t app = processctl(-1, PCTL_SPAWN, (uint64_t)appname, (uint64_t)args1, argslen1);
|
||||||
char *outbuf = dlmalloc(OUTBUF_MAX);
|
|
||||||
string_memset(outbuf, 0, OUTBUF_MAX);
|
|
||||||
|
|
||||||
ipcpipe(PID, SUBPROC_PIPE_OUT, IPCPIPE_MAKE, NULL, 0);
|
|
||||||
|
|
||||||
int32_t app = processctl(-1, PCTL_SPAWN, (uint64_t)(char *)appname, (uint64_t)args1, argslen1);
|
|
||||||
if (app < 0) {
|
if (app < 0) {
|
||||||
usprintf(RES.errmsg, "Could not run %s: %s\n", appname, ERRSTRING(app));
|
usprintf(RES.errmsg, "Could not run %s: %s\n", appname, ERRSTRING(app));
|
||||||
ok = false;
|
ok = false;
|
||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
|
|
||||||
ipcpipe(app, IPCPIPE_OUT, IPCPIPE_REPLACE, (uint8_t *)PID, SUBPROC_PIPE_OUT);
|
|
||||||
ipcpipe(app, IPCPIPE_IN, IPCPIPE_REPLACE, (uint8_t *)PID, IPCPIPE_IN);
|
|
||||||
processctl(app, PCTL_RUN, 0, 0, 0);
|
processctl(app, PCTL_RUN, 0, 0, 0);
|
||||||
|
|
||||||
do {
|
while(processctl(app, PCTL_POLLSTATE, 0, 0, 0) != 4);
|
||||||
int32_t nrd = ipcpipe(PID, SUBPROC_PIPE_OUT, IPCPIPE_READ, (uint8_t *)outbuf, OUTBUF_MAX);
|
|
||||||
if (nrd > 0) {
|
|
||||||
uprintf("%s", outbuf);
|
|
||||||
string_memset(outbuf, 0, OUTBUF_MAX);
|
|
||||||
}
|
|
||||||
} while(processctl(app, PCTL_POLLSTATE, 0, 0, 0) != 4);
|
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
ipcpipe(PID, SUBPROC_PIPE_OUT, IPCPIPE_DELETE, NULL, 0);
|
|
||||||
dlfree(outbuf);
|
|
||||||
for (size_t j = 0; j < argslen1; j++) {
|
for (size_t j = 0; j < argslen1; j++) {
|
||||||
dlfree(args1[j]);
|
dlfree(args1[j]);
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user