improvement dbuf pool's performance; add dbuf_pool sample

Author: zhengshuxin

lib_acl/include/stdlib/acl_dbuf_pool.h

@@ -9,7 +9,7 @@ typedef struct ACL_DBUF_POOL ACL_DBUF_POOL;
 
 /* public */
 ACL_API ACL_DBUF_POOL *acl_dbuf_pool_create(size_t block_size);
-ACL_API void acl_dbuf_pool_reset(ACL_DBUF_POOL *pool);
+ACL_API void acl_dbuf_pool_reset(ACL_DBUF_POOL *pool, size_t off);
 ACL_API void acl_dbuf_pool_destroy(ACL_DBUF_POOL *pool);
 ACL_API void *acl_dbuf_pool_alloc(ACL_DBUF_POOL *pool, size_t length);
 ACL_API void *acl_dbuf_pool_calloc(ACL_DBUF_POOL *pool, size_t length);

lib_acl/src/json/acl_json.c

@@ -443,7 +443,7 @@ void acl_json_reset(ACL_JSON *json)
 	acl_dbuf_pool_destroy(json->dbuf);
 	json->dbuf = acl_dbuf_pool_create(81920);
 #else
-	acl_dbuf_pool_reset(json->dbuf);
+	acl_dbuf_pool_reset(json->dbuf, 0);
 #endif
 
 	json->root = acl_json_node_alloc(json);

lib_acl/src/stdlib/memory/acl_dbuf_pool.c

@@ -10,6 +10,7 @@
 #include <stdio.h>
 #include "stdlib/acl_sys_patch.h"
 #include "stdlib/acl_mymalloc.h"
+#include "stdlib/acl_msg.h"
 #include "stdlib/acl_dbuf_pool.h"
 
 #endif
@@ -88,7 +89,7 @@ void acl_dbuf_pool_destroy(ACL_DBUF_POOL *pool)
 #endif
 }
 
-void acl_dbuf_pool_reset(ACL_DBUF_POOL *pool)
+void acl_dbuf_pool_reset(ACL_DBUF_POOL *pool, size_t off)
 {
 	ACL_DBUF *iter = pool->head, *tmp;
 
@@ -105,7 +106,13 @@ void acl_dbuf_pool_reset(ACL_DBUF_POOL *pool)
 	}
 	pool->head = (ACL_DBUF*) pool->buf_addr;
 	pool->head->next = NULL;
-	pool->head->ptr = pool->head->buf_addr;
+
+	if (pool->head->buf_addr + off >= (char*) pool + pool->block_size)
+		acl_msg_fatal("%s(%d) off(%ld) too big, should < %ld",
+			__FUNCTION__, __LINE__, (long) off, (char*) pool
+			+ pool->block_size - pool->head->buf_addr);
+
+	pool->head->ptr = pool->head->buf_addr + off;
 }
 
 static ACL_DBUF *acl_dbuf_alloc(ACL_DBUF_POOL *pool, size_t length)

lib_acl_cpp/changes.txt

@@ -3,6 +3,7 @@
 ------------------------------------------------------------------------
 329) 2015.7.21
 329.1) feature: db ģ��IJ�ѯ�� query ������ double/float ����
+329.2) perfomance: dbuf_pool �����Ҳ�������ڴ���ϣ��Ӷ��ٴμ��� malloc/free ����
 
 328) 2015.7.19
 328.1) bugfix: redis_command.cpp �е� run(redis_client_cluster*, size_t) ����

lib_acl_cpp/include/acl_cpp/stdlib/dbuf_pool.hpp

@@ -14,9 +14,16 @@ namespace acl
 class ACL_CPP_API dbuf_pool
 {
 public:
-	dbuf_pool(size_t block_size = 8192);
+	dbuf_pool();
 	~dbuf_pool();
 
+	/**
+	 * 重载了 new/delete 操作符，在 new dbuf_pool 对象时，使之创建在内存池上，
+	 * 从而减少了 malloc/free 的次数
+	 */
+	void *operator new(size_t size);
+	void operator delete(void* ptr);
+
 	/**
 	 * 重置内存池的状态以便于重复使用该内存池对象
 	 */
@@ -55,6 +62,7 @@ class ACL_CPP_API dbuf_pool
 
 private:
 	ACL_DBUF_POOL* pool_;
+	size_t mysize_;
 };
 
 } // namespace acl

lib_acl_cpp/samples/dbuf/Makefile

