Changeset 654a30a in mainline for uspace/app/trace/trace.c

Timestamp:

2009-07-21T19:50:40Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

8e1dc00

Parents:

9d8a1ed

Message:

Make use of fibril sync primitives.

File:

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

uspace/app/trace/trace.c

@@ -47 +47 @@
 #include <io/console.h>
 #include <io/keycode.h>
+#include <fibril_sync.h>
 
 #include <libc.h>
@@ -72 +73 @@
 uintptr_t thash;
 volatile int paused;
+fibril_condvar_t paused_cv;
+fibril_mutex_t paused_lock;
 
 void thread_trace_start(uintptr_t thread_hash);
@@ -454 +457 @@
         while (!abort_trace) {
 
+                fibril_mutex_lock(&paused_lock);
                 if (paused) {
-                        printf("Press R to resume.\n");
-                        while (paused) {
-                                async_usleep(1000000);
-                        }
-                        printf("Resumed\n");
+                        printf("Thread [%d] paused. Press R to resume.\n",
+                            thread_id);
+
+                        while (paused)
+                                fibril_condvar_wait(&paused_cv, &paused_lock);
+
+                        printf("Thread [%d] resumed.\n", thread_id);
                 }
+                fibril_mutex_unlock(&paused_lock);
 
                 /* Run thread until an event occurs */
@@ -482 +489 @@
                         case UDEBUG_EVENT_STOP:
                                 printf("Stop event\n");
+                                fibril_mutex_lock(&paused_lock);
+                                paused = 1;
+                                fibril_mutex_unlock(&paused_lock);
                                 break;
                         case UDEBUG_EVENT_THREAD_B:
@@ -599 +609 @@
                         printf("Pause...\n");
                         rc = udebug_stop(phoneid, thash);
-                        if (rc == EOK)
-                                paused = 1;
-                        else
-                                printf("stop -> %d\n", rc);
+                        if (rc != EOK)
+                                printf("Error: stop -> %d\n", rc);
                         break;
                 case KC_R:
+                        fibril_mutex_lock(&paused_lock);
                         paused = 0;
+                        fibril_condvar_broadcast(&paused_cv);
+                        fibril_mutex_unlock(&paused_lock);
                         printf("Resume...\n");
                         break;
@@ -645 +656 @@
         next_thread_id = 1;
         paused = 0;
+        fibril_mutex_initialize(&paused_lock);
+        fibril_condvar_initialize(&paused_cv);
 
         proto_init();