WebSVN – HelenOS – Diff – /branches/dynload/uspace/app/trace/trace.c

 #include <fibril.h>
 #include <errno.h>
 #include <udebug.h>
 #include <async.h>
 #include <task.h>
+#include <mem.h>
+#include <string.h>
+#include <bool.h>
 #include <loader/loader.h>
+#include <io/console.h>
+#include <io/keycode.h>
+#include <fibril_sync.h>
 #include <libc.h>
 // Temporary: service and method names
 #include "proto.h"
 uintptr_t thread_hash_buf[THBUF_SIZE];
 int n_threads;
 int next_thread_id;
+ipc_call_t thread_ipc_req[THBUF_SIZE];
 int phoneid;
-int abort_trace;
+bool abort_trace;
 uintptr_t thash;
-volatile int paused;
+static bool paused;
+static fibril_condvar_t state_cv;
+static fibril_mutex_t state_lock;
+static bool cev_valid;
+static console_event_t cev;
 void thread_trace_start(uintptr_t thread_hash);
 static proto_t *proto_console;
 static task_id_t task_id;
 static loader_t *task_ldr;
+static bool task_wait_for;
 /** Combination of events/data to print. */
 display_mask_t display_mask;
 static int program_run_fibril(void *arg);
+static int cev_fibril(void *arg);
 static void program_run(void)
+{
     fid_t fid;
+    }
     fibril_add_ready(fid);
+}
+static void cev_fibril_start(void)
+{
+    fid_t fid;
+    fid = fibril_create(cev_fibril, NULL);
+    if (fid == 0) {
+        printf("Error creating fibril\n");
+        exit(1);
+    }
+    fibril_add_ready(fid);
+}
 static int program_run_fibril(void *arg)
