Changes in uspace/app/trace/trace.c [7c014d1:28a3e74] in mainline

File:

• uspace/app/trace/trace.c (modified) (27 diffs)

uspace/app/trace/trace.c

@@ -50 +50 @@
 #include <sys/types.h>
 #include <sys/typefmt.h>
-#include <vfs/vfs.h>
 
 #include <libc.h>
@@ -73 +72 @@
 ipc_call_t thread_ipc_req[THBUF_SIZE];
 
-async_sess_t *sess;
+int phoneid;
 bool abort_trace;
 
@@ -82 +81 @@
 
 static bool cev_valid;
-static kbd_event_t cev;
+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;
@@ -146 +146 @@
 static int connect_task(task_id_t task_id)
 {
-        async_sess_t *ksess = async_connect_kbox(task_id);
-        
-        if (!ksess) {
-                if (errno == ENOTSUP) {
-                        printf("You do not have userspace debugging support "
-                            "compiled in the kernel.\n");
-                        printf("Compile kernel with 'Support for userspace debuggers' "
-                            "(CONFIG_UDEBUG) enabled.\n");
-                        return errno;
-                }
-                
+        int rc;
+
+        rc = async_connect_kbox(task_id);
+
+        if (rc == ENOTSUP) {
+                printf("You do not have userspace debugging support "
+                    "compiled in the kernel.\n");
+                printf("Compile kernel with 'Support for userspace debuggers' "
+                    "(CONFIG_UDEBUG) enabled.\n");
+                return rc;
+        }
+
+        if (rc < 0) {
                 printf("Error connecting\n");
-                printf("ipc_connect_task(%" PRIu64 ") -> %d ", task_id, errno);
-                return errno;
-        }
-        
-        int rc = udebug_begin(ksess);
+                printf("ipc_connect_task(%" PRIu64 ") -> %d ", task_id, rc);
+                return rc;
+        }
+
+        phoneid = rc;
+
+        rc = udebug_begin(phoneid);
         if (rc < 0) {
                 printf("udebug_begin() -> %d\n", rc);
                 return rc;
         }
-        
-        rc = udebug_set_evmask(ksess, UDEBUG_EM_ALL);
+
+        rc = udebug_set_evmask(phoneid, UDEBUG_EM_ALL);
         if (rc < 0) {
                 printf("udebug_set_evmask(0x%x) -> %d\n ", UDEBUG_EM_ALL, rc);
                 return rc;
         }
-        
-        sess = ksess;
+
         return 0;
 }
@@ -185 +188 @@
         int i;
 
-        rc = udebug_thread_read(sess, thread_hash_buf,
+        rc = udebug_thread_read(phoneid, thread_hash_buf,
                 THBUF_SIZE*sizeof(unsigned), &tb_copied, &tb_needed);
         if (rc < 0) {
@@ -311 +314 @@
 
         memset(&call, 0, sizeof(call));
-        rc = udebug_mem_read(sess, &call.args, sc_args[1], sizeof(call.args));
+        rc = udebug_mem_read(phoneid, &call.args, sc_args[1], sizeof(call.args));
 
         if (rc >= 0) {
@@ -322 +325 @@
         ipc_call_t question, reply;
         int rc;
-        int phoneid;
-
-        phoneid = sc_args[0];
+        int phoneidx;
+
+//      printf("sc_ipc_call_sync_fast()\n");
+        phoneidx = sc_args[0];
 
         IPC_SET_IMETHOD(question, sc_args[1]);
@@ -333 +337 @@
         IPC_SET_ARG5(question, 0);
 
+//      printf("memset\n");
         memset(&reply, 0, sizeof(reply));
-        rc = udebug_mem_read(sess, &reply.args, sc_args[5], sizeof(reply.args));
-        if (rc < 0)
-                return;
-        
-        ipcp_call_sync(phoneid, &question, &reply);
+//      printf("udebug_mem_read(phone=%d, buffer_ptr=%u, src_addr=%d, n=%d\n",
+//              phoneid, &reply.args, sc_args[5], sizeof(reply.args));
+        rc = udebug_mem_read(phoneid, &reply.args, sc_args[5], sizeof(reply.args));
+//      printf("dmr->%d\n", rc);
+        if (rc < 0) return;
+
+//      printf("call ipc_call_sync\n");
+        ipcp_call_sync(phoneidx, &question, &reply);
 }
 
@@ -347 +355 @@
 
         memset(&question, 0, sizeof(question));
-        rc = udebug_mem_read(sess, &question.args, sc_args[1],
+        rc = udebug_mem_read(phoneid, &question.args, sc_args[1],
             sizeof(question.args));
 
@@ -364 +372 @@
 
         memset(&reply, 0, sizeof(reply));
-        rc = udebug_mem_read(sess, &reply.args, sc_args[2],
+        rc = udebug_mem_read(phoneid, &reply.args, sc_args[2],
             sizeof(reply.args));
 
@@ -383 +391 @@
 
         memset(&call, 0, sizeof(call));
-        rc = udebug_mem_read(sess, &call, sc_args[0], sizeof(call));
-        
-        if (rc >= 0)
+        rc = udebug_mem_read(phoneid, &call, sc_args[0], sizeof(call));
+//      printf("udebug_mem_read(phone %d, dest %d, app-mem src %d, size %d -> %d\n",
+//              phoneid, (int)&call, sc_args[0], sizeof(call), rc);
+
+        if (rc >= 0) {
                 ipcp_call_in(&call, sc_rc);
+        }
 }
 
@@ -396 +407 @@
 
         /* Read syscall arguments */
-        rc = udebug_args_read(sess, thread_hash, sc_args);
+        rc = udebug_args_read(phoneid, thread_hash, sc_args);
+
+        async_serialize_start();
+
+//      printf("[%d] ", thread_id);
 
         if (rc < 0) {
                 printf("error\n");
+                async_serialize_end();
                 return;
         }
@@ -416 +432 @@
                 break;
         }
+
+        async_serialize_end();
 }
 
@@ -426 +444 @@
 
         /* Read syscall arguments */
-        rc = udebug_args_read(sess, thread_hash, sc_args);
+        rc = udebug_args_read(phoneid, thread_hash, sc_args);
+
+        async_serialize_start();
 
 //      printf("[%d] ", thread_id);
@@ -432 +452 @@
         if (rc < 0) {
                 printf("error\n");
+                async_serialize_end();
                 return;
         }
@@ -460 +481 @@
                 break;
         }
