generic-library/msgpack
1
0
Fork 0
mirror of https://github.com/msgpack/msgpack-c.git synced 2025-05-29 07:25:55 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #171 from redboltz/fixed_zone_alignment

Browse Source 
Fixed zone alignment
This commit is contained in:
Nobuyuki Kubota 2015-01-02 11:37:01 -08:00
commit 57732f0c1b
5 changed files with 84 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
erb/cpp03_zone.hpp.erb
View File

@ -150,7 +150,7 @@ public:
zone(size_t chunk_size = MSGPACK_ZONE_CHUNK_SIZE) /* throw() */; zone(size_t chunk_size = MSGPACK_ZONE_CHUNK_SIZE) /* throw() */;
public: public:
void* allocate_align(size_t size); void* allocate_align(size_t size, size_t align = MSGPACK_ZONE_ALIGN);
void* allocate_no_align(size_t size); void* allocate_no_align(size_t size);
void push_finalizer(void (*func)(void*), void* data); void push_finalizer(void (*func)(void*), void* data);
@ -203,10 +203,21 @@ inline zone::zone(size_t chunk_size) /* throw() */ :m_chunk_size(chunk_size), m_
{ {
} }
inline void* zone::allocate_align(size_t size) inline void* zone::allocate_align(size_t size, size_t align)
{ {
return allocate_no_align( char* aligned =
((size)+((MSGPACK_ZONE_ALIGN)-1)) & ~((MSGPACK_ZONE_ALIGN)-1)); reinterpret_cast<char*>(
reinterpret_cast<size_t>(
(m_chunk_list.m_ptr + (align - 1))) / align * align);
size_t adjusted_size = size + (aligned - m_chunk_list.m_ptr);
if(m_chunk_list.m_free >= adjusted_size) {
m_chunk_list.m_free -= adjusted_size;
m_chunk_list.m_ptr += adjusted_size;
return aligned;
}
return reinterpret_cast<char*>(
reinterpret_cast<size_t>(
allocate_expand(size + (align - 1))) / align * align);
} }
inline void* zone::allocate_no_align(size_t size) inline void* zone::allocate_no_align(size_t size)

19
include/msgpack/detail/cpp03_zone.hpp
View File

@ -150,7 +150,7 @@ public:
zone(size_t chunk_size = MSGPACK_ZONE_CHUNK_SIZE) /* throw() */; zone(size_t chunk_size = MSGPACK_ZONE_CHUNK_SIZE) /* throw() */;
public: public:
void* allocate_align(size_t size); void* allocate_align(size_t size, size_t align = MSGPACK_ZONE_ALIGN);
void* allocate_no_align(size_t size); void* allocate_no_align(size_t size);
void push_finalizer(void (*func)(void*), void* data); void push_finalizer(void (*func)(void*), void* data);
@ -248,10 +248,21 @@ inline zone::zone(size_t chunk_size) /* throw() */ :m_chunk_size(chunk_size), m_
{ {
} }
inline void* zone::allocate_align(size_t size) inline void* zone::allocate_align(size_t size, size_t align)
{ {
return allocate_no_align( char* aligned =
((size)+((MSGPACK_ZONE_ALIGN)-1)) & ~((MSGPACK_ZONE_ALIGN)-1)); reinterpret_cast<char*>(
reinterpret_cast<size_t>(
(m_chunk_list.m_ptr + (align - 1))) / align * align);
size_t adjusted_size = size + (aligned - m_chunk_list.m_ptr);
if(m_chunk_list.m_free >= adjusted_size) {
m_chunk_list.m_free -= adjusted_size;
m_chunk_list.m_ptr += adjusted_size;
return aligned;
}
return reinterpret_cast<char*>(
reinterpret_cast<size_t>(
allocate_expand(size + (align - 1))) / align * align);
} }
inline void* zone::allocate_no_align(size_t size) inline void* zone::allocate_no_align(size_t size)

19
include/msgpack/detail/cpp11_zone.hpp
View File

@ -188,7 +188,7 @@ public:
zone(size_t chunk_size = MSGPACK_ZONE_CHUNK_SIZE) noexcept; zone(size_t chunk_size = MSGPACK_ZONE_CHUNK_SIZE) noexcept;
public: public:
void* allocate_align(size_t size); void* allocate_align(size_t size, size_t align = MSGPACK_ZONE_ALIGN);
void* allocate_no_align(size_t size); void* allocate_no_align(size_t size);
void push_finalizer(void (*func)(void*), void* data); void push_finalizer(void (*func)(void*), void* data);
@ -243,10 +243,21 @@ inline zone::zone(size_t chunk_size) noexcept:m_chunk_size(chunk_size), m_chunk_
{ {
} }
inline void* zone::allocate_align(size_t size) inline void* zone::allocate_align(size_t size, size_t align)
{ {
return allocate_no_align( char* aligned =
((size)+((MSGPACK_ZONE_ALIGN)-1)) & ~((MSGPACK_ZONE_ALIGN)-1)); reinterpret_cast<char*>(
reinterpret_cast<size_t>(
(m_chunk_list.m_ptr + (align - 1))) / align * align);
size_t adjusted_size = size + (aligned - m_chunk_list.m_ptr);
if(m_chunk_list.m_free >= adjusted_size) {
m_chunk_list.m_free -= adjusted_size;
m_chunk_list.m_ptr += adjusted_size;
return aligned;
}
return reinterpret_cast<char*>(
reinterpret_cast<size_t>(
allocate_expand(size + (align - 1))) / align * align);
} }
inline void* zone::allocate_no_align(size_t size) inline void* zone::allocate_no_align(size_t size)

22
include/msgpack/zone.h
View File

@ -113,8 +113,25 @@ void* msgpack_zone_malloc_no_align(msgpack_zone* zone, size_t size)
static inline void* msgpack_zone_malloc(msgpack_zone* zone, size_t size) static inline void* msgpack_zone_malloc(msgpack_zone* zone, size_t size)
{ {
return msgpack_zone_malloc_no_align(zone, char* aligned =
((size)+((MSGPACK_ZONE_ALIGN)-1)) & ~((MSGPACK_ZONE_ALIGN)-1)); (char*)(
(size_t)(
zone->chunk_list.ptr + (MSGPACK_ZONE_ALIGN - 1)
) / MSGPACK_ZONE_ALIGN * MSGPACK_ZONE_ALIGN
);
size_t adjusted_size = size + (aligned - zone->chunk_list.ptr);
if(zone->chunk_list.free >= adjusted_size) {
zone->chunk_list.free -= adjusted_size;
zone->chunk_list.ptr += adjusted_size;
return aligned;
}
{
void* ptr = msgpack_zone_malloc_expand(zone, size + (MSGPACK_ZONE_ALIGN - 1));
if (ptr) {
return (char*)((size_t)(ptr) / MSGPACK_ZONE_ALIGN * MSGPACK_ZONE_ALIGN);
}
}
return NULL;
} }
@ -152,4 +169,3 @@ static inline void msgpack_zone_swap(msgpack_zone* a, msgpack_zone* b)
#endif #endif
#endif /* msgpack/zone.h */ #endif /* msgpack/zone.h */

25
test/zone.cpp
View File

@ -4,12 +4,28 @@
TEST(zone, allocate_align) TEST(zone, allocate_align)
{ {
msgpack::zone z; msgpack::zone z;
char* buf1 = (char*)z.allocate_align(4); char* start = (char*)z.allocate_align(1);
memcpy(buf1, "test", 4); EXPECT_EQ(reinterpret_cast<std::size_t>(start) % sizeof(int), 0);
char* buf2 = (char*)z.allocate_align(4); for (std::size_t s = 1; s < sizeof(int); ++s) {
memcpy(buf2, "test", 4); z.allocate_no_align(s);
char* buf_a = (char*)z.allocate_align(1);
EXPECT_EQ(0, reinterpret_cast<std::size_t>(buf_a) % sizeof(int));
}
} }
TEST(zone, allocate_align_custom)
{
msgpack::zone z;
for (std::size_t align = 1; align < 64; ++align) {
char* start = (char*)z.allocate_align(1, align);
EXPECT_EQ(reinterpret_cast<std::size_t>(start) % align, 0);
for (std::size_t s = 1; s < align; ++s) {
(char*)z.allocate_no_align(s);
char* buf_a = (char*)z.allocate_align(1, align);
EXPECT_EQ(0, reinterpret_cast<std::size_t>(buf_a) % align);
}
}
}
class myclass { class myclass {
public: public:
@ -75,4 +91,3 @@ TEST(zone, allocate_no_align)
char* buf2 = (char*)z.allocate_no_align(4); char* buf2 = (char*)z.allocate_no_align(4);
EXPECT_EQ(buf1+4, buf2); EXPECT_EQ(buf1+4, buf2);
} }