T119: implement syscall and monitor interface to debug_print_capabilities

[barrelfish] / usr / fish / fish_common.c

diff --git a/usr/fish/fish_common.c b/usr/fish/fish_common.c
index 5ec5261..208bd06 100644 (file)
--- a/usr/fish/fish_common.c
+++ b/usr/fish/fish_common.c
@@ -23,6 +23,7 @@
 #include <barrelfish/dispatch.h>
 #include <barrelfish_kpi/init.h>
 #include <barrelfish/debug.h>
+#include <barrelfish/monitor_client.h>
 #include <barrelfish/nameservice_client.h>
 #include <barrelfish/spawn_client.h>
 #include <barrelfish/terminal.h>
@@ -123,6 +124,11 @@ static int print_cspace(int argc, char *argv[])
     return EXIT_SUCCESS;
 }
 
+static int debug_print_caps(int argc, char *argv[]) {
+    monitor_debug_print_cababilities();
+    return EXIT_SUCCESS;
+}
+
 static int setenvcmd(int argc, char *argv[])
 {
     if (argc <= 1) {
@@ -504,6 +510,61 @@ static int cat(int argc, char *argv[])
     return ret;
 }
 
+#define LINE_SIZE 16
+static int hd(int argc, char *argv[])
+{
+    if(argc < 2) {
+        printf("Usage: %s [file...]\n", argv[0]);
+        return EXIT_FAILURE;
+    }
+
+    uint8_t buf[1024];
+    size_t size;
+    vfs_handle_t vh;
+    errval_t err;
+    int ret = EXIT_SUCCESS;
+
+    for (int i = 1; i < argc; i++) {
+        char *path = vfs_path_mkabsolute(cwd, argv[i]);
+        err = vfs_open(path, &vh);
+        free(path);
+        if (err_is_fail(err)) {
+            printf("%s: file not found\n", argv[i]);
+            ret = EXIT_FAILURE;
+            continue;
+        }
+
+        printf("Contents of %s\n", argv[i]);
+        int k=0;
+        do {
+            err = vfs_read(vh, buf, sizeof(buf), &size);
+            if (err_is_fail(err)) {
+                // XXX: Close any files that might be open
+                DEBUG_ERR(err, "error reading file");
+                return EXIT_FAILURE;
+            }
+
+            for (int j = k%LINE_SIZE; j < size; j++) {
+                if (j % LINE_SIZE == 0) {
+                    printf("%08X: ", k+j);
+                }
+                printf("%02x%s", buf[j], (j+1)%LINE_SIZE == 0 ? "\n" : " ");
+            }
+            k+=size;
+        } while(size > 0);
+        if (k%LINE_SIZE) {
+            printf("\n");
+        }
+
+        err = vfs_close(vh);
+        if (err_is_fail(err)) {
+            DEBUG_ERR(err, "in vfs_close");
+        }
+    }
+
+    return ret;
+}
+
 static int cat2(int argc, char *argv[])
 {
     errval_t err;
@@ -1146,6 +1207,7 @@ static struct cmd commands[] = {
     {"pwd", pwd, "Print current working directory"},
     {"touch", touch, "Create an empty file"},
     {"cat", cat, "Print the contents of file(s)"},
+    {"hd", hd, "Print the contents of file(s) as hexdump"},
     {"cat2", cat2, "Print the contents of file(s) into another file"},
     {"dd", dd, "copy stuff"},
     {"cp", cp, "Copy files"},
@@ -1156,6 +1218,7 @@ static struct cmd commands[] = {
     {"src", src, "Execute the list of commands in a file"},
     {"printenv", printenv, "Display environment variables"},
     {"free", freecmd, "Display amount of free memory in the system"},
+    {"debug_print_caps", debug_print_caps, "Display cspace debug information"},
 };
 
 static void getline(char *input, size_t size)