+
+        async_serialize_end();
 }
 
 static void event_thread_b(uintptr_t hash)
 {
+        async_serialize_start();
         printf("New thread, hash %p\n", (void *) hash);
+        async_serialize_end();
+
         thread_trace_start(hash);
 }
@@ -501 +527 @@
 
                 /* Run thread until an event occurs */
-                rc = udebug_go(sess, thread_hash,
+                rc = udebug_go(phoneid, thread_hash,
                     &ev_type, &val0, &val1);
 
@@ -586 +612 @@
 
         /* Send default files */
-        int *files[4];
-        int fd_stdin;
-        int fd_stdout;
-        int fd_stderr;
+        fdi_node_t *files[4];
+        fdi_node_t stdin_node;
+        fdi_node_t stdout_node;
+        fdi_node_t stderr_node;
         
-        if ((stdin != NULL) && (fhandle(stdin, &fd_stdin) == EOK))
-                files[0] = &fd_stdin;
+        if ((stdin != NULL) && (fnode(stdin, &stdin_node) == EOK))
+                files[0] = &stdin_node;
         else
                 files[0] = NULL;
         
-        if ((stdout != NULL) && (fhandle(stdout, &fd_stdout) == EOK))
-                files[1] = &fd_stdout;
+        if ((stdout != NULL) && (fnode(stdout, &stdout_node) == EOK))
+                files[1] = &stdout_node;
         else
                 files[1] = NULL;
         
-        if ((stderr != NULL) && (fhandle(stderr, &fd_stderr) == EOK))
-                files[2] = &fd_stderr;
+        if ((stderr != NULL) && (fnode(stderr, &stderr_node) == EOK))
+                files[2] = &stderr_node;
         else
                 files[2] = NULL;
@@ -630 +656 @@
 {
         (void) arg;
-        
-        console_ctrl_t *console = console_init(stdin, stdout);
-        
+
         while (true) {
                 fibril_mutex_lock(&state_lock);
@@ -638 +662 @@
                         fibril_condvar_wait(&state_cv, &state_lock);
                 fibril_mutex_unlock(&state_lock);
-                
-                if (!console_get_kbd_event(console, &cev))
+
+                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);
+                fibril_mutex_unlock(&state_lock);               
         }
 }
@@ -651 +675 @@
 static void trace_task(task_id_t task_id)
 {
-        kbd_event_t ev;
+        console_event_t ev;
         bool done;
         int i;
@@ -657 +681 @@
 
         ipcp_init();
+
+        /* 
+         * User apps now typically have console on phone 3.
+         * (Phones 1 and 2 are used by the loader).
+         */
+        ipcp_connection_set(3, 0, proto_console);
 
         rc = get_thread_list();
@@ -697 +727 @@
                 case KC_P:
                         printf("Pause...\n");
-                        rc = udebug_stop(sess, thash);
+                        rc = udebug_stop(phoneid, thash);
                         if (rc != EOK)
                                 printf("Error: stop -> %d\n", rc);
@@ -708 +738 @@
                         printf("Resume...\n");
                         break;
-                default:
-                        break;
                 }
         }
@@ -715 +743 @@
         printf("\nTerminate debugging session...\n");
         abort_trace = true;
-        udebug_end(sess);
-        async_hangup(sess);
+        udebug_end(phoneid);
+        async_hangup(phoneid);
 
         ipcp_cleanup();
@@ -757 +785 @@
         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_IN_READ, o);
@@ -785 +815 @@
 
         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);
+
+        arg_def[0] = V_CHAR;
+        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_GET_SIZE, 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;
+        o = oper_new("set_color", 3, arg_def, V_VOID, 0, resp_def);
+        proto_add_oper(p, CONSOLE_SET_COLOR, o);
+        arg_def[0] = V_INTEGER; arg_def[1] = V_INTEGER;
+        o = oper_new("set_rgb_color", 2, arg_def, V_VOID, 0, resp_def);
+        proto_add_oper(p, CONSOLE_SET_RGB_COLOR, o);
+        o = oper_new("cursor_visibility", 1, arg_def, V_VOID, 0, resp_def);
+        proto_add_oper(p, CONSOLE_CURSOR_VISIBILITY, o);
+
+        proto_console = p;
+        proto_register(SERVICE_CONSOLE, p);
 }