Commit 01e73bba8d8c98558de35a43e82a5f8de837d8a5 | zig

author	Benjamin Feng <contact@fengb.me> 2019-12-03 23:49:56-06:00
committer	Benjamin Feng <contact@fengb.me> 2019-12-04 00:08:09-06:00
log	01e73bba8d8c98558de35a43e82a5f8de837d8a5
tree	2f4842f017860166f9660e1c872ea48426d3de1b
parent	baffaf7986d34b47580819eb70b66a5311556046

Tighten recycled search

1 files changed, 9 insertions(+), 18 deletions(-)

lib
- std
  - heap.zig

lib/std/heap.zig+9-18

 @@ -280,9 +280,7 @@ const WasmPageAllocator = struct {
         }
         fn useRecycled(self: *FreeBlock, num_pages: usize) ?[*]u8 {
-            var found_idx: usize = 0;
+            @setCold(true);
-            var found_size: usize = 0;
             for (self.block_data) |segment, i| {
                 const spills_into_next = @bitCast(i128, segment) < 0;
                 const has_enough_bits = @popCount(u128, segment) >= num_pages;
 @@ -290,23 +288,16 @@ const WasmPageAllocator = struct {
                 if (!spills_into_next and !has_enough_bits) continue;
                 var j: usize = i * 128;
-                while (j < self.packed_data.int_count) : (j += 1) {
+                while (j < (i + 1) * 128) : (j += 1) {
-                    if (self.packed_data.get(j) == 0) {
+                    var count: usize = 0;
-                        found_size = 0;
+                    while (j + count < self.packed_data.int_count and self.packed_data.get(j + count) == 1) {
-                        if (j > (i + 1) * 128) {
+                        count += 1;
-                            break;
+                        if (count >= num_pages) {
-                        }
+                            self.setBits(j, num_pages, 0);
-                    } else {
+                            return @intToPtr([*]u8, (j + self.offset) * std.mem.page_size);
-                        if (found_size == 0) {
-                            found_idx = j;
-                        }
-                        found_size += 1;
-                        if (found_size >= num_pages) {
-                            self.setBits(found_idx, found_size, 0);
-                            return @intToPtr([*]u8, (found_idx + self.offset) * std.mem.page_size);
                         }
                     }
+                    j += count;
                 }
             }
             return null;