Changeset e45f81a in mainline

Timestamp:

2006-06-26T10:07:05Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

7ee0e2f

Parents:

430f12c

Message:

Changed frame_alloc call, cleaned a lot of stuff, fixed some not-perfectly-correct error handling.

Files:

• arch/ia32/src/smp/smp.c (modified) (2 diffs)
• genarch/src/fb/fb.c (modified) (3 diffs)
• generic/include/mm/frame.h (modified) (1 diff)
• generic/src/mm/frame.c (modified) (3 diffs)
• generic/src/mm/slab.c (modified) (1 diff)
• generic/src/proc/thread.c (modified) (2 diffs)
• test/mm/falloc1/test.c (modified) (2 diffs)

arch/ia32/src/smp/smp.c

@@ -62 +62 @@
 void smp_init(void)
 {
-        int status;
         __address l_apic_address, io_apic_address;
 
@@ -74 +73 @@
         }
 
-        l_apic_address = (__address) frame_alloc_rc(ONE_FRAME, FRAME_ATOMIC | FRAME_KA, &status);
-        if (status != FRAME_OK)
+        l_apic_address = (__address) frame_alloc(ONE_FRAME, FRAME_ATOMIC | FRAME_KA);
+        if (!l_apic_address)
                 panic("cannot allocate address for l_apic\n");
 
-        io_apic_address = (__address) frame_alloc_rc(ONE_FRAME, FRAME_ATOMIC | FRAME_KA, &status);
-        if (status != FRAME_OK)
+        io_apic_address = (__address) frame_alloc(ONE_FRAME, FRAME_ATOMIC | FRAME_KA);
+        if (!io_apic_address)
                 panic("cannot allocate address for io_apic\n");
 

genarch/src/fb/fb.c

@@ -389 +389 @@
         int pages = SIZE2FRAMES(totsize);
         int order;
-        int rc;
         if (pages == 1)
                 order = 0;
@@ -395 +394 @@
                 order = fnzb(pages-1)+1;
 
-        dbbuffer = frame_alloc_rc(order,FRAME_ATOMIC | FRAME_KA, &rc);
+        dbbuffer = frame_alloc(order,FRAME_ATOMIC | FRAME_KA);
         if (!dbbuffer)
                 printf("Failed to allocate scroll buffer.\n");
@@ -402 +401 @@
         /* Initialized blank line */
         blankline = (__u8 *) malloc(ROW_BYTES, FRAME_ATOMIC);
-        ASSERT(blankline);
+        if (!blankline)
+                panic("Failed to allocate blank line for framebuffer.");
         for (y=0; y < FONT_SCANLINES; y++)
                 for (x=0; x < xres; x++)

generic/include/mm/frame.h

@@ -90 +90 @@
 #define IS_BUDDY_RIGHT_BLOCK_ABS(zone, frame)   (((frame_index_abs((zone), (frame)) >> (frame)->buddy_order) & 0x1) == 1)
 
-#define frame_alloc(order, flags)                               frame_alloc_generic(order, flags, NULL, NULL)
-#define frame_alloc_rc(order, flags, status)                    frame_alloc_generic(order, flags, status, NULL)
-#define frame_alloc_rc_zone(order, flags, status, zone)         frame_alloc_generic(order, flags, status, zone)
+#define frame_alloc(order, flags)                               frame_alloc_generic(order, flags, NULL)
 
 extern void frame_init(void);
-extern void * frame_alloc_generic(__u8 order, int flags, int * status, int *pzone);
+extern void * frame_alloc_generic(__u8 order, int flags, int *pzone);
 extern void frame_free(__address frame);
 extern void frame_reference_add(pfn_t pfn);

generic/src/mm/frame.c

@@ -932 +932 @@
  *
  */
-void * frame_alloc_generic(__u8 order, int flags, int *status, int *pzone) 
+void * frame_alloc_generic(__u8 order, int flags, int *pzone) 
 {
         ipl_t ipl;
@@ -968 +968 @@
                 interrupts_restore(ipl);
 
-                if (flags & FRAME_ATOMIC) {
-                        ASSERT(status != NULL);
-                        if (status)
-                                *status = FRAME_NO_MEMORY;
+                if (flags & FRAME_ATOMIC)
                         return 0;
-                }
                 
                 panic("Sleep not implemented.\n");
@@ -984 +980 @@
         spinlock_unlock(&zone->lock);
         interrupts_restore(ipl);
-
-        if (status)
-                *status = FRAME_OK;
 
         if (flags & FRAME_KA)

generic/src/mm/slab.c

@@ -162 +162 @@
         size_t fsize;
         int i;
-        int status;
         int zone=0;
         
-        data = frame_alloc_rc_zone(cache->order, FRAME_KA | flags, &status, &zone);
-        if (status != FRAME_OK) {
+        data = frame_alloc_generic(cache->order, FRAME_KA | flags, &zone);
+        if (!data) {
                 return NULL;
         }

generic/src/proc/thread.c

@@ -125 +125 @@
 {
         thread_t *t = (thread_t *)obj;
-        int status;
 
         spinlock_initialize(&t->lock, "thread_t_lock");
@@ -142 +141 @@
 #endif  
 
-        t->kstack = frame_alloc_rc(STACK_FRAMES, FRAME_KA | kmflags,&status);
-        if (status) {
+        t->kstack = frame_alloc(STACK_FRAMES, FRAME_KA | kmflags);
+        if (! t->kstack) {
 #ifdef ARCH_HAS_FPU
                 if (t->saved_fpu_context)

test/mm/falloc1/test.c

@@ -46 +46 @@
         int i, order, run;
         int allocated;
-        int status;
 
         ASSERT(TEST_RUNS > 1);
@@ -56 +55 @@
                         allocated = 0;
                         for (i = 0; i < MAX_FRAMES >> order; i++) {
-                                frames[allocated] = frame_alloc_rc(order, FRAME_ATOMIC | FRAME_KA, &status);
+                                frames[allocated] = frame_alloc(order, FRAME_ATOMIC | FRAME_KA);
                                 
                                 if (ALIGN_UP(frames[allocated], FRAME_SIZE << order) != frames[allocated]) {