#1569 Remove redundant block_tail member from block allocator

Author: SanderMertens

distr/flecs.c

@@ -28573,17 +28573,14 @@ ecs_block_allocator_chunk_header_t* flecs_balloc_block(
         ECS_SIZEOF(ecs_block_allocator_block_t));
 
     block->memory = first_chunk;
-    if (!allocator->block_tail) {
-        ecs_assert(!allocator->block_head, ECS_INTERNAL_ERROR, 0);
-        block->next = NULL;
-        allocator->block_head = block;
-        allocator->block_tail = block;
-    } else {
-        block->next = NULL;
-        allocator->block_tail->next = block;
-        allocator->block_tail = block;
+    block->next = NULL;
+
+    if (allocator->block_head) {
+        block->next = allocator->block_head;
     }
 
+    allocator->block_head = block;
+
     ecs_block_allocator_chunk_header_t *chunk = first_chunk;
     int32_t i, end;
     for (i = 0, end = allocator->chunks_per_block - 1; i < end; ++i) {
@@ -28619,7 +28616,6 @@ void flecs_ballocator_init(
     ba->block_size = ba->chunks_per_block * ba->chunk_size;
     ba->head = NULL;
     ba->block_head = NULL;
-    ba->block_tail = NULL;
 }
 
 ecs_block_allocator_t* flecs_ballocator_new(

distr/flecs.h

@@ -1554,7 +1554,6 @@ typedef struct ecs_block_allocator_chunk_header_t {
 typedef struct ecs_block_allocator_t {
     ecs_block_allocator_chunk_header_t *head;
     ecs_block_allocator_block_t *block_head;
-    ecs_block_allocator_block_t *block_tail;
     int32_t chunk_size;
     int32_t data_size;
     int32_t chunks_per_block;

include/flecs/datastructures/block_allocator.h

@@ -22,7 +22,6 @@ typedef struct ecs_block_allocator_chunk_header_t {
 typedef struct ecs_block_allocator_t {
     ecs_block_allocator_chunk_header_t *head;
     ecs_block_allocator_block_t *block_head;
-    ecs_block_allocator_block_t *block_tail;
     int32_t chunk_size;
     int32_t data_size;
     int32_t chunks_per_block;

src/datastructures/block_allocator.c

@@ -32,17 +32,14 @@ ecs_block_allocator_chunk_header_t* flecs_balloc_block(
         ECS_SIZEOF(ecs_block_allocator_block_t));
 
     block->memory = first_chunk;
-    if (!allocator->block_tail) {
-        ecs_assert(!allocator->block_head, ECS_INTERNAL_ERROR, 0);
-        block->next = NULL;
-        allocator->block_head = block;
-        allocator->block_tail = block;
-    } else {
-        block->next = NULL;
-        allocator->block_tail->next = block;
-        allocator->block_tail = block;
+    block->next = NULL;
+
+    if (allocator->block_head) {
+        block->next = allocator->block_head;
     }
 
+    allocator->block_head = block;
+
     ecs_block_allocator_chunk_header_t *chunk = first_chunk;
     int32_t i, end;
     for (i = 0, end = allocator->chunks_per_block - 1; i < end; ++i) {
@@ -78,7 +75,6 @@ void flecs_ballocator_init(
     ba->block_size = ba->chunks_per_block * ba->chunk_size;
     ba->head = NULL;
     ba->block_head = NULL;
-    ba->block_tail = NULL;
 }
 
 ecs_block_allocator_t* flecs_ballocator_new(