Changeset a5c3f73 in mainline for uspace/app/trace/trace.c

Timestamp:

2008-09-19T11:30:04Z (16 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

356acd0

Parents:

f7176b1

Message:

trace: 64-bit-related fixes

File:

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

uspace/app/trace/trace.c

@@ -56 +56 @@
 
 #define THBUF_SIZE 64
-unsigned thread_hash_buf[THBUF_SIZE];
-unsigned n_threads;
+uintptr_t thread_hash_buf[THBUF_SIZE];
+int n_threads;
 
 int next_thread_id;
@@ -64 +64 @@
 int abort_trace;
 
-unsigned thash;
+uintptr_t thash;
 volatile int paused;
 
-void thread_trace_start(unsigned thread_hash);
+void thread_trace_start(uintptr_t thread_hash);
 
 static proto_t *proto_console;
@@ -126 +126 @@
         }
 
-        n_threads = tb_copied / sizeof(unsigned);
+        n_threads = tb_copied / sizeof(uintptr_t);
 
         printf("Threads:");
         for (i = 0; i < n_threads; i++) {
-                printf(" [%d] (hash 0x%x)", 1+i, thread_hash_buf[i]);
-        }
-        printf("\ntotal of %u threads\n", tb_needed/sizeof(unsigned));
+                printf(" [%d] (hash 0x%lx)", 1+i, thread_hash_buf[i]);
+        }
+        printf("\ntotal of %u threads\n", tb_needed / sizeof(uintptr_t));
 
         return 0;
@@ -197 +197 @@
 }
 
-static void print_sc_args(unsigned *sc_args, int n)
+static void print_sc_args(sysarg_t *sc_args, int n)
 {
         int i;
 
         putchar('(');
-        if (n > 0) printf("%d", sc_args[0]);
+        if (n > 0) printf("%ld", sc_args[0]);
         for (i = 1; i < n; i++) {
-                printf(", %d", sc_args[i]);
+                printf(", %ld", sc_args[i]);
         }
         putchar(')');
 }
 
-static void sc_ipc_call_async_fast(unsigned *sc_args, int sc_rc)
+static void sc_ipc_call_async_fast(sysarg_t *sc_args, sysarg_t sc_rc)
 {
         ipc_call_t call;
-        int phoneid;
+        ipcarg_t phoneid;
         
         if (sc_rc == IPC_CALLRET_FATAL || sc_rc == IPC_CALLRET_TEMPORARY)
@@ -229 +229 @@
 }
 
-static void sc_ipc_call_async_slow(unsigned *sc_args, int sc_rc)
+static void sc_ipc_call_async_slow(sysarg_t *sc_args, sysarg_t sc_rc)
 {
         ipc_call_t call;
@@ -245 +245 @@
 }
 
-static void sc_ipc_call_sync_fast(unsigned *sc_args)
+static void sc_ipc_call_sync_fast(sysarg_t *sc_args)
 {
         ipc_call_t question, reply;
@@ -273 +273 @@
 }
 
-static void sc_ipc_call_sync_slow(unsigned *sc_args)
+static void sc_ipc_call_sync_slow(sysarg_t *sc_args)
 {
         ipc_call_t question, reply;
@@ -291 +291 @@
 }
 
-static void sc_ipc_wait(unsigned *sc_args, int sc_rc)
+static void sc_ipc_wait(sysarg_t *sc_args, int sc_rc)
 {
         ipc_call_t call;
@@ -308 +308 @@
 }
 
-static void event_syscall_b(unsigned thread_id, unsigned thread_hash,  unsigned sc_id, int sc_rc)
-{
-        unsigned sc_args[6];
+static void event_syscall_b(unsigned thread_id, uintptr_t thread_hash,
+    unsigned sc_id, sysarg_t sc_rc)
+{
+        sysarg_t sc_args[6];
         int rc;
 
@@ -335 +336 @@
 }
 
-static void event_syscall_e(unsigned thread_id, unsigned thread_hash,  unsigned sc_id, int sc_rc)
-{
-        unsigned sc_args[6];
+static void event_syscall_e(unsigned thread_id, uintptr_t thread_hash,
+    unsigned sc_id, sysarg_t sc_rc)
+{
+        sysarg_t sc_args[6];
         int rv_type;
         int rc;
@@ -383 +385 @@
 }
 
-static void event_thread_b(unsigned hash)
+static void event_thread_b(uintptr_t hash)
 {
         async_serialize_start();
-        printf("New thread, hash 0x%x\n", hash);
+        printf("New thread, hash 0x%lx\n", hash);
         async_serialize_end();
 
@@ -396 +398 @@
         int rc;
         unsigned ev_type;
-        unsigned thread_hash;
+        uintptr_t thread_hash;
         unsigned thread_id;
-        unsigned val0, val1;
-
-        thread_hash = (unsigned)thread_hash_arg;
+        sysarg_t val0, val1;
+
+        thread_hash = (uintptr_t)thread_hash_arg;
         thread_id = next_thread_id++;
 
-        printf("Start tracing thread [%d] (hash 0x%x)\n", thread_id, thread_hash);
+        printf("Start tracing thread [%d] (hash 0x%lx)\n", thread_id, thread_hash);
 
         while (!abort_trace) {
@@ -439 +441 @@
                                 break;
                         case UDEBUG_EVENT_THREAD_E:
-                                printf("Thread 0x%x exited\n", val0);
+                                printf("Thread 0x%lx exited\n", val0);
                                 abort_trace = 1;
                                 break;
@@ -454 +456 @@
 }
 
-void thread_trace_start(unsigned thread_hash)
+void thread_trace_start(uintptr_t thread_hash)
 {
         fid_t fid;
@@ -673 +675 @@
 
         if (task_id != 0) {
-                if (argc == 0) return;
+                if (argc == 0) return 0;
                 printf("Extra arguments\n");
                 print_syntax();