Changeset bf9afa07 in mainline for libc

Timestamp:

2006-06-02T11:35:05Z (19 years ago)

Author:

Ondrej Palkovsky <ondrap@…>

Branches:

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

Children:

2d22049

Parents:

49d072e

Message:

Allocation function for allocating free areas for mmap, map_physmem etc.

Location:

libc

Files:

• generic/as.c (modified) (4 diffs)
• generic/time.c (modified) (3 diffs)
• include/align.h (modified) (1 diff)
• include/as.h (modified) (1 diff)

libc/generic/as.c

@@ -27 +27 @@
  */ 
 
+#include <stdlib.h>
+#include <unistd.h>
+#include <string.h>
+#include <ddi.h>
+#include <sysinfo.h>
+#include <align.h>
+#include <as.h>
+#include <ipc/fb.h>
+#include <ipc/ipc.h>
+#include <ipc/ns.h>
+#include <ipc/services.h>
+#include <kernel/errno.h>
+
+
 #include <as.h>
 #include <libc.h>
 #include <unistd.h>
-#include <task.h>
+#include <align.h>
 
 /** Create address space area.
@@ -71 +85 @@
 static size_t heapsize = 0;
 static size_t maxheapsize = (size_t)(-1);
+
+static void * last_allocated = 0;
+
 /* Start of heap linker symbol */
 extern char _heap;
@@ -108 +125 @@
 }
 
+/** Set maximum heap size and return pointer just after the heap */
 void *set_maxheapsize(size_t mhs)
 {
@@ -115 +133 @@
 
 }
+
+/** Return pointer to some unmapped area, where fits new as_area
+ *
+ * TODO: make some first_fit/... algorithm, we are now just incrementing
+ *       the pointer to last area
+ */
+void * as_get_mappable_page(size_t sz)
+{
+        void *res;
+
+        /* Set heapsize to some meaningful value */
+        if (maxheapsize == -1)
+                set_maxheapsize(ALIGN_UP(USER_ADDRESS_SPACE_SIZE_ARCH>>1,PAGE_SIZE));
+        if (!last_allocated)
+                last_allocated = ALIGN_UP((void *)&_heap + maxheapsize, PAGE_SIZE);
+        
+        sz = ALIGN_UP(sz, PAGE_SIZE);
+        res = last_allocated;
+        last_allocated += sz;
+
+        return res;
+}

libc/generic/time.c

@@ -57 +57 @@
  * sequence of subsequent gettimeofday calls is ordered.
  */
-#define TMAREA (100*1024*1024)
 int gettimeofday(struct timeval *tv, struct timezone *tz)
 {
@@ -66 +65 @@
 
         if (!ktime) {
-                /* TODO: specify better, where to map the area */
+                mapping = as_get_mappable_page(PAGE_SIZE);
                 /* Get the mapping of kernel clock */
                 res = ipc_call_sync_3(PHONE_NS, IPC_M_AS_AREA_RECV, 
-                                      TMAREA,
-                                      PAGE_SIZE,
-                                      0,
+                                      mapping, PAGE_SIZE, 0,
                                       NULL,&rights,NULL);
                 if (res) {
@@ -80 +77 @@
                         printf("Received bad rights on time area: %X\n",
                                rights);
-                        as_area_destroy(TMAREA);
+                        as_area_destroy(mapping);
                         _exit(1);
                 }
-                ktime = (void *) (TMAREA);
+                ktime = mapping;
         }
         if (tz) {

libc/include/align.h

@@ -43 +43 @@
  * @param a Size of alignment, must be power of 2.
  */
-#define ALIGN_UP(s, a)          (((s) + ((a) - 1)) & ~((a) - 1))
+#define ALIGN_UP(s, a)          ((long)((s) + ((a) - 1)) & ~((long) (a) - 1))
 
 #endif

libc/include/as.h

@@ -41 +41 @@
 extern int as_area_destroy(void *address);
 extern void *set_maxheapsize(size_t mhs);
+extern void * as_get_mappable_page(size_t sz);
 
 #endif