justin/jsix_import
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

[util] Replace kutil with util

Browse Source 
Now that kutil has no kernel-specific code in it anymore, it can
actually be linked to by anything, so I'm renaming it 'util'.

Also, I've tried to unify the way that the system libraries from
src/libraries are #included using <> instead of "".

Other small change: util::bip_buffer got a spinlock to guard against
state corruption.
This commit is contained in:
Justin C. Miller
2022-01-03 00:03:29 -08:00
parent 5f88f5ed02
commit cd9b85b555
68 changed files with 231 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/kernel/heap_allocator.cpp
View File

@@ -1,6 +1,7 @@
#include <stdint.h>
#include <string.h>
#include "kutil/util.h"
#include <util/util.h>
#include "assert.h"
#include "heap_allocator.h"
@@ -81,7 +82,7 @@ heap_allocator::allocate(size_t length)
if (length == 0)
return nullptr;
unsigned order = kutil::log2(total);
unsigned order = util::log2(total);
if (order < min_order)
order = min_order;
@@ -89,7 +90,7 @@ heap_allocator::allocate(size_t length)
if (order > max_order)
return nullptr;
kutil::scoped_lock lock {m_lock};
util::scoped_lock lock {m_lock};
mem_header *header = pop_free(order);
header->set_used(true);
@@ -106,7 +107,7 @@ heap_allocator::free(void *p)
kassert(addr >= m_start && addr < m_end,
"Attempt to free non-heap pointer");
kutil::scoped_lock lock {m_lock};
util::scoped_lock lock {m_lock};
mem_header *header = reinterpret_cast<mem_header *>(p);
header -= 1; // p points after the header