+{
     int rc;
     /*
     return 0;
+}
 void val_print(sysarg_t val, val_type_t v_type)
+{
+    long sval;
+    sval = (long) val;
     switch (v_type) {
     case V_VOID:
         printf("<void>");
         break;
     case V_INTEGER:
-        printf("%ld", val);
+        printf("%ld", sval);
         break;
     case V_HASH:
     case V_PTR:
         printf("0x%08lx", val);
         break;
     case V_ERRNO:
-        if (val >= -15 && val <= 0) {
+        if (sval >= -15 && sval <= 0) {
-            printf("%ld %s (%s)", val,
+            printf("%ld %s (%s)", sval,
-                err_desc[-val].name,
+                err_desc[-sval].name,
-                err_desc[-val].desc);
+                err_desc[-sval].desc);
         } else {
-            printf("%ld", val);
+            printf("%ld", sval);
+        }
         break;
     case V_INT_ERRNO:
-        if (val >= -15 && val < 0) {
+        if (sval >= -15 && sval < 0) {
-            printf("%ld %s (%s)", val,
+            printf("%ld %s (%s)", sval,
-                err_desc[-val].name,
+                err_desc[-sval].name,
-                err_desc[-val].desc);
+                err_desc[-sval].desc);
         } else {
-            printf("%ld", val);
+            printf("%ld", sval);
+        }
         break;
     case V_CHAR:
-        if (val >= 0x20 && val < 0x7f) {
+        if (sval >= 0x20 && sval < 0x7f) {
-            printf("'%c'", val);
+            printf("'%c'", sval);
         } else {
-            switch (val) {
+            switch (sval) {
             case '\a': printf("'\\a'"); break;
             case '\b': printf("'\\b'"); break;
             case '\n': printf("'\\n'"); break;
             case '\r': printf("'\\r'"); break;
             case '\t': printf("'\\t'"); break;
 static void sc_ipc_call_async_fast(sysarg_t *sc_args, sysarg_t sc_rc)
+{
     ipc_call_t call;
     ipcarg_t phoneid;
+    if (sc_rc == (sysarg_t) IPC_CALLRET_FATAL ||
-    if (sc_rc == IPC_CALLRET_FATAL || sc_rc == IPC_CALLRET_TEMPORARY)
+        sc_rc == (sysarg_t) IPC_CALLRET_TEMPORARY)
         return;
     phoneid = sc_args[0];
     IPC_SET_METHOD(call, sc_args[1]);
 static void sc_ipc_call_async_slow(sysarg_t *sc_args, sysarg_t sc_rc)
+{
     ipc_call_t call;
     int rc;
+    if (sc_rc == (sysarg_t) IPC_CALLRET_FATAL ||
-    if (sc_rc == IPC_CALLRET_FATAL || sc_rc == IPC_CALLRET_TEMPORARY)
+        sc_rc == (sysarg_t) IPC_CALLRET_TEMPORARY)
         return;
     memset(&call, 0, sizeof(call));
     rc = udebug_mem_read(phoneid, &call.args, sc_args[1], sizeof(call.args));
 //  printf("call ipc_call_sync\n");
     ipcp_call_sync(phoneidx, &question, &reply);
+}
-static void sc_ipc_call_sync_slow(sysarg_t *sc_args)
+static void sc_ipc_call_sync_slow_b(unsigned thread_id, sysarg_t *sc_args)
+{
-    ipc_call_t question, reply;
+    ipc_call_t question;
     int rc;
     memset(&question, 0, sizeof(question));
-    rc = udebug_mem_read(phoneid, &question.args, sc_args[1], sizeof(question.args));
+    rc = udebug_mem_read(phoneid, &question.args, sc_args[1],
+        sizeof(question.args));
+    if (rc < 0) {
-    printf("dmr->%d\n", rc);
+        printf("Error: mem_read->%d\n", rc);
+        return;
+    }
+    thread_ipc_req[thread_id] = question;
+}
+static void sc_ipc_call_sync_slow_e(unsigned thread_id, sysarg_t *sc_args)
+{
-    if (rc < 0) return;
+    ipc_call_t reply;
+    int rc;
     memset(&reply, 0, sizeof(reply));
-    rc = udebug_mem_read(phoneid, &reply.args, sc_args[2], sizeof(reply.args));
+    rc = udebug_mem_read(phoneid, &reply.args, sc_args[2],
+        sizeof(reply.args));
+    if (rc < 0) {
-    printf("dmr->%d\n", rc);
+        printf("Error: mem_read->%d\n", rc);
-    if (rc < 0) return;
+        return;
+    }
-    ipcp_call_sync(sc_args[0], &question, &reply);
+    ipcp_call_sync(sc_args[0], &thread_ipc_req[thread_id], &reply);
+}
 static void sc_ipc_wait(sysarg_t *sc_args, int sc_rc)
+{
     ipc_call_t call;
         /* Print syscall name and arguments */
         printf("%s", syscall_desc[sc_id].name);
         print_sc_args(sc_args, syscall_desc[sc_id].n_args);
+    }
+    switch (sc_id) {
+    case SYS_IPC_CALL_SYNC_SLOW:
+        sc_ipc_call_sync_slow_b(thread_id, sc_args);
+        break;
+    default:
+        break;
+    }
     async_serialize_end();
+}
 static void event_syscall_e(unsigned thread_id, uintptr_t thread_hash,
     unsigned sc_id, sysarg_t sc_rc)
         break;
     case SYS_IPC_CALL_SYNC_FAST:
         sc_ipc_call_sync_fast(sc_args);
         break;
     case SYS_IPC_CALL_SYNC_SLOW:
-        sc_ipc_call_sync_slow(sc_args);
+        sc_ipc_call_sync_slow_e(thread_id, sc_args);
         break;
     case SYS_IPC_WAIT:
         sc_ipc_wait(sc_args, sc_rc);
         break;
     default:
     unsigned thread_id;
     sysarg_t val0, val1;
     thread_hash = (uintptr_t)thread_hash_arg;
     thread_id = next_thread_id++;