@@ -0,0 +1,4 @@
+UTIL = $(wildcard ../*.cpp)
+PROG = dbuf
+include ../Makefile.in
+CFLAGS += -I../

lib_acl_cpp/samples/dbuf/main.cpp

@@ -0,0 +1,93 @@
+// xml.cpp : 定义控制台应用程序的入口点。
+//
+#include "stdafx.h"
+#include <sys/time.h>
+#include "util.h"
+
+class test_buf
+{
+public:
+	test_buf(acl::dbuf_pool* pool)
+		: pool_(pool)
+	{
+	}
+
+	~test_buf()
+	{
+	}
+
+	void *operator new(size_t size, acl::dbuf_pool* pool)
+	{
+		return pool->dbuf_alloc(size);
+	}
+
+	static void operator delete(void*)
+	{
+	}
+
+private:
+	acl::dbuf_pool* pool_;
+};
+
+static void usage(const char* procname)
+{
+	printf("usage: %s -h [help] -n loop -c count -p [use memory pool]\r\n", procname);
+}
+
+int main(int argc, char* argv[])
+{
+	bool use_pool = false;
+	int  ch, n = 100, c = 10000;
+
+	while ((ch = getopt(argc, argv, "hpn:c:")) > 0)
+	{
+		switch (ch)
+		{
+		case 'h':
+			usage(argv[0]);
+			return 0;
+		case 'p':
+			use_pool = true;
+			break;
+		case 'n':
+			n = atoi(optarg);
+			break;
+		case 'c':
+			c = atoi(optarg);
+			break;
+		default:
+			break;
+		}
+	}
+
+	if (use_pool)
+	{
+		acl::dbuf_pool* pool = new acl::dbuf_pool;
+		for (int i = 0; i < n; i++)
+		{
+			for (int j = 0; j < c; j++)
+			{
+				test_buf* buf = new (pool) test_buf(pool);
+				delete buf;
+			}
+
+			pool->dbuf_reset();
+		}
+		delete pool;
+	}
+	else
+	{
+		for (int i = 0; i < n; i++)
+		{
+			for (int j = 0; j < c; j++)
+			{
+				test_buf* buf = (test_buf*) malloc(sizeof(test_buf));
+				free(buf);
+			}
+		}
+	}
+
+	printf("total: %d\r\n", n * c);
+
+	return 0;
+}

lib_acl_cpp/samples/dbuf/stdafx.cpp

@@ -0,0 +1,8 @@
+// stdafx.cpp : 只包括标准包含文件的源文件
+// xml.pch 将成为预编译头
+// stdafx.obj 将包含预编译类型信息
+
+#include "stdafx.h"
+
+// TODO: 在 STDAFX.H 中
+//引用任何所需的附加头文件，而不是在此文件中引用

lib_acl_cpp/samples/dbuf/stdafx.h

@@ -0,0 +1,13 @@
+// stdafx.h : 标准系统包含文件的包含文件，
+// 或是常用但不常更改的项目特定的包含文件
+//
+
+#pragma once
+
+//
+//#include <iostream>
+//#include <tchar.h>
+
+// TODO: 在此处引用程序要求的附加头文件
+#include "acl_cpp/lib_acl.hpp"
+#include "lib_acl.h"

lib_acl_cpp/samples/dbuf/valgrind.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+valgrind --tool=memcheck --leak-check=yes  -v ./dbuf -p

lib_acl_cpp/src/redis/redis_command.cpp

@@ -32,7 +32,7 @@ redis_command::redis_command()
 , slice_res_(false)
 , result_(NULL)
 {
-	pool_ = NEW dbuf_pool(128000);
+	pool_ = new dbuf_pool();
 	addr_[0] = 0;
 }
 
@@ -54,7 +54,7 @@ redis_command::redis_command(redis_client* conn)
 , slice_res_(false)
 , result_(NULL)
 {
-	pool_ = NEW dbuf_pool(128000);
+	pool_ = new dbuf_pool();
 	if (conn != NULL)
 		set_client_addr(*conn);
 	else
@@ -76,7 +76,7 @@ redis_command::redis_command(redis_client_cluster* cluster, size_t max_conns)
 , slice_res_(false)
 , result_(NULL)
 {
-	pool_ = NEW dbuf_pool(128000);
+	pool_ = new dbuf_pool();
 	addr_[0] = 0;
 
 	if (cluster != NULL)

lib_acl_cpp/src/stdlib/dbuf_pool.cpp

@@ -4,19 +4,32 @@
 namespace acl
 {
 
-dbuf_pool::dbuf_pool(size_t block_size /* = 8192 */)
+dbuf_pool::dbuf_pool()
 {
-	pool_ = acl_dbuf_pool_create(block_size);
 }
 
 dbuf_pool::~dbuf_pool()
 {
-	acl_dbuf_pool_destroy(pool_);
+}
+
+void *dbuf_pool::operator new(size_t size)
+{
+	ACL_DBUF_POOL* pool = acl_dbuf_pool_create(8192);
+	dbuf_pool* dbuf = (dbuf_pool*) acl_dbuf_pool_alloc(pool, size);
+	dbuf->pool_ = pool;
+	dbuf->mysize_ = size;
+	return dbuf;
+}
+
+void dbuf_pool::operator delete(void* ptr)
+{
+	dbuf_pool* dbuf = (dbuf_pool*) ptr;
+	acl_dbuf_pool_destroy(dbuf->pool_);
 }
 
 void dbuf_pool::dbuf_reset()
 {
-	acl_dbuf_pool_reset(pool_);
+	acl_dbuf_pool_reset(pool_, mysize_);
 }
 
 void* dbuf_pool::dbuf_alloc(size_t len)