lang/c/msgpack: optimize zone::alloc()

git-svn-id: file:///Users/frsyuki/project/msgpack-git/svn/x@61 5a5092ae-2292-43ba-b2d5-dcab9c1a2731

cpp/object.hpp

@@ -88,9 +88,9 @@ struct object_class {
 	virtual const array& xarray() const { throw cast_error(); }
 	virtual const map&   xmap  () const { throw cast_error(); }
 	virtual bool operator== (const object_class* x) const { return false; }
-	bool operator!= (const object_class* x) const { return !(this->operator==(x)); }
 	virtual bool operator<  (const object_class* x) const { throw cast_error(); }
 	virtual bool operator>  (const object_class* x) const { throw cast_error(); }
+	bool operator!= (const object_class* x) const { return !(this->operator==(x)); }
 	virtual void pack(dynamic_packer& p) const = 0;
 	operator     bool() const { return   xbool(); } // FIXME !isnil();
 	operator  uint8_t() const { return     xu8(); }
@@ -163,9 +163,9 @@ struct object {
 	operator    raw() { return val->operator raw();    }
 	operator array&() { return val->operator array&(); }
 	operator   map&() { return val->operator map&();   }
-	operator    raw() const { return val->operator raw();    }
+	operator    const_raw() const { return val->operator const_raw();    }
-	operator array&() const { return val->operator array&(); }
+	operator const array&() const { return val->operator const array&(); }
-	operator   map&() const { return val->operator map&();   }
+	operator const   map&() const { return val->operator const map&();   }
 	const object& inspect(std::ostream& s) const
 		{ val->inspect(s); return *this; }
 private:

cpp/unpack.cpp

@@ -21,6 +21,7 @@
 
 namespace msgpack {
 
+
 struct unpacker::context {
 	context(zone* z)
 	{
@@ -98,11 +99,13 @@ void unpacker::expand_buffer(size_t len)
 		else { next_size = UNPACKER_INITIAL_BUFFER_SIZE; }
 		while(next_size < len + m_used) { next_size *= 2; }
 
-		// FIXME realloc?
+		void* tmp = realloc(m_buffer, next_size);
-		void* tmp = malloc(next_size);
 		if(!tmp) { throw std::bad_alloc(); }
-		memcpy(tmp, m_buffer, m_used);
+		m_buffer = tmp;
-		free(m_buffer);
+		//void* tmp = malloc(next_size);
+		//if(!tmp) { throw std::bad_alloc(); }
+		//memcpy(tmp, m_buffer, m_used);
+		//free(m_buffer);
 
 		m_buffer = tmp;
 		m_free = next_size - m_used;

cpp/zone.cpp

@@ -20,9 +20,10 @@
 namespace msgpack {
 
 
-void* zone::alloc()
+// FIXME custom allocator?
+
+void zone::expand_chunk()
 {
-	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 {
@@ -32,22 +33,20 @@ void* zone::alloc()
 		throw;
 	}
 }
-	void* data = m_pool[m_used/ZONE_CHUNK_SIZE][m_used%ZONE_CHUNK_SIZE].data;
-	++m_used;
-	return data;
-}
 
 void zone::clear()
 {
 	if(!m_pool.empty()) {
-		for(size_t b=0; b < m_used/ZONE_CHUNK_SIZE; ++b) {
+		size_t base_size = m_used / ZONE_CHUNK_SIZE;
+		size_t extend_size = m_used % ZONE_CHUNK_SIZE;
+		for(size_t b=0; b < base_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());
-		for(size_t e=0; e < m_used%ZONE_CHUNK_SIZE; ++e) {
+		for(size_t e=0; e < extend_size; ++e) {
 			reinterpret_cast<object_class*>(c[e].data)->~object_class();
 		}
 
@@ -60,7 +59,8 @@ void zone::clear()
 	}
 	m_used = 0;
 
-	for(user_finalizer_t::reverse_iterator it(m_user_finalizer.rbegin()), it_end(m_user_finalizer.rend());
+	for(user_finalizer_t::reverse_iterator it(m_user_finalizer.rbegin()),
+					it_end(m_user_finalizer.rend());
 			it != it_end;
 			++it) {
 		it->call();

cpp/zone.hpp.erb

@@ -25,7 +25,7 @@
 #include <stdexcept>
 
 #ifndef MSGPACK_ZONE_CHUNK_SIZE
-#define MSGPACK_ZONE_CHUNK_SIZE 8*1024
+#define MSGPACK_ZONE_CHUNK_SIZE 1024
 #endif
 
 namespace msgpack {
@@ -149,7 +149,7 @@ private:
 	user_finalizer_t m_user_finalizer;
 
 private:
-	void resize_pool(size_t n);
+	void expand_chunk();
 
 public:
 	static void finalize_free(void* obj, void* user)
@@ -173,6 +173,16 @@ inline bool zone::empty() const
 	return m_used == 0 && m_user_finalizer.empty();
 }
 
+inline void* zone::alloc()
+{
+	if(m_pool.size() <= m_used/ZONE_CHUNK_SIZE) {
+		expand_chunk();
+	}
+	void* data = m_pool[m_used/ZONE_CHUNK_SIZE][m_used%ZONE_CHUNK_SIZE].data;
+	++m_used;
+	return data;
+}
+
 
 }  // namespace msgpack