generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-10-18 19:48:46 +02:00
Code Issues Projects Releases Wiki Activity

Renamed zone::malloc familiy functions.

Browse Source
This commit is contained in:
Takatoshi Kondo
2014-01-26 22:18:26 +00:00
parent d70c44b723
commit beebccd323
17 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cpp11/define.hpp
View File

@@ -121,7 +121,7 @@ struct define {
void msgpack_object(msgpack::object* o, msgpack::zone* z) const
{
o->type = type::ARRAY;
o->via.array.ptr = static_cast<object*>(z->malloc(sizeof(object)*sizeof...(Args)));
o->via.array.ptr = static_cast<object*>(z->allocate_align(sizeof(object)*sizeof...(Args)));
o->via.array.size = sizeof...(Args);
define_imp<tuple<Args&...>, sizeof...(Args)>::object(o, z, a);

2
cpp11/tuple.hpp
View File

@@ -189,7 +189,7 @@ inline void operator<< (
object::with_zone& o,
type::tuple<Args...>& v) {
o.type = type::ARRAY;
o.via.array.ptr = static_cast<object*>(o.zone->malloc(sizeof(object)*sizeof...(Args)));
o.via.array.ptr = static_cast<object*>(o.zone->allocate_align(sizeof(object)*sizeof...(Args)));
o.via.array.size = sizeof...(Args);
TupleToObjectWithZone<decltype(v), sizeof...(Args)>::convert(o, v);
}

26
cpp11/zone.hpp
View File

@@ -155,8 +155,8 @@ public:
public:
static zone* create(size_t chunk_size);
static void destroy(zone* zone);
void* malloc(size_t size);
void* malloc_no_align(size_t size);
void* allocate_align(size_t size);
void* allocate_no_align(size_t size);
void push_finalizer(void (*func)(void*), void* data);
@@ -172,12 +172,12 @@ public:
T* allocate(Args... args);
private:
void undo_malloc(size_t size);
void undo_allocate(size_t size);
template <typename T>
static void object_destructor(void* obj);
void* malloc_expand(size_t size);
void* allocate_expand(size_t size);
};
inline zone* zone::create(size_t chunk_size)
@@ -200,16 +200,16 @@ inline zone::zone(size_t chunk_size) noexcept:chunk_size_(chunk_size), chunk_lis
{
}
inline void* zone::malloc(size_t size)
inline void* zone::allocate_align(size_t size)
{
return malloc_no_align(
return allocate_no_align(
((size)+((MSGPACK_ZONE_ALIGN)-1)) & ~((MSGPACK_ZONE_ALIGN)-1));
}
inline void* zone::malloc_no_align(size_t size)
inline void* zone::allocate_no_align(size_t size)
{
if(chunk_list_.free_ < size) {
return malloc_expand(size);
return allocate_expand(size);
}
char* ptr = chunk_list_.ptr_;
@@ -219,7 +219,7 @@ inline void* zone::malloc_no_align(size_t size)
return ptr;
}
inline void* zone::malloc_expand(size_t size)
inline void* zone::allocate_expand(size_t size)
{
chunk_list* const cl = &chunk_list_;
@@ -270,7 +270,7 @@ void zone::object_destructor(void* obj)
reinterpret_cast<T*>(obj)->~T();
}
inline void zone::undo_malloc(size_t size)
inline void zone::undo_allocate(size_t size)
{
chunk_list_.ptr_ -= size;
chunk_list_.free_ += size;
@@ -280,18 +280,18 @@ inline void zone::undo_malloc(size_t size)
template <typename T, typename... Args>
T* zone::allocate(Args... args)
{
void* x = malloc(sizeof(T));
void* x = allocate_align(sizeof(T));
try {
finalizer_array_.push(&zone::object_destructor<T>, x);
} catch (...) {
undo_malloc(sizeof(T));
undo_allocate(sizeof(T));
throw;
}
try {
return new (x) T(args...);
} catch (...) {
--finalizer_array_.tail_;
undo_malloc(sizeof(T));
undo_allocate(sizeof(T));
throw;
}
}