Changeset 95c675b in mainline for kernel/generic/src/udebug/udebug.c

Timestamp:

2017-10-17T13:11:35Z (8 years ago)

Author:

Ondřej Hlavatý <aearsis@…>

Branches:

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

Children:

60af4cdb

Parents:

dbf32b1 (diff), a416d070 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge mainline

File:

• kernel/generic/src/udebug/udebug.c (modified) (7 diffs)

kernel/generic/src/udebug/udebug.c

@@ -38 +38 @@
  */
 
+#include <assert.h>
+#include <debug.h>
 #include <synch/waitq.h>
-#include <debug.h>
 #include <udebug/udebug.h>
 #include <errno.h>
@@ -116 +117 @@
 void udebug_stoppable_begin(void)
 {
-        ASSERT(THREAD);
-        ASSERT(TASK);
+        assert(THREAD);
+        assert(TASK);
         
         mutex_lock(&TASK->udebug.lock);
@@ -125 +126 @@
         /* Lock order OK, THREAD->udebug.lock is after TASK->udebug.lock */
         mutex_lock(&THREAD->udebug.lock);
-        ASSERT(THREAD->udebug.stoppable == false);
+        assert(THREAD->udebug.stoppable == false);
         THREAD->udebug.stoppable = true;
         
@@ -136 +137 @@
                 
                 call_t *db_call = TASK->udebug.begin_call;
-                ASSERT(db_call);
+                assert(db_call);
                 
                 TASK->udebug.dt_state = UDEBUG_TS_ACTIVE;
@@ -158 +159 @@
                         call_t *go_call = THREAD->udebug.go_call;
                         THREAD->udebug.go_call = NULL;
-                        ASSERT(go_call);
+                        assert(go_call);
                         
                         IPC_SET_RETVAL(go_call->data, 0);
@@ -195 +196 @@
         } else {
                 ++TASK->udebug.not_stoppable_count;
-                ASSERT(THREAD->udebug.stoppable == true);
+                assert(THREAD->udebug.stoppable == true);
                 THREAD->udebug.stoppable = false;
                 
@@ -398 +399 @@
 int udebug_task_cleanup(struct task *task)
 {
-        ASSERT(mutex_locked(&task->udebug.lock));
+        assert(mutex_locked(&task->udebug.lock));
 
         if ((task->udebug.dt_state != UDEBUG_TS_BEGINNING) &&