TheCloud/thor-os
1
0
Fork 0
mirror of https://github.com/wichtounet/thor-os.git synced 2025-09-18 09:04:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

Refactor

Browse Source
This commit is contained in:
Baptiste Wicht 2014-02-08 17:54:58 +01:00
parent 0d70c97e97
commit f8c51644ef
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
userlib/src/malloc.cpp
View File

@ -7,6 +7,9 @@
#include "malloc.hpp" #include "malloc.hpp"
#define likely(x) __builtin_expect (!!(x), 1)
#define unlikely(x) __builtin_expect (!!(x), 0)
namespace { namespace {
bool init = false; bool init = false;
@ -72,7 +75,7 @@ void remove(malloc_header_chunk* current){
bool expand_heap(malloc_header_chunk* current, size_t bytes = 0){ bool expand_heap(malloc_header_chunk* current, size_t bytes = 0){
auto blocks = MIN_BLOCKS; auto blocks = MIN_BLOCKS;
if(bytes){ if(unlikely(bytes)){
auto necessary_blocks = ((bytes + META_SIZE) / BLOCK_SIZE) + 1; auto necessary_blocks = ((bytes + META_SIZE) / BLOCK_SIZE) + 1;
if(necessary_blocks > blocks){ if(necessary_blocks > blocks){
@ -121,7 +124,7 @@ void init_head(){
} //end of anonymous namespace } //end of anonymous namespace
void* malloc(size_t bytes){ void* malloc(size_t bytes){
if(!init){ if(unlikely(!init)){
init_head(); init_head();
} }