Changeset 63e27ef in mainline for kernel/generic/src/ipc/ipc.c

Timestamp:

2017-06-19T21:47:42Z (8 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

deacc58d

Parents:

7354b5e

Message:

ASSERT → assert

File:

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

kernel/generic/src/ipc/ipc.c

@@ -38 +38 @@
  */
 
+#include <assert.h>
 #include <synch/spinlock.h>
 #include <synch/mutex.h>
@@ -52 +53 @@
 #include <proc/task.h>
 #include <mem.h>
-#include <debug.h>
 #include <print.h>
 #include <console/console.h>
@@ -227 +227 @@
                 spinlock_lock(&TASK->active_calls_lock);
 
-                ASSERT(!request->forget);
+                assert(!request->forget);
 
                 bool answered = !request->active;
@@ -253 +253 @@
                 }
         }
-        ASSERT(!answer || request == answer);
+        assert(!answer || request == answer);
         
         slab_free(ipc_answerbox_slab, mybox);
@@ -631 +631 @@
                 
                 /* Disconnect phone */
-                ASSERT(phone->state == IPC_PHONE_CONNECTED);
+                assert(phone->state == IPC_PHONE_CONNECTED);
                 
                 list_remove(&phone->link);
@@ -668 +668 @@
 static void ipc_forget_call(call_t *call)
 {
-        ASSERT(spinlock_locked(&TASK->active_calls_lock));
-        ASSERT(spinlock_locked(&call->forget_lock));
+        assert(spinlock_locked(&TASK->active_calls_lock));
+        assert(spinlock_locked(&call->forget_lock));
 
         /*
@@ -789 +789 @@
         call = ipc_wait_for_call(&TASK->answerbox, SYNCH_NO_TIMEOUT,
             SYNCH_FLAGS_NONE);
-        ASSERT(call->flags & (IPC_CALL_ANSWERED | IPC_CALL_NOTIF));
+        assert(call->flags & (IPC_CALL_ANSWERED | IPC_CALL_NOTIF));
 
         SYSIPC_OP(answer_process, call);