From 4175f67b9b51cdfd9bcbd57de4dcedea2cb0ca4d Mon Sep 17 00:00:00 2001 From: Max Wash Date: Thu, 2 Feb 2023 21:10:37 +0000 Subject: [PATCH] sandbox: vm: replace calls to queue_length() with queue_empty() --- sandbox/vm/cache.c | 6 +++--- sandbox/vm/zone.c | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sandbox/vm/cache.c b/sandbox/vm/cache.c index 71ee3a8..1efa96c 100644 --- a/sandbox/vm/cache.c +++ b/sandbox/vm/cache.c @@ -1,4 +1,4 @@ -#include "socks/queue.h" +#include #include #define FREELIST_END ((unsigned int)-1) @@ -141,10 +141,10 @@ static unsigned int pointer_to_slot(vm_slab_t *slab, void *p) void *vm_cache_alloc(vm_cache_t *cache, vm_flags_t flags) { vm_slab_t *slab = NULL; - if (queue_length(&cache->c_slabs_partial) > 0) { + if (!queue_empty(&cache->c_slabs_partial)) { /* prefer using up partially-full slabs before taking a fresh one */ slab = QUEUE_CONTAINER(vm_slab_t, s_list, queue_pop_front(&cache->c_slabs_partial)); - } else if (queue_length(&cache->c_slabs_empty) > 0) { + } else if (!queue_empty(&cache->c_slabs_empty)) { slab = QUEUE_CONTAINER(vm_slab_t, s_list, queue_pop_front(&cache->c_slabs_empty)); } else { /* we've run out of slabs. create a new one */ diff --git a/sandbox/vm/zone.c b/sandbox/vm/zone.c index 22f0419..b2a0e54 100644 --- a/sandbox/vm/zone.c +++ b/sandbox/vm/zone.c @@ -130,7 +130,7 @@ void vm_zone_init(vm_zone_t *z, const vm_zone_descriptor_t *zone_info) static int replenish_free_page_list(vm_zone_t *z, vm_page_order_t order) { - if (queue_length(&z->z_free_pages[order]) != 0) { + if (!queue_empty(&z->z_free_pages[order])) { /* we already have pages available. */ return 0; } @@ -144,7 +144,7 @@ static int replenish_free_page_list(vm_zone_t *z, vm_page_order_t order) vm_page_order_t first_order_with_free = VM_MAX_PAGE_ORDERS; for (vm_page_order_t i = order; i <= VM_PAGE_MAX_ORDER; i++) { - if (queue_length(&z->z_free_pages[i]) > 0) { + if (!queue_empty(&z->z_free_pages[i])) { first_order_with_free = i; break; }