Merge pull request rcore-os#35 from bigsaltyfishes/master

Split into smaller blocks if the order of block size is larger than max order

Author: jiegec

src/lib.rs

@@ -88,10 +88,18 @@ impl<const ORDER: usize> Heap<ORDER> {
 
         while current_start + size_of::<usize>() <= end {
             let lowbit = current_start & (!current_start + 1);
-            let size = min(lowbit, prev_power_of_two(end - current_start));
+            let mut size = min(lowbit, prev_power_of_two(end - current_start));
+            
+            // If the order of size is larger than the max order,
+            // split it into smaller blocks.
+            let mut order = size.trailing_zeros() as usize;
+            if order > ORDER - 1 {
+                order = ORDER - 1;
+                size = 1 << order;
+            }
             total += size;
 
-            self.free_list[size.trailing_zeros() as usize].push(current_start as *mut usize);
+            self.free_list[order].push(current_start as *mut usize);
             current_start += size;
         }
 

src/test.rs

@@ -60,6 +60,21 @@ fn test_heap_add() {
     assert!(addr.is_ok());
 }
 
+#[test]
+fn test_heap_add_large() {
+    // Max size of block is 2^7 == 128 bytes
+    let mut heap = Heap::<8>::new();
+    assert!(heap.alloc(Layout::from_size_align(1, 1).unwrap()).is_err());
+
+    // 512 bytes of space
+    let space: [u8; 512] = [0; 512];
+    unsafe {
+        heap.add_to_heap(space.as_ptr() as usize, space.as_ptr().add(100) as usize);
+    }
+    let addr = heap.alloc(Layout::from_size_align(1, 1).unwrap());
+    assert!(addr.is_ok());
+}
+
 #[test]
 fn test_heap_oom() {
     let mut heap = Heap::<32>::new();