+    if (thread_id >= THBUF_SIZE) {
+        printf("Too many threads.\n");
+        return ELIMIT;
+    }
     printf("Start tracing thread [%d] (hash 0x%lx).\n", thread_id, thread_hash);
     while (!abort_trace) {
+        fibril_mutex_lock(&state_lock);
         if (paused) {
-            printf("Press R to resume (and be patient).\n");
+            printf("Thread [%d] paused. Press R to resume.\n",
-            while (paused) {
+                thread_id);
-                usleep(1000000);
+            while (paused)
-                fibril_yield();
+                fibril_condvar_wait(&state_cv, &state_lock);
-                printf(".");
-            }
-            printf("Resumed\n");
+            printf("Thread [%d] resumed.\n", thread_id);
+        }
+        fibril_mutex_unlock(&state_lock);
         /* Run thread until an event occurs */
         rc = udebug_go(phoneid, thread_hash,
             &ev_type, &val0, &val1);
             case UDEBUG_EVENT_SYSCALL_E:
                 event_syscall_e(thread_id, thread_hash, val0, (int)val1);
                 break;
             case UDEBUG_EVENT_STOP:
                 printf("Stop event\n");
+                fibril_mutex_lock(&state_lock);
+                paused = true;
+                fibril_mutex_unlock(&state_lock);
                 break;
             case UDEBUG_EVENT_THREAD_B:
                 event_thread_b(val0);
                 break;
             case UDEBUG_EVENT_THREAD_E:
                 printf("Thread 0x%lx exited.\n", val0);
+                fibril_mutex_lock(&state_lock);
-                abort_trace = 1;
+                abort_trace = true;
+                fibril_condvar_broadcast(&state_cv);
+                fibril_mutex_unlock(&state_lock);
                 break;
             default:
                 printf("Unknown event type %d.\n", ev_type);
                 break;
+            }
     /* Send arguments */
     rc = loader_set_args(ldr, argv);
     if (rc != EOK)
         goto error;
+    /* Send default files */
+    fdi_node_t *files[4];
+    fdi_node_t stdin_node;
+    fdi_node_t stdout_node;
+    fdi_node_t stderr_node;
+    if ((stdin != NULL) && (fnode(stdin, &stdin_node) == EOK))
+        files[0] = &stdin_node;
+    else
+        files[0] = NULL;
+    if ((stdout != NULL) && (fnode(stdout, &stdout_node) == EOK))
+        files[1] = &stdout_node;
+    else
+        files[1] = NULL;
+    if ((stderr != NULL) && (fnode(stderr, &stderr_node) == EOK))
+        files[2] = &stderr_node;
+    else
+        files[2] = NULL;
+    files[3] = NULL;
+    rc = loader_set_files(ldr, files);
+    if (rc != EOK)
+        goto error;
     /* Load the program. */
     rc = loader_load_program(ldr);
     if (rc != EOK)
         goto error;
     loader_abort(ldr);
     free(ldr);
     return NULL;
+}
+static int cev_fibril(void *arg)
+{
+    (void) arg;
+    while (true) {
+        fibril_mutex_lock(&state_lock);
+        while (cev_valid)
+            fibril_condvar_wait(&state_cv, &state_lock);
+        fibril_mutex_unlock(&state_lock);
+        if (!console_get_event(fphone(stdin), &cev))
+            return -1;
+        fibril_mutex_lock(&state_lock);
+        cev_valid = true;
+        fibril_condvar_broadcast(&state_cv);
+        fibril_mutex_unlock(&state_lock);
+    }
+}
 static void trace_task(task_id_t task_id)
