Changeset 8af9950 in mainline

Timestamp:

2008-12-07T18:36:51Z (15 years ago)

Author:

Jiri Svoboda <jirik.svoboda@…>

Branches:

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

Children:

925fdd7

Parents:

5d9430d7

Message:

Rename udebug_thread_t.debug_active just to 'active'.

Location:

kernel/generic

Files:

• include/udebug/udebug.h (modified) (1 diff)
• src/udebug/udebug.c (modified) (10 diffs)
• src/udebug/udebug_ops.c (modified) (5 diffs)

kernel/generic/include/udebug/udebug.h

@@ -178 +178 @@
         /** What type of event are we stopped in or 0 if none. */
         udebug_event_t cur_event;
-        bool go;           /**< thread is GO */
-        bool stoppable;    /**< thread is stoppable */
-        bool debug_active; /**< thread is in a debugging session */
+        bool go;                /**< thread is GO */
+        bool stoppable;         /**< thread is stoppable */
+        bool active;            /**< thread is in a debugging session */
 } udebug_thread_t;
 

kernel/generic/src/udebug/udebug.c

@@ -73 +73 @@
         ut->go = false;
         ut->stoppable = true;
-        ut->debug_active = false;
+        ut->active = false;
         ut->cur_event = 0; /* none */
 }
@@ -113 +113 @@
 
         mutex_lock(&THREAD->udebug.lock);
-        res = THREAD->udebug.debug_active;
+        res = THREAD->udebug.active;
         mutex_unlock(&THREAD->udebug.lock);
 
@@ -171 +171 @@
                  */
 
-                if (THREAD->udebug.debug_active == true &&
+                if (THREAD->udebug.active == true &&
                     THREAD->udebug.go == false) {
                         /*
@@ -211 +211 @@
         mutex_lock(&THREAD->udebug.lock);
 
-        if (THREAD->udebug.debug_active &&
-            THREAD->udebug.go == false) {
+        if (THREAD->udebug.active && THREAD->udebug.go == false) {
                 TASK->udebug.begin_call = NULL;
                 mutex_unlock(&THREAD->udebug.lock);
@@ -265 +264 @@
 
         /* Must only generate events when in debugging session and is go. */
-        if (THREAD->udebug.debug_active != true ||
-            THREAD->udebug.go == false ||
+        if (THREAD->udebug.active != true || THREAD->udebug.go == false ||
             (TASK->udebug.evmask & UDEBUG_EVMASK(etype)) == 0) {
                 mutex_unlock(&THREAD->udebug.lock);
@@ -335 +333 @@
 
         /* Must only generate events when in debugging session */
-        if (THREAD->udebug.debug_active != true) {
-                LOG("- debug_active: %s, udebug.go: %s\n",
-                        THREAD->udebug.debug_active ? "yes(+)" : "no(-)",
+        if (THREAD->udebug.active != true) {
+                LOG("- udebug.active: %s, udebug.go: %s\n",
+                        THREAD->udebug.active ? "yes(+)" : "no(-)",
                         THREAD->udebug.go ? "yes(-)" : "no(+)");
                 mutex_unlock(&THREAD->udebug.lock);
@@ -385 +383 @@
 
         /* Must only generate events when in debugging session. */
-        if (THREAD->udebug.debug_active != true) {
-/*              printf("- debug_active: %s, udebug.go: %s\n",
-                        THREAD->udebug.debug_active ? "yes(+)" : "no(-)",
+        if (THREAD->udebug.active != true) {
+/*              printf("- udebug.active: %s, udebug.go: %s\n",
+                        THREAD->udebug.active ? "yes(+)" : "no(-)",
                         THREAD->udebug.go ? "yes(-)" : "no(+)");*/
                 mutex_unlock(&THREAD->udebug.lock);
@@ -402 +400 @@
 
         /* Prevent any further debug activity in thread. */
-        THREAD->udebug.debug_active = false;
+        THREAD->udebug.active = false;
         THREAD->udebug.cur_event = 0;           /* none */
         THREAD->udebug.go = false;      /* set to initial value */
@@ -460 +458 @@
                 if ((flags & THREAD_FLAG_USPACE) != 0) {
                         /* Prevent any further debug activity in thread. */
-                        t->udebug.debug_active = false;
+                        t->udebug.active = false;
                         t->udebug.cur_event = 0;        /* none */
 
@@ -466 +464 @@
                         if (t->udebug.go == true) {
                                 /*
-                                * Yes, so clear go. As debug_active == false,
+                                * Yes, so clear go. As active == false,
                                  * this doesn't affect anything.
                                  */

kernel/generic/src/udebug/udebug_ops.c

@@ -59 +59 @@
  * and belongs to the current task (TASK). Verifies, that the thread
  * is (or is not) go according to being_go (typically false).
- * It also locks t->udebug.lock, making sure that t->udebug.debug_active
+ * It also locks t->udebug.lock, making sure that t->udebug.active
  * is true - that the thread is in a valid debugging session.
  *
@@ -109 +109 @@
 
         /* Verify debugging state. */
-        if (t->udebug.debug_active != true) {
+        if (t->udebug.active != true) {
                 /* Not in debugging session or undesired GO state */
                 spinlock_unlock(&t->lock);
@@ -118 +118 @@
 
         /*
-         * Since the thread has debug_active == true, TASK->udebug.lock
-         * is enough to ensure its existence and that debug_active remains
+         * Since the thread has active == true, TASK->udebug.lock
+         * is enough to ensure its existence and that active remains
          * true.
          */
@@ -205 +205 @@
         }
         
-        /* Set udebug.debug_active on all of the task's userspace threads. */
+        /* Set udebug.active on all of the task's userspace threads. */
 
         for (cur = TASK->th_head.next; cur != &TASK->th_head; cur = cur->next) {
@@ -212 +212 @@
                 mutex_lock(&t->udebug.lock);
                 if ((t->flags & THREAD_FLAG_USPACE) != 0)
-                        t->udebug.debug_active = true;
+                        t->udebug.active = true;
                 mutex_unlock(&t->udebug.lock);
         }