fix warning, optimize tests

matyhtf · matyhtf · commit cf8796655629 · 2021-03-03T13:10:52.000+08:00
diff --git a/core-tests/src/memory/global_memory.cpp b/core-tests/src/memory/global_memory.cpp
@@ -27,18 +27,23 @@ TEST(global_memory, alloc) {
     pool->free(ptr1);
     strcpy(ptr1, "hello, world, #1");
 
-    char *ptr2 = (char *) pool->alloc(12);
+    char *ptr2 = (char *) pool->alloc(17);
     strcpy(ptr2, "hello, world, #2");
-    char *ptr3 = (char *) pool->alloc(198);
+    pool->free(ptr2);
+
+    char *ptr3 = (char *) pool->alloc(113);
     strcpy(ptr3, "hello, world, #3");
 
     ASSERT_TRUE(ptr1);
     ASSERT_TRUE(ptr2);
     ASSERT_TRUE(ptr3);
 
-    delete pool;
+    ASSERT_GT(pool->capacity(), 2 * 1024 * 1024 - 512);
 
     ASSERT_STREQ(ptr1, "hello, world, #1");
     ASSERT_STREQ(ptr2, "hello, world, #2");
     ASSERT_STREQ(ptr3, "hello, world, #3");
+
+    pool->destroy();
+    delete pool;
 }
diff --git a/ext-src/swoole_redis_server.cc b/ext-src/swoole_redis_server.cc
@@ -35,7 +35,6 @@ zend_object_handlers swoole_redis_server_handlers;
 static std::unordered_map<std::string, zend_fcall_info_cache> redis_handlers;
 
 SW_EXTERN_C_BEGIN
-static PHP_METHOD(swoole_redis_server, start);
 static PHP_METHOD(swoole_redis_server, setHandler);
 static PHP_METHOD(swoole_redis_server, getHandler);
 static PHP_METHOD(swoole_redis_server, format);
diff --git a/include/swoole_memory.h b/include/swoole_memory.h
@@ -76,6 +76,7 @@ class GlobalMemory : public MemoryPool {
     void *alloc(uint32_t size);
     void free(void *ptr);
     void destroy();
+    size_t capacity();
 };
 }  // namespace swoole
 
diff --git a/src/memory/global_memory.cc b/src/memory/global_memory.cc
@@ -121,6 +121,10 @@ void GlobalMemory::destroy() {
     }
 }
 
+size_t GlobalMemory::capacity() {
+    return impl->pagesize - impl->alloc_offset;
+}
+
 GlobalMemory::~GlobalMemory() {
     delete impl;
 }

Original file line number	Diff line number	Diff line change
`@@ -121,6 +121,10 @@ void GlobalMemory::destroy() {`
`121`	`121`	`}`
`122`	`122`	`}`
`123`	`123`
	`124`	`+size_t GlobalMemory::capacity() {`
	`125`	`+ return impl->pagesize - impl->alloc_offset;`
	`126`	`+}`
	`127`	`+`
`124`	`128`	`GlobalMemory::~GlobalMemory() {`
`125`	`129`	`delete impl;`
`126`	`130`	`}`