Changeset 0b37882 in mainline for uspace/lib/c/include

Timestamp:

2011-02-03T21:14:23Z (14 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

17aca1c, 6a343bdf, cf2af94

Parents:

d88218b (diff), ae6f303 (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:

memory management work

• implement as_get_mappable_page() as a new syscall (SYS_AS_GET_UNMAPPED_AREA), the kernel has a full knowledge of the address space areas, there is no need to duplicate this management in uspace)
• make sure all address space/address space area manipulating functions use proper page alignment on base addresses and sizes (discrepancy with respect to this caused inconsistent behaviour, although no fatal bugs were probably present)
• add forgotten tests (area != avoid) to check_area_conflicts()
• unify size/page conversions (use always use bitwise shifts by PAGE_WIDTH)
• new uspace heap allocator
  • basic next fit algorithm for better scalability (there is still space for optimizations)
  • support for multiple discontinuous heap areas (inspired by Jiri Tlach's implementation in lp:~jiri-tlach/helenos/nommu, but independent)
  • the "_heap" linker script symbol has been removed, the initial heap area is allocated according to as_get_mappable_page() (which uses the address of entry as the lower bound of the address space area base)
  • the hardwired 1 GB (4 GB respectivelly) heap size limit has been removed
  • the heap areas can be freely intermixed with other address space areas (e.g. mapped physical memory of devices, shared memory, etc.), the address space holes can be reused later (but still merging of adjunct address space areas is missing)
• minor cstyle changes

Location:

uspace/lib/c/include

Files:

• as.h (modified) (1 diff)
• malloc.h (modified) (1 diff)
• unistd.h (modified) (2 diffs)

uspace/lib/c/include/as.h

@@ -41 +41 @@
 #include <libarch/config.h>
 
+static inline size_t SIZE2PAGES(size_t size)
+{
+        if (size == 0)
+                return 0;
+        
+        return (size_t) ((size - 1) >> PAGE_WIDTH) + 1;
+}
+
+static inline size_t PAGES2SIZE(size_t pages)
+{
+        return (size_t) (pages << PAGE_WIDTH);
+}
+
 extern void *as_area_create(void *address, size_t size, int flags);
 extern int as_area_resize(void *address, size_t size, int flags);

uspace/lib/c/include/malloc.h

@@ -38 +38 @@
 #include <sys/types.h>
 
-extern uintptr_t get_max_heap_addr(void);
-
 extern void *malloc(const size_t size)
     __attribute__((malloc));

uspace/lib/c/include/unistd.h

@@ -44 +44 @@
 #endif
 
-#define getpagesize()  (PAGE_SIZE)
-
 #ifndef SEEK_SET
         #define SEEK_SET  0
@@ -57 +55 @@
         #define SEEK_END  2
 #endif
+
+#define getpagesize()  (PAGE_SIZE)
 
 extern int dup2(int oldfd, int newfd);