| ... | ... | @@ -272,6 +272,13 @@ const WasmPageAllocator = struct { |
| 272 | 272 | return self.packed_data.int_count; |
| 273 | 273 | } |
| 274 | 274 | |
| 275 | fn setBits(self: *FreeBlock, start_idx: usize, len: usize, val: u1) void { |
| 276 | var i: usize = 0; |
| 277 | while (i < len) : (i += 1) { |
| 278 | self.packed_data.set(i + start_idx + self.offset, val); |
| 279 | } |
| 280 | } |
| 281 | |
| 275 | 282 | fn useRecycled(self: *FreeBlock, num_pages: usize) ?[*]u8 { |
| 276 | 283 | var found_idx: usize = 0; |
| 277 | 284 | var found_size: usize = 0; |
| ... | ... | @@ -296,10 +303,7 @@ const WasmPageAllocator = struct { |
| 296 | 303 | found_size += 1; |
| 297 | 304 | |
| 298 | 305 | if (found_size >= num_pages) { |
| 299 | | while (found_size > 0) { |
| 300 | | found_size -= 1; |
| 301 | | self.packed_data.set(found_idx + found_size, 0); |
| 302 | | } |
| 306 | self.setBits(found_idx, found_size, 0); |
| 303 | 307 | return @intToPtr([*]u8, (found_idx + self.offset) * std.mem.page_size); |
| 304 | 308 | } |
| 305 | 309 | } |
| ... | ... | @@ -308,12 +312,8 @@ const WasmPageAllocator = struct { |
| 308 | 312 | return null; |
| 309 | 313 | } |
| 310 | 314 | |
| 311 | | fn recycle(self: *FreeBlock, start_index: usize, end_index: usize) void { |
| 312 | | var i = start_index - self.offset; |
| 313 | | while (i < end_index - self.offset) : (i += 1) { |
| 314 | | std.debug.assert(self.packed_data.get(i) == 0); |
| 315 | | self.packed_data.set(i, 1); |
| 316 | | } |
| 315 | fn recycle(self: *FreeBlock, start_idx: usize, len: usize) void { |
| 316 | self.setBits(start_idx, len, 1); |
| 317 | 317 | } |
| 318 | 318 | }; |
| 319 | 319 | |
| ... | ... | @@ -369,7 +369,7 @@ const WasmPageAllocator = struct { |
| 369 | 369 | } |
| 370 | 370 | |
| 371 | 371 | if (free_start < conventional.totalPages()) { |
| 372 | | conventional.recycle(free_start, free_end); |
| 372 | conventional.recycle(free_start, free_end - free_start); |
| 373 | 373 | } else { |
| 374 | 374 | if (extended.totalPages() == 0) { |
| 375 | 375 | extended.offset = conventional.offset + conventional.totalPages(); |
| ... | ... | @@ -378,7 +378,7 @@ const WasmPageAllocator = struct { |
| 378 | 378 | free_end -= 1; |
| 379 | 379 | extended.initData(@intToPtr([*]align(16) u8, free_end * std.mem.page_size)[0..std.mem.page_size]); |
| 380 | 380 | } |
| 381 | | extended.recycle(free_start, free_end); |
| 381 | extended.recycle(free_start, free_end - free_start); |
| 382 | 382 | } |
| 383 | 383 | } |
| 384 | 384 | |
Benjamin Feng <contact@fengb.me> 2019-12-03 17:41:05-06:00
lib