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

Timestamp:

2017-06-19T21:47:42Z (7 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/lib/ra.c (modified) (7 diffs)

kernel/generic/src/lib/ra.c

@@ -43 +43 @@
  */
 
+#include <assert.h>
 #include <lib/ra.h>
 #include <typedefs.h>
 #include <mm/slab.h>
 #include <bitops.h>
-#include <debug.h>
 #include <panic.h>
 #include <adt/list.h>
@@ -241 +241 @@
                     ra_segment_t, fu_link);
 
-                ASSERT(seg->flags & RA_SEGMENT_FREE);
+                assert(seg->flags & RA_SEGMENT_FREE);
 
                 /*
@@ -259 +259 @@
                 newbase = ALIGN_UP(seg->base, align);
                 if (newbase + size != seg->base + ra_segment_size_get(seg)) {
-                        ASSERT(newbase + (size - 1) < seg->base +
+                        assert(newbase + (size - 1) < seg->base +
                             (ra_segment_size_get(seg) - 1));
                         succ = ra_segment_create(newbase + size);
@@ -331 +331 @@
         hash_table_remove(&span->used, &key, 1);
 
-        ASSERT(!(seg->flags & RA_SEGMENT_FREE));
-        ASSERT(seg->base == base);
-        ASSERT(ra_segment_size_get(seg) == size);
+        assert(!(seg->flags & RA_SEGMENT_FREE));
+        assert(seg->base == base);
+        assert(ra_segment_size_get(seg) == size);
 
         /*
@@ -342 +342 @@
                     ra_segment_t, segment_link);
 
-                ASSERT(pred->base < seg->base);
+                assert(pred->base < seg->base);
 
                 if (pred->flags & RA_SEGMENT_FREE) {
@@ -363 +363 @@
         succ = hash_table_get_instance(seg->segment_link.next, ra_segment_t,
             segment_link);
-        ASSERT(succ->base > seg->base);
+        assert(succ->base > seg->base);
         if (succ->flags & RA_SEGMENT_FREE) {
                 /*
@@ -386 +386 @@
         uintptr_t base = 0;
 
-        ASSERT(size >= 1);
-        ASSERT(alignment >= 1);
-        ASSERT(ispwr2(alignment));
+        assert(size >= 1);
+        assert(alignment >= 1);
+        assert(ispwr2(alignment));
 
         irq_spinlock_lock(&arena->lock, true);