kamkow1/my-os-project2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tb Allow the user to kill current process in interactive mode (Ctrl+S)

Browse Source
This commit is contained in:
Kamil Kowalczyk
2025-09-20 12:41:54 +02:00
parent a24b1fc677
commit 222e846881
4 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
user/tb/interp.c
View File

@ -3,6 +3,7 @@
#include <ulib.h> #include <ulib.h>
#include "interp.h" #include "interp.h"
#include "runtime.h" #include "runtime.h"
#include "macros.h"
extern uint64_t PID; extern uint64_t PID;
@ -161,7 +162,7 @@ bool interp_readline(char *data, const char **bgptr, const char **endptr) {
return true; return true;
} }
bool interp_runstring(const char *string, InterpResult **res, bool logcmds) { bool interp_runstring(const char *string, InterpResult **res, bool logcmds, bool interactive) {
*res = &RES; *res = &RES;
string_memset(RES.errmsg, 0, sizeof(RES.errmsg)); string_memset(RES.errmsg, 0, sizeof(RES.errmsg));
@ -230,17 +231,26 @@ bool interp_runstring(const char *string, InterpResult **res, bool logcmds) {
processctl(app, PCTL_RUN, 0, 0, 0); processctl(app, PCTL_RUN, 0, 0, 0);
uint8_t b;
while(processctl(app, PCTL_POLLSTATE, 0, 0, 0) != 4) { while(processctl(app, PCTL_POLLSTATE, 0, 0, 0) != 4) {
if (interactive) {
int32_t nrd = ipcpipe(PID, IPCPIPE_IN, IPCPIPE_READ, &b, 1);
if (nrd > 0 && b == C('S')) {
processctl(app, PCTL_KILL, 0, 0, 0);
goto cleanup;
}
}
schedrelease(); schedrelease();
} }
cleanup: cleanup: {
for (size_t j = 0; j < argslen1; j++) { for (size_t j = 0; j < argslen1; j++) {
dlfree(args1[j]); dlfree(args1[j]);
} }
dlfree(args1); dlfree(args1);
dlfree(appname); dlfree(appname);
} }
}
tz_free(&tz); tz_free(&tz);
} }

2
user/tb/interp.h
View File

@ -33,6 +33,6 @@ typedef struct {
Token *tokens; Token *tokens;
} Tokenizer; } Tokenizer;
bool interp_runstring(const char *string, InterpResult **res, bool logcmds); bool interp_runstring(const char *string, InterpResult **res, bool logcmds, bool interactive);
#endif // TB_INTERP_H_ #endif // TB_INTERP_H_

7
user/tb/macros.h Normal file
View File

@ -0,0 +1,7 @@
#ifndef TB_MACROS_H_
#define TB_MACROS_H_
// keys
#define C(X) ((X)-'@')
#endif // TB_MACROS_H_

8
user/tb/main.c
View File

@ -2,9 +2,7 @@
#include <stddef.h> #include <stddef.h>
#include <ulib.h> #include <ulib.h>
#include "interp.h" #include "interp.h"
#include "macros.h"
// keys
#define C(X) ((X)-'@')
#define LINEBUF_MAX 1024 #define LINEBUF_MAX 1024
@ -75,7 +73,7 @@ void do_file(char *filepath) {
} }
InterpResult *res; InterpResult *res;
bool ok = interp_runstring((const char *)buf, &res, CONFIG.logcmds); bool ok = interp_runstring((const char *)buf, &res, CONFIG.logcmds, CONFIG.mode == MODE_INTERACTIVE);
if (!ok) { if (!ok) {
uprintf("Interpreter error:\n"); uprintf("Interpreter error:\n");
uprintf("%s\n", res->errmsg); uprintf("%s\n", res->errmsg);
@ -130,7 +128,7 @@ void do_mode_interactive(void) {
} }
uprintf("\n"); uprintf("\n");
InterpResult *res; InterpResult *res;
if (!interp_runstring(linebuf, &res, CONFIG.logcmds)) { if (!interp_runstring(linebuf, &res, CONFIG.logcmds, CONFIG.mode == MODE_INTERACTIVE)) {
LOG(LOG_ERR, "%s\n", res->errmsg); LOG(LOG_ERR, "%s\n", res->errmsg);
} }
} }