fix mem leaks

swoole · Mar 5, 2021 · d78ca8c · d78ca8c
1 parent b1f3569
commit d78ca8c
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 0 deletions.
diff --git a/ext-src/swoole_table.cc b/ext-src/swoole_table.cc
@@ -109,6 +109,10 @@ static void inline php_swoole_table_set_ptr(zval *zobject, Table *ptr) {
 }
 
 static inline void php_swoole_table_free_object(zend_object *object) {
+    Table *table = php_swoole_table_fetch_object(object)->ptr;
+    if (table) {
+        table->free();
+    }
     zend_object_std_dtor(object);
 }
 

diff --git a/include/swoole_table.h b/include/swoole_table.h
@@ -162,6 +162,9 @@ class Table {
     TableRow *get(const char *key, uint16_t keylen, TableRow **rowlock);
     bool del(const char *key, uint16_t keylen);
     void forward();
+    // only release local memory of the current process
+    void free();
+    // release shared memory
     void destroy();
 
     bool is_created() {

diff --git a/src/memory/table.cc b/src/memory/table.cc
@@ -57,6 +57,13 @@ Table *Table::make(uint32_t rows_size, float conflict_proportion) {
     return table;
 }
 
+void Table::free() {
+    delete mutex;
+    delete iterator;
+    delete column_map;
+    delete column_list;
+}
+
 bool Table::add_column(const std::string &_name, enum TableColumn::Type _type, size_t _size) {
     if (_type < TableColumn::TYPE_INT || _type > TableColumn::TYPE_STRING) {
         swWarn("unknown column type");