Changeset 1f7753a in mainline for uspace

Timestamp:

2012-11-18T22:10:15Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

0ab362c, c739102

Parents:

a7f7ed12 (diff), 34ae0a5 (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 from lp:~jakub/helenos/mm.

Location:

uspace/lib/c

Files:

• Makefile (modified) (1 diff)
• generic/fibril.c (modified) (6 diffs)
• generic/stack.c (added)
• generic/thread.c (modified) (3 diffs)
• include/stack.h (added)

uspace/lib/c/Makefile

@@ -140 +140 @@
         generic/net/socket_client.c \
         generic/net/socket_parse.c \
+        generic/stack.c \
         generic/stacktrace.c \
         generic/arg_parse.c \

uspace/lib/c/generic/fibril.c

@@ -37 +37 @@
 #include <fibril.h>
 #include <thread.h>
+#include <stack.h>
 #include <tls.h>
 #include <malloc.h>
+#include <abi/mm/as.h>
+#include <as.h>
 #include <unistd.h>
 #include <stdio.h>
@@ -46 +49 @@
 #include <assert.h>
 #include <async.h>
-
-#ifndef FIBRIL_INITIAL_STACK_PAGES_NO
-        #define FIBRIL_INITIAL_STACK_PAGES_NO  1
-#endif
 
 /**
@@ -195 +194 @@
                                          * stack member filled.
                                          */
-                                        free(stack);
+                                        as_area_destroy(stack);
                                 }
                                 fibril_teardown(srcf->clean_after_me);
@@ -269 +268 @@
                 return 0;
         
-        fibril->stack =
-            (char *) malloc(FIBRIL_INITIAL_STACK_PAGES_NO * getpagesize());
-        if (!fibril->stack) {
+        size_t stack_size = stack_size_get();
+        fibril->stack = as_area_create((void *) -1, stack_size,
+            AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE | AS_AREA_GUARD |
+            AS_AREA_LATE_RESERVE);
+        if (fibril->stack == (void *) -1) {
                 fibril_teardown(fibril);
                 return 0;
@@ -281 +282 @@
         context_save(&fibril->ctx);
         context_set(&fibril->ctx, FADDR(fibril_main), fibril->stack,
-            FIBRIL_INITIAL_STACK_PAGES_NO * getpagesize(), fibril->tcb);
+            stack_size, fibril->tcb);
 
         return (fid_t) fibril;
@@ -298 +299 @@
         fibril_t *fibril = (fibril_t *) fid;
         
-        free(fibril->stack);
+        as_area_destroy(fibril->stack);
         fibril_teardown(fibril);
 }

uspace/lib/c/generic/thread.c

@@ -39 +39 @@
 #include <abi/proc/uarg.h>
 #include <fibril.h>
+#include <stack.h>
 #include <str.h>
 #include <async.h>
@@ -44 +45 @@
 #include <as.h>
 #include "private/thread.h"
-
-#ifndef THREAD_INITIAL_STACK_PAGES
-        #define THREAD_INITIAL_STACK_PAGES  2
-#endif
 
 /** Main thread function.
@@ -101 +98 @@
                 return ENOMEM;
         
-        size_t stack_size = getpagesize() * THREAD_INITIAL_STACK_PAGES;
+        size_t stack_size = stack_size_get();
         void *stack = as_area_create(AS_AREA_ANY, stack_size,
-            AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE);
+            AS_AREA_READ | AS_AREA_WRITE | AS_AREA_CACHEABLE | AS_AREA_GUARD |
+            AS_AREA_LATE_RESERVE);
         if (stack == AS_MAP_FAILED) {
                 free(uarg);