Changeset 1d4024cf in mainline for uspace/lib

Timestamp:

2012-06-13T16:19:01Z (13 years ago)

Author:

Frantisek Princ <frantisek.princ@…>

Branches:

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

Children:

49c94a3

Parents:

33f9670 (diff), 2902e1bb (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge with mainline

Location:

uspace/lib

Files:

• c/arch/ia64/include/fibril.h (modified) (2 diffs)
• c/arch/ia64/include/thread.h (modified) (2 diffs)
• c/generic/as.c (modified) (1 diff)
• c/generic/elf/elf_load.c (modified) (1 diff)
• c/generic/fibril.c (modified) (1 diff)
• c/generic/malloc.c (modified) (1 diff)
• c/generic/mman.c (modified) (1 diff)
• c/generic/thread.c (modified) (3 diffs)
• c/include/as.h (modified) (1 diff)
• c/include/fibril.h (modified) (1 diff)
• c/include/sys/mman.h (modified) (1 diff)
• fb/imgmap.c (modified) (1 diff)
• fb/screenbuffer.c (modified) (1 diff)
• fs/libfs.c (modified) (1 diff)

uspace/lib/c/arch/ia64/include/fibril.h

@@ -49 +49 @@
 #define PFM_MASK  (~0x3fffffffff)
 
-#define PSTHREAD_INITIAL_STACK_PAGES_NO  2
-
 /* Stack is divided into two equal parts (for memory stack and register stack). */
-#define PSTHREAD_INITIAL_STACK_DIVISION  2
+#define FIBRIL_INITIAL_STACK_DIVISION  2
 
 #define context_set(c, _pc, stack, size, tls) \
@@ -58 +56 @@
                 (c)->pc = (uint64_t) _pc; \
                 (c)->bsp = ((uint64_t) stack) + \
-                    size / PSTHREAD_INITIAL_STACK_DIVISION; \
+                    size / FIBRIL_INITIAL_STACK_DIVISION; \
                 (c)->ar_pfs &= PFM_MASK; \
                 (c)->sp = ((uint64_t) stack) + \
-                    ALIGN_UP((size / PSTHREAD_INITIAL_STACK_DIVISION), STACK_ALIGNMENT) - \
+                    ALIGN_UP((size / FIBRIL_INITIAL_STACK_DIVISION), STACK_ALIGNMENT) - \
                     SP_DELTA; \
                 (c)->tp = (uint64_t) tls; \

uspace/lib/c/arch/ia64/include/thread.h

@@ -27 +27 @@
  */
 
-/** @addtogroup libcia64        
+/** @addtogroup libcia64
  * @{
  */
@@ -36 +36 @@
 #define LIBC_ia64_THREAD_H_
 
-#define THREAD_INITIAL_STACK_PAGES_NO 2
-
 #endif
 

uspace/lib/c/generic/as.c

@@ -46 +46 @@
  *
  * @param base  Starting virtual address of the area.
- *              If set to (void *) -1, the kernel finds
- *              a mappable area.
+ *              If set to AS_AREA_ANY ((void *) -1),
+ *              the kernel finds a mappable area.
  * @param size  Size of the area.
  * @param flags Flags describing type of the area.
  *
  * @return Starting virtual address of the created area on success.
- * @return (void *) -1 otherwise.
+ * @return AS_MAP_FAILED ((void *) -1) otherwise.
  *
  */

uspace/lib/c/generic/elf/elf_load.c

@@ -366 +366 @@
         a = as_area_create((uint8_t *) base + bias, mem_sz,
             AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
-        if (a == (void *) -1) {
+        if (a == AS_MAP_FAILED) {
                 DPRINTF("memory mapping failed (0x%x, %d)\n",
                     base + bias, mem_sz);

uspace/lib/c/generic/fibril.c

@@ -286 +286 @@
 }
 
+/** Delete a fibril that has never run.
+ *
+ * Free resources of a fibril that has been created with fibril_create()
+ * but never readied using fibril_add_ready().
+ *
+ * @param fid Pointer to the fibril structure of the fibril to be
+ *            added.
+ */
+void fibril_destroy(fid_t fid)
+{
+        fibril_t *fibril = (fibril_t *) fid;
+        
+        free(fibril->stack);
+        fibril_teardown(fibril);
+}
+
 /** Add a fibril to the ready list.
  *

uspace/lib/c/generic/malloc.c

@@ -285 +285 @@
         /* Align the heap area size on page boundary */
         size_t asize = ALIGN_UP(size, PAGE_SIZE);
-        void *astart = as_area_create((void *) -1, asize,
+        void *astart = as_area_create(AS_AREA_ANY, asize,
             AS_AREA_WRITE | AS_AREA_READ);
-        if (astart == (void *) -1)
+        if (astart == AS_MAP_FAILED)
                 return false;
         

uspace/lib/c/generic/mman.c

@@ -42 +42 @@
 {
         if (!start)
-                start = (void *) -1;
+                start = AS_AREA_ANY;
         
 //      if (!((flags & MAP_SHARED) ^ (flags & MAP_PRIVATE)))

uspace/lib/c/generic/thread.c

@@ -41 +41 @@
 #include <str.h>
 #include <async.h>
+#include <errno.h>
+#include <as.h>
 #include "private/thread.h"
 
-#ifndef THREAD_INITIAL_STACK_PAGES_NO
-#define THREAD_INITIAL_STACK_PAGES_NO   2 
+#ifndef THREAD_INITIAL_STACK_PAGES
+        #define THREAD_INITIAL_STACK_PAGES  2
 #endif
 
@@ -65 +67 @@
         
         uarg->uspace_thread_function(uarg->uspace_thread_arg);
-        /* XXX: we cannot free the userspace stack while running on it
-                free(uarg->uspace_stack);
-                free(uarg);
-        */
+        /*
+         * XXX: we cannot free the userspace stack while running on it
+         *
+         * free(uarg->uspace_stack);
+         * free(uarg);
+         */
         
         /* If there is a manager, destroy it */
@@ -92 +96 @@
     thread_id_t *tid)
 {
-        char *stack;
-        uspace_arg_t *uarg;
-        int rc;
-
-        stack = (char *) malloc(getpagesize() * THREAD_INITIAL_STACK_PAGES_NO);
-        if (!stack)
-                return -1;
-                
-        uarg = (uspace_arg_t *) malloc(sizeof(uspace_arg_t));
-        if (!uarg) {
-                free(stack);
-                return -1;
+        uspace_arg_t *uarg =
+            (uspace_arg_t *) malloc(sizeof(uspace_arg_t));
+        if (!uarg)
+                return ENOMEM;
+        
+        size_t stack_size = getpagesize() * THREAD_INITIAL_STACK_PAGES;
+        void *stack = as_area_create(AS_AREA_ANY, stack_size,
+            AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
+        if (stack == AS_MAP_FAILED) {
+                free(uarg);
+                return ENOMEM;
         }
         
         uarg->uspace_entry = (void *) FADDR(__thread_entry);
-        uarg->uspace_stack = (void *) stack;
+        uarg->uspace_stack = stack;
+        uarg->uspace_stack_size = stack_size;
         uarg->uspace_thread_function = function;
         uarg->uspace_thread_arg = arg;
         uarg->uspace_uarg = uarg;
         
-        rc = __SYSCALL4(SYS_THREAD_CREATE, (sysarg_t) uarg, (sysarg_t) name,
-            (sysarg_t) str_size(name), (sysarg_t) tid);
+        int rc = __SYSCALL4(SYS_THREAD_CREATE, (sysarg_t) uarg,
+            (sysarg_t) name, (sysarg_t) str_size(name), (sysarg_t) tid);
         
-        if (rc) {
+        if (rc != EOK) {
                 /*
                  * Failed to create a new thread.
-                 * Free up the allocated structures.
+                 * Free up the allocated data.
                  */
+                as_area_destroy(stack);
                 free(uarg);
-                free(stack);
         }
-
+        
         return rc;
 }

uspace/lib/c/include/as.h

@@ -41 +41 @@
 #include <libarch/config.h>
 
+#define AS_AREA_ANY    ((void *) -1)
+#define AS_MAP_FAILED  ((void *) -1)
+
 static inline size_t SIZE2PAGES(size_t size)
 {

uspace/lib/c/include/fibril.h

@@ -87 +87 @@
 
 extern fid_t fibril_create(int (*func)(void *), void *arg);
+extern void fibril_destroy(fid_t fid);
 extern fibril_t *fibril_setup(void);
 extern void fibril_teardown(fibril_t *f);

uspace/lib/c/include/sys/mman.h

@@ -39 +39 @@
 #include <sys/types.h>
 
-#define MAP_FAILED  ((void *) -1)
+#define MAP_FAILED  AS_MAP_FAILED
 
 #define MAP_SHARED     (1 << 0)

uspace/lib/fb/imgmap.c

@@ -420 +420 @@
         
         if ((flags & IMGMAP_FLAG_SHARED) == IMGMAP_FLAG_SHARED) {
-                imgmap = (imgmap_t *) as_area_create((void *) -1, size,
+                imgmap = (imgmap_t *) as_area_create(AS_AREA_ANY, size,
                     AS_AREA_READ | AS_AREA_WRITE);
-                if (imgmap == (void *) -1)
+                if (imgmap == AS_MAP_FAILED)
                         return NULL;
         } else {

uspace/lib/fb/screenbuffer.c

@@ -79 +79 @@
         
         if ((flags & SCREENBUFFER_FLAG_SHARED) == SCREENBUFFER_FLAG_SHARED) {
-                scrbuf = (screenbuffer_t *) as_area_create((void *) -1, size,
+                scrbuf = (screenbuffer_t *) as_area_create(AS_AREA_ANY, size,
                     AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
-                if (scrbuf == (void *) -1)
+                if (scrbuf == AS_MAP_FAILED)
                         return NULL;
         } else {

uspace/lib/fs/libfs.c

@@ -339 +339 @@
          */
         rc = async_share_in_start_0_0(exch, PLB_SIZE, (void *) &reg.plb_ro);
-        if (reg.plb_ro == (void *) -1) {
+        if (reg.plb_ro == AS_MAP_FAILED) {
                 async_exchange_end(exch);
                 async_forget(req);