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

ulib/Makefile

@@ -13,6 +13,7 @@ SRCFILES := $(call GRABSRC, \
 							dlmalloc \
 							sync \
 							args \
+							util \
 						)
 
 CFLAGS += -isystem $(ROOT)/share -isystem $(ROOT)/ulib -isystem $(ROOT)/std/include \

ulib/util/util.c

@@ -0,0 +1,6 @@
+#include <system/system.h>
+#include <sysdefs/processctl.h>
+
+void quit(void) {
+  processctl(-1, PCTL_KILL, 0, 0, 0);
+}

ulib/util/util.h

@@ -11,4 +11,6 @@
   *(X); \
 }) \
 
+void quit(void);
+
 #endif // ULIB_UTIL_UTIL_H_

user/diagdummy/.gitignore

@@ -0,0 +1,2 @@
+*.o
+diagdummy

user/diagdummy/Makefile

@@ -0,0 +1,24 @@
+include $(ROOT)/mk/grabsrc.mk
+include ../Makefile.inc
+
+.PHONY: all clean
+
+TARGET := diagdummy
+
+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)

user/diagdummy/block.c

@@ -0,0 +1,7 @@
+#include <ulib.h>
+
+void diagdummy_block(void) {
+  uprintf("blocking...\n");
+  while(1) {
+  }
+}

user/diagdummy/block.h

@@ -0,0 +1,6 @@
+#ifndef DIAGDUMMY_BLOCK_H_
+#define DIAGDUMMY_BLOCK_H_
+
+void diagdummy_block(void);
+
+#endif // DIAGDUMMY_BLOCK_H_

user/diagdummy/diagdummy.c

@@ -0,0 +1,17 @@
+#include <ulib.h>
+#include "block.h"
+
+void main(void) {
+  if (argslen() == 0) {
+    uprintf("diagdummy: no arguments\n");
+    quit();
+  }
+
+  char *cmd = args()[0];
+
+  if (string_strcmp(cmd, "block") == 0) {
+    diagdummy_block();
+  } else {
+    uprintf("diagdummy: unknown cmd %s\n", cmd);
+  }
+}

user/tb/interp.c

@@ -3,6 +3,7 @@
 #include <ulib.h>
 #include "interp.h"
 #include "runtime.h"
+#include "macros.h"
 
 extern uint64_t PID;
 
@@ -161,7 +162,7 @@ bool interp_readline(char *data, const char **bgptr, const char **endptr) {
   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;
   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);
 
+      uint8_t b;
       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();
       }
 
-      cleanup:
+      cleanup: {
         for (size_t j = 0; j < argslen1; j++) {
           dlfree(args1[j]);
         }
         dlfree(args1);
         dlfree(appname);
       }
+    }
 
     tz_free(&tz);
   }

user/tb/interp.h

@@ -33,6 +33,6 @@ typedef struct {
   Token *tokens;
 } 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_

user/tb/macros.h

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

user/tb/main.c

@@ -2,9 +2,7 @@
 #include <stddef.h>
 #include <ulib.h>
 #include "interp.h"
-
-// keys
-#define C(X) ((X)-'@')
+#include "macros.h"
 
 #define LINEBUF_MAX 1024
 
@@ -75,7 +73,7 @@ void do_file(char *filepath) {
   }
 
   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) {
     uprintf("Interpreter error:\n");
     uprintf("%s\n", res->errmsg);
@@ -130,7 +128,7 @@ void do_mode_interactive(void) {
     }
     uprintf("\n");
     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);
     }
   }