Changeset 23939
- Timestamp:
- 02/10/08 15:00:13 (3 months ago)
- Files:
-
- haiku/trunk/headers/private/kernel/heap.h (added)
- haiku/trunk/headers/private/kernel/memheap.h (deleted)
- haiku/trunk/src/system/kernel/heap.c (deleted)
- haiku/trunk/src/system/kernel/heap.cpp (added)
- haiku/trunk/src/system/kernel/Jamfile (modified) (1 diff)
- haiku/trunk/src/system/kernel/vm/vm.cpp (modified) (4 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
haiku/trunk/src/system/kernel/Jamfile
r23809 r23939 22 22 cpu.c 23 23 elf.cpp 24 heap.c 24 heap.cpp 25 25 image.c 26 26 int.c haiku/trunk/src/system/kernel/vm/vm.cpp
r23906 r23939 26 26 #include <vm_low_memory.h> 27 27 #include <file_cache.h> 28 #include < memheap.h>28 #include <heap.h> 29 29 #include <condition_variable.h> 30 30 #include <debug.h> … … 3481 3481 sAvailableMemory = vm_page_num_pages() * B_PAGE_SIZE; 3482 3482 3483 // reduce the heap size if we have not so much RAM3484 size_t heapSize = HEAP_SIZE;3485 if (sAvailableMemory < 100 * 1024 * 1024)3486 heapSize /= 4;3487 else if (sAvailableMemory < 200 * 1024 * 1024)3488 heapSize /= 2;3489 else if (sAvailableMemory >= 1024 * 1024 * 1024)3490 heapSize *= 2;3491 3492 3483 // map in the new heap and initialize it 3484 size_t heapSize = INITIAL_HEAP_SIZE; 3493 3485 addr_t heapBase = vm_allocate_early(args, heapSize, heapSize, 3494 3486 B_KERNEL_READ_AREA | B_KERNEL_WRITE_AREA); … … 3608 3600 3609 3601 slab_init_post_sem(); 3610 3611 return heap_init_post_sem(args); 3602 return heap_init_post_sem(); 3612 3603 } 3613 3604 … … 3619 3610 vm_daemon_init(); 3620 3611 vm_low_memory_init_post_thread(); 3621 3622 return heap_init_post_thread(args); 3612 return heap_init_post_thread(); 3623 3613 } 3624 3614
