Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

A Whole New World (clang-format edition)

Browse source 
I can show you the code
Pretty, with proper whitespace
Tell me, coder, now when did
You last write readable code?

I can open your eyes
Make you see your bad indent
Force you to respect the style
The core devs agreed upon

A whole new world
A new fantastic code format
A de facto standard
With some sugar
Enforced with clang-format

A whole new world
A dazzling style we all dreamed of
And when we read it through
It's crystal clear
That now we're in a whole new world of code
This commit is contained in:
Rémi Verschelde 2017-03-05 16:44:50 +01:00
parent 45438e9918
commit 5dbf1809c6
1318 changed files with 140051 additions and 166004 deletions
Download patch file Download diff file Expand all files Collapse all files

112
core/os/memory.cpp
View file

@ -27,19 +27,17 @@
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "memory.h"
#include "error_macros.h"
#include "copymem.h"
#include "error_macros.h"
#include <stdio.h>
#include <stdlib.h>
void *operator new(size_t p_size, const char *p_description) {
void * operator new(size_t p_size,const char *p_description) {
return Memory::alloc_static( p_size, false );
return Memory::alloc_static(p_size, false);
}
void * operator new(size_t p_size,void* (*p_allocfunc)(size_t p_size)) {
void *operator new(size_t p_size, void *(*p_allocfunc)(size_t p_size)) {
return p_allocfunc(p_size);
}
@ -47,38 +45,36 @@ void * operator new(size_t p_size,void* (*p_allocfunc)(size_t p_size)) {
#include <stdio.h>
#ifdef DEBUG_ENABLED
size_t Memory::mem_usage=0;
size_t Memory::max_usage=0;
size_t Memory::mem_usage = 0;
size_t Memory::max_usage = 0;
#endif
size_t Memory::alloc_count=0;
void * Memory::alloc_static(size_t p_bytes,bool p_pad_align) {
size_t Memory::alloc_count = 0;
void *Memory::alloc_static(size_t p_bytes, bool p_pad_align) {
#ifdef DEBUG_ENABLED
bool prepad=true;
bool prepad = true;
#else
bool prepad=p_pad_align;
bool prepad = p_pad_align;
#endif
void * mem = malloc( p_bytes + (prepad?PAD_ALIGN:0));
void *mem = malloc(p_bytes + (prepad ? PAD_ALIGN : 0));
alloc_count++;
ERR_FAIL_COND_V(!mem,NULL);
ERR_FAIL_COND_V(!mem, NULL);
if (prepad) {
uint64_t *s = (uint64_t*)mem;
*s=p_bytes;
uint64_t *s = (uint64_t *)mem;
*s = p_bytes;
uint8_t *s8 = (uint8_t*)mem;
uint8_t *s8 = (uint8_t *)mem;
#ifdef DEBUG_ENABLED
mem_usage+=p_bytes;
if (mem_usage>max_usage) {
max_usage=mem_usage;
mem_usage += p_bytes;
if (mem_usage > max_usage) {
max_usage = mem_usage;
}
#endif
return s8 + PAD_ALIGN;
@ -87,74 +83,74 @@ void * Memory::alloc_static(size_t p_bytes,bool p_pad_align) {
}
}
void * Memory::realloc_static(void *p_memory,size_t p_bytes,bool p_pad_align) {
void *Memory::realloc_static(void *p_memory, size_t p_bytes, bool p_pad_align) {
if (p_memory==NULL) {
return alloc_static(p_bytes,p_pad_align);
if (p_memory == NULL) {
return alloc_static(p_bytes, p_pad_align);
}
uint8_t *mem = (uint8_t*)p_memory;
uint8_t *mem = (uint8_t *)p_memory;
#ifdef DEBUG_ENABLED
bool prepad=true;
bool prepad = true;
#else
bool prepad=p_pad_align;
bool prepad = p_pad_align;
#endif
if (prepad) {
mem-=PAD_ALIGN;
uint64_t *s = (uint64_t*)mem;
mem -= PAD_ALIGN;
uint64_t *s = (uint64_t *)mem;
#ifdef DEBUG_ENABLED
mem_usage-=*s;
mem_usage+=p_bytes;
mem_usage -= *s;
mem_usage += p_bytes;
#endif
if (p_bytes==0) {
if (p_bytes == 0) {
free(mem);
return NULL;
} else {
*s=p_bytes;
*s = p_bytes;
mem = (uint8_t*)realloc(mem,p_bytes+PAD_ALIGN);
ERR_FAIL_COND_V(!mem,NULL);
mem = (uint8_t *)realloc(mem, p_bytes + PAD_ALIGN);
ERR_FAIL_COND_V(!mem, NULL);
s = (uint64_t*)mem;
s = (uint64_t *)mem;
*s=p_bytes;
*s = p_bytes;
return mem+PAD_ALIGN;
return mem + PAD_ALIGN;
}
} else {
mem = (uint8_t*)realloc(mem,p_bytes);
mem = (uint8_t *)realloc(mem, p_bytes);
ERR_FAIL_COND_V(mem==NULL && p_bytes>0,NULL);
ERR_FAIL_COND_V(mem == NULL && p_bytes > 0, NULL);
return mem;
}
}
void Memory::free_static(void *p_ptr,bool p_pad_align) {
void Memory::free_static(void *p_ptr, bool p_pad_align) {
ERR_FAIL_COND(p_ptr==NULL);
ERR_FAIL_COND(p_ptr == NULL);
uint8_t *mem = (uint8_t*)p_ptr;
uint8_t *mem = (uint8_t *)p_ptr;
#ifdef DEBUG_ENABLED
bool prepad=true;
bool prepad = true;
#else
bool prepad=p_pad_align;
bool prepad = p_pad_align;
#endif
alloc_count--;
if (prepad) {
mem-=PAD_ALIGN;
uint64_t *s = (uint64_t*)mem;
mem -= PAD_ALIGN;
uint64_t *s = (uint64_t *)mem;
#ifdef DEBUG_ENABLED
mem_usage-=*s;
mem_usage -= *s;
#endif
free(mem);
@ -162,23 +158,21 @@ void Memory::free_static(void *p_ptr,bool p_pad_align) {
free(mem);
}
}
size_t Memory::get_mem_available() {
return 0xFFFFFFFFFFFFF;
}
size_t Memory::get_mem_usage(){
size_t Memory::get_mem_usage() {
#ifdef DEBUG_ENABLED
return mem_usage;
#else
return 0;
#endif
}
size_t Memory::get_mem_max_usage(){
size_t Memory::get_mem_max_usage() {
#ifdef DEBUG_ENABLED
return max_usage;
#else
@ -186,16 +180,12 @@ size_t Memory::get_mem_max_usage(){
#endif
}
_GlobalNil::_GlobalNil() {
color=1;
left=this;
right=this;
parent=this;
color = 1;
left = this;
right = this;
parent = this;
}
_GlobalNil _GlobalNilClass::_nil;