+{
+    console_event_t ev;
+    bool done;
     int i;
     int rc;
-    int c;
     ipcp_init();
     /*
      * User apps now typically have console on phone 3.
     if (rc < 0) {
         printf("Failed to get thread list (error %d)\n", rc);
         return;
+    }
-    abort_trace = 0;
+    abort_trace = false;
     for (i = 0; i < n_threads; i++) {
         thread_trace_start(thread_hash_buf[i]);
+    }
+    done = false;
-    while(1) {
+    while (!done) {
+        fibril_mutex_lock(&state_lock);
+        while (!cev_valid && !abort_trace)
+            fibril_condvar_wait(&state_cv, &state_lock);
+        fibril_mutex_unlock(&state_lock);
-        c = getchar();
+        ev = cev;
+        fibril_mutex_lock(&state_lock);
+        cev_valid = false;
+        fibril_condvar_broadcast(&state_cv);
+        fibril_mutex_unlock(&state_lock);
-        if (c == 'q') break;
+        if (abort_trace)
+            break;
+        if (ev.type != KEY_PRESS)
+            continue;
-        if (c == 'p') {
+        switch (ev.key) {
+        case KC_Q:
+            done = true;
+            break;
+        case KC_P:
             printf("Pause...\n");
-            paused = 1;
             rc = udebug_stop(phoneid, thash);
+            if (rc != EOK)
-            printf("stop -> %d\n", rc);
+                printf("Error: stop -> %d\n", rc);
-        }
+            break;
-        if (c == 'r') {
+        case KC_R:
+            fibril_mutex_lock(&state_lock);
-            paused = 0;
+            paused = false;
+            fibril_condvar_broadcast(&state_cv);
+            fibril_mutex_unlock(&state_lock);
             printf("Resume...\n");
+            break;
+        }
+    }
     printf("\nTerminate debugging session...\n");
-    abort_trace = 1;
+    abort_trace = true;
     udebug_end(phoneid);
     ipc_hangup(phoneid);
     ipcp_cleanup();
         V_INTEGER,
         V_INTEGER
     };
     next_thread_id = 1;
-    paused = 0;
+    paused = false;
+    cev_valid = false;
+    fibril_mutex_initialize(&state_lock);
+    fibril_condvar_initialize(&state_cv);
     proto_init();
     p = proto_new("vfs");
+    o = oper_new("open", 2, arg_def, V_INT_ERRNO, 0, resp_def);
+    proto_add_oper(p, VFS_IN_OPEN, o);
+    o = oper_new("open_node", 4, arg_def, V_INT_ERRNO, 0, resp_def);
+    proto_add_oper(p, VFS_IN_OPEN_NODE, o);
     o = oper_new("read", 1, arg_def, V_ERRNO, 1, resp_def);
-    proto_add_oper(p, VFS_READ, o);
+    proto_add_oper(p, VFS_IN_READ, o);
     o = oper_new("write", 1, arg_def, V_ERRNO, 1, resp_def);
-    proto_add_oper(p, VFS_WRITE, o);
+    proto_add_oper(p, VFS_IN_WRITE, o);
+    o = oper_new("seek", 3, arg_def, V_ERRNO, 0, resp_def);
+    proto_add_oper(p, VFS_IN_SEEK, o);
     o = oper_new("truncate", 5, arg_def, V_ERRNO, 0, resp_def);
-    proto_add_oper(p, VFS_TRUNCATE, o);
+    proto_add_oper(p, VFS_IN_TRUNCATE, o);
+    o = oper_new("fstat", 1, arg_def, V_ERRNO, 0, resp_def);
+    proto_add_oper(p, VFS_IN_FSTAT, o);
+    o = oper_new("close", 1, arg_def, V_ERRNO, 0, resp_def);
+    proto_add_oper(p, VFS_IN_CLOSE, o);
     o = oper_new("mount", 2, arg_def, V_ERRNO, 0, resp_def);
-    proto_add_oper(p, VFS_MOUNT, o);
+    proto_add_oper(p, VFS_IN_MOUNT, o);
 /*  o = oper_new("unmount", 0, arg_def);
-    proto_add_oper(p, VFS_UNMOUNT, o);*/
+    proto_add_oper(p, VFS_IN_UNMOUNT, o);*/
-    o = oper_new("open", 2, arg_def, V_INT_ERRNO, 0, resp_def);
-    proto_add_oper(p, VFS_OPEN, o);
-    o = oper_new("close", 1, arg_def, V_ERRNO, 0, resp_def);
-    proto_add_oper(p, VFS_CLOSE, o);
-    o = oper_new("seek", 3, arg_def, V_ERRNO, 0, resp_def);
+    o = oper_new("sync", 1, arg_def, V_ERRNO, 0, resp_def);
-    proto_add_oper(p, VFS_SEEK, o);
+    proto_add_oper(p, VFS_IN_SYNC, o);
     o = oper_new("mkdir", 1, arg_def, V_ERRNO, 0, resp_def);
-    proto_add_oper(p, VFS_MKDIR, o);
+    proto_add_oper(p, VFS_IN_MKDIR, o);
     o = oper_new("unlink", 0, arg_def, V_ERRNO, 0, resp_def);
-    proto_add_oper(p, VFS_UNLINK, o);
+    proto_add_oper(p, VFS_IN_UNLINK, o);
     o = oper_new("rename", 0, arg_def, V_ERRNO, 0, resp_def);
-    proto_add_oper(p, VFS_RENAME, o);
+    proto_add_oper(p, VFS_IN_RENAME, o);
+    o = oper_new("stat", 0, arg_def, V_ERRNO, 0, resp_def);
+    proto_add_oper(p, VFS_IN_STAT, o);
     proto_register(SERVICE_VFS, p);
     p = proto_new("console");
+    o = oper_new("write", 1, arg_def, V_ERRNO, 1, resp_def);
+    proto_add_oper(p, VFS_IN_WRITE, o);
     resp_def[0] = V_INTEGER; resp_def[1] = V_INTEGER;
     resp_def[2] = V_INTEGER; resp_def[3] = V_CHAR;
     o = oper_new("getkey", 0, arg_def, V_ERRNO, 4, resp_def);
-    proto_add_oper(p, CONSOLE_GETKEY, o);
     arg_def[0] = V_CHAR;
-    o = oper_new("putchar", 1, arg_def, V_VOID, 0, resp_def);
-    proto_add_oper(p, CONSOLE_PUTCHAR, o);
-    o = oper_new("write", 0, arg_def, V_VOID, 0, resp_def);
-    proto_add_oper(p, CONSOLE_WRITE, o);
     o = oper_new("clear", 0, arg_def, V_VOID, 0, resp_def);
     proto_add_oper(p, CONSOLE_CLEAR, o);
     arg_def[0] = V_INTEGER; arg_def[1] = V_INTEGER;
     o = oper_new("goto", 2, arg_def, V_VOID, 0, resp_def);
     proto_add_oper(p, CONSOLE_GOTO, o);
     resp_def[0] = V_INTEGER; resp_def[1] = V_INTEGER;
     o = oper_new("getsize", 0, arg_def, V_INTEGER, 2, resp_def);
-    proto_add_oper(p, CONSOLE_GETSIZE, o);
+    proto_add_oper(p, CONSOLE_GET_SIZE, o);
-    o = oper_new("flush", 0, arg_def, V_VOID, 0, resp_def);
-    proto_add_oper(p, CONSOLE_FLUSH, o);
     arg_def[0] = V_INTEGER;
     o = oper_new("set_style", 1, arg_def, V_VOID, 0, resp_def);
     proto_add_oper(p, CONSOLE_SET_STYLE, o);
     arg_def[0] = V_INTEGER; arg_def[1] = V_INTEGER; arg_def[2] = V_INTEGER;
             if (arg[1] == 't') {
                 /* Trace an already running task */
                 --argc; ++argv;
                 task_id = strtol(*argv, &err_p, 10);
                 task_ldr = NULL;
+                task_wait_for = false;
                 if (*err_p) {
                     printf("Task ID syntax error\n");
                     print_syntax();
                     return -1;
+                }
+    {
         char **cp = argv;
         while (*cp) printf("'%s'\n", *cp++);
+    }
     task_ldr = preload_task(*argv, argv, &task_id);
+    task_wait_for = true;
     return 0;
+}
 int main(int argc, char *argv[])
+{
     int rc;
+    task_exit_t texit;
+    int retval;
     printf("System Call / IPC Tracer\n");
     printf("Controls: Q - Quit, P - Pause, R - Resume\n");
     display_mask = DM_THREAD | DM_SYSTEM | DM_USER;
         return 1;
+    }
     printf("Connected to task %lld.\n", task_id);
-    if (task_ldr != NULL) {
+    if (task_ldr != NULL)
         program_run();
-    }
+    cev_fibril_start();
     trace_task(task_id);
+    if (task_wait_for) {
+        printf("Waiting for task to exit.\n");
+        rc = task_wait(task_id, &texit, &retval);
+        if (rc != EOK) {
+            printf("Failed waiting for task.\n");
+            return -1;
+        }
+        if (texit == TASK_EXIT_NORMAL) {
+            printf("Task exited normally, return value %d.\n",
+                retval);
+        } else {
+            printf("Task exited unexpectedly.\n");
+        }
+    }
     return 0;
+}
 /** @}
  */

Subversion Repositories HelenOS

(root)/branches/dynload/uspace/app/trace/trace.c – Rev 4389 → 4691