Changeset 2a46e10 in mainline

Timestamp:

2006-02-16T13:35:02Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

3debedec

Parents:

ff4e1cd

Message:

Avoid memory exhaustion in thread_create in slab2 test.

Files:

• generic/src/proc/thread.c (modified) (3 diffs)
• test/mm/slab2/test.c (modified) (5 diffs)

generic/src/proc/thread.c

@@ -96 +96 @@
         thread_t *t = (thread_t *)obj;
         pfn_t pfn;
+        int status;
 
         spinlock_initialize(&t->lock, "thread_t_lock");
@@ -103 +104 @@
         link_initialize(&t->threads_link);
         
-        pfn = frame_alloc(ONE_FRAME, FRAME_KA | kmflags);
+        pfn = frame_alloc_rc(ONE_FRAME, FRAME_KA | kmflags,&status);
+        if (status)
+                return -1;
         t->kstack = (__u8 *)PA2KA(PFN2ADDR(pfn));
-        if (!t->kstack)
-                return -1;
 
         return 0;
@@ -230 +231 @@
         
         t = (thread_t *) slab_alloc(thread_slab, 0);
+        if (!t)
+                return NULL;
         
         /* Not needed, but good for debugging */

test/mm/slab2/test.c

@@ -35 +35 @@
 #include <mm/frame.h>
 #include <memstr.h>
+#include <synch/condvar.h>
+#include <synch/mutex.h>
 
 #define ITEM_SIZE 256
@@ -116 +118 @@
 slab_cache_t *thr_cache;
 semaphore_t thr_sem;
+condvar_t thread_starter;
+mutex_t starter_mutex;
 
 #define THREADS 8
@@ -123 +127 @@
         void *data=NULL, *new;
 
+        mutex_lock(&starter_mutex);
+        condvar_wait(&thread_starter,&starter_mutex);
+        mutex_unlock(&starter_mutex);
+                
         printf("Starting thread #%d...\n",THREAD->tid);
 
@@ -173 +181 @@
 
         printf("Running stress test with size %d\n", size);
+        condvar_initialize(&thread_starter);
+        mutex_initialize(&starter_mutex);
+
         thr_cache = slab_cache_create("thread_cache", size, 0, 
                                       NULL, NULL, 
@@ -182 +193 @@
                 thread_ready(t);
         }
+        thread_sleep(1);
+        condvar_broadcast(&thread_starter);
 
         for (i=0; i<THREADS; i++)