lang/c/msgpack: C++ binding: enlarged chunk size of zone

git-svn-id: file:///Users/frsyuki/project/msgpack-git/svn/x@58 5a5092ae-2292-43ba-b2d5-dcab9c1a2731
This commit is contained in:
frsyuki
2009-02-15 09:09:56 +00:00
parent 94cbe54cf3
commit 97bc0441b1
4 changed files with 26 additions and 17 deletions

View File

@@ -5,10 +5,17 @@ namespace msgpack {
void* zone::alloc()
{
if(m_used >= m_pool.size()*MSGPACK_ZONE_CHUNK_SIZE) {
m_pool.push_back(new chunk_t());
if(m_pool.size()*ZONE_CHUNK_SIZE <= m_used) {
cell_t* chunk = (cell_t*)malloc(sizeof(cell_t)*ZONE_CHUNK_SIZE);
if(!chunk) { throw std::bad_alloc(); }
try {
m_pool.push_back(chunk);
} catch (...) {
free(chunk);
throw;
}
}
void* data = m_pool[m_used/MSGPACK_ZONE_CHUNK_SIZE]->cells[m_used%MSGPACK_ZONE_CHUNK_SIZE].data;
void* data = m_pool[m_used/ZONE_CHUNK_SIZE][m_used%ZONE_CHUNK_SIZE].data;
++m_used;
return data;
}
@@ -16,21 +23,21 @@ void* zone::alloc()
void zone::clear()
{
if(!m_pool.empty()) {
for(size_t b=0; b < m_used/MSGPACK_ZONE_CHUNK_SIZE; ++b) {
cell_t* c(m_pool[b]->cells);
for(size_t e=0; e < MSGPACK_ZONE_CHUNK_SIZE; ++e) {
for(size_t b=0; b < m_used/ZONE_CHUNK_SIZE; ++b) {
cell_t* c(m_pool[b]);
for(size_t e=0; e < ZONE_CHUNK_SIZE; ++e) {
reinterpret_cast<object_class*>(c[e].data)->~object_class();
}
}
cell_t* c(m_pool.back()->cells);
for(size_t e=0; e < m_used%MSGPACK_ZONE_CHUNK_SIZE; ++e) {
cell_t* c(m_pool.back());
for(size_t e=0; e < m_used%ZONE_CHUNK_SIZE; ++e) {
reinterpret_cast<object_class*>(c[e].data)->~object_class();
}
for(pool_t::iterator it(m_pool.begin()), it_end(m_pool.end());
it != it_end;
++it) {
delete *it;
free(*it);
}
m_pool.clear();
}