From: Antti Kantee <pooka@iki.fi>
Date: Mon, 20 Apr 2015 11:21:41 +0000 (+0000)
Subject: use bmk_assert() instead of ASSERT()
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=e59db987b0e38b40237865d04c53c84079a0e398;p=people%2Fliuw%2Frumprun.git

use bmk_assert() instead of ASSERT()
---

diff --git a/platform/xen/xen/sched.c b/platform/xen/xen/sched.c
index f647984..e53325e 100644
--- a/platform/xen/xen/sched.c
+++ b/platform/xen/xen/sched.c
@@ -70,8 +70,7 @@
 #include <mini-os/sched.h>
 #include <mini-os/semaphore.h>
 
-#define assert(x) ASSERT(x)
-
+#include <bmk-core/core.h>
 #include <bmk-core/memalloc.h>
 #include <bmk-core/platform.h>
 #include <bmk-core/printf.h>
@@ -305,7 +304,7 @@ bmk_sched_create(const char *name, void *cookie, int joinable,
 	bmk_strncpy(thread->bt_name, name, sizeof(thread->bt_name)-1);
 
 	if (!stack_base) {
-		assert(stack_size == 0);
+		bmk_assert(stack_size == 0);
 		stackalloc(&stack_base, &stack_size);
 	} else {
 		thread->bt_flags = THREAD_EXTSTACK;
@@ -384,7 +383,7 @@ bmk_sched_join(struct bmk_thread *joinable)
 	struct bmk_thread *thread = bmk_sched_current();
 	unsigned long flags;
 
-	assert(joinable->bt_flags & THREAD_MUSTJOIN);
+	bmk_assert(joinable->bt_flags & THREAD_MUSTJOIN);
 
 	local_irq_save(flags);
 	/* wait for exiting thread to hit thread_exit() */
@@ -402,7 +401,7 @@ bmk_sched_join(struct bmk_thread *joinable)
 	}
 
 	/* signal exiting thread that we have seen it and it may now exit */
-	assert(joinable->bt_flags & THREAD_JOINED);
+	bmk_assert(joinable->bt_flags & THREAD_JOINED);
 	joinable->bt_flags &= ~THREAD_MUSTJOIN;
 	local_irq_restore(flags);