Changeset 22f7769 in mainline for src/mm/heap.c

Timestamp:

2005-10-17T23:31:41Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

4b2c872d

Parents:

75eacab

Message:

Rename cpu_priority_{high|low|restore|read} functions to interrupts_{disable|enable|restore|read}.
Rename pri_t to ipl_t (Interrupt Priority Level).
Rename thread_t::pri to thread_t::priority.

File:

• src/mm/heap.c (modified) (7 diffs)

src/mm/heap.c

@@ -61 +61 @@
 void *early_malloc(size_t size)
 {
-        pri_t pri;
+        ipl_t ipl;
         chunk_t *x, *y, *z;
 
@@ -68 +68 @@
                 
         x = chunk0;
-        pri = cpu_priority_high();
+        ipl = interrupts_disable();
         spinlock_lock(&heaplock);               
         while (x) {
@@ -85 +85 @@
                 if (x->size < size + sizeof(chunk_t) + 1) {
                         spinlock_unlock(&heaplock);
-                        cpu_priority_restore(pri);
+                        interrupts_restore(ipl);
                         return &x->data[0];
                 }
@@ -106 +106 @@
                 x->next = y;
                 spinlock_unlock(&heaplock);
-                cpu_priority_restore(pri);
+                interrupts_restore(ipl);
 
                 return &x->data[0];
         }
         spinlock_unlock(&heaplock);
-        cpu_priority_restore(pri);
+        interrupts_restore(ipl);
         return NULL;
 }
@@ -117 +117 @@
 void early_free(void *ptr)
 {
-        pri_t pri;
+        ipl_t ipl;
         chunk_t *x, *y, *z;
 
@@ -128 +128 @@
                 panic("freeing unused/damaged chunk");
 
-        pri = cpu_priority_high();
+        ipl = interrupts_disable();
         spinlock_lock(&heaplock);
         x = y->prev;
@@ -151 +151 @@
         y->used = 0;
         spinlock_unlock(&heaplock);
-        cpu_priority_restore(pri);
+        interrupts_restore(ipl);
 }