sandbox: vm: replace calls to queue_length() with queue_empty()
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
#include "socks/queue.h"
|
||||
#include <socks/queue.h>
|
||||
#include <socks/vm.h>
|
||||
|
||||
#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 */
|
||||
|
||||
@@ -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;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user