optimize code, --filter=[unit]

swoole · Sep 26, 2024 · 17a8a8f · 17a8a8f
1 parent c26f064
commit 17a8a8f
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/ext-src/php_swoole_cxx.h b/ext-src/php_swoole_cxx.h
@@ -709,11 +709,11 @@ static inline void print_error(zend_object *exception, int severity) {
 }  // namespace zend
 
 /* use void* to match some C callback function pointers */
-static sw_inline void sw_callable_free(void *fci_cache) {
-    delete (zend::Callable *) fci_cache;
+static inline void sw_callable_free(void *ptr) {
+    delete (zend::Callable *) ptr;
 }
 
-static zend::Callable *sw_callable_create(zval *zfn) {
+static inline zend::Callable *sw_callable_create(zval *zfn) {
     auto fn = new zend::Callable(zfn);
     if (fn->ready()) {
         return fn;
@@ -722,8 +722,3 @@ static zend::Callable *sw_callable_create(zval *zfn) {
         return nullptr;
     }
 }
-
-static inline void php_swoole_callable_free(void *ptr) {
-    zend::Callable *cb = (zend::Callable *) ptr;
-    delete cb;
-}
diff --git a/ext-src/swoole_event.cc b/ext-src/swoole_event.cc
@@ -543,13 +543,13 @@ static PHP_FUNCTION(swoole_event_set) {
     auto writable_callback = sw_callable_create(zwritable_callback);
     if (readable_callback) {
         if (peo->readable_callback) {
-            swoole_event_defer(php_swoole_callable_free, peo->readable_callback);
+            swoole_event_defer(sw_callable_free, peo->readable_callback);
         }
         peo->readable_callback = readable_callback;
     }
     if (writable_callback) {
         if (peo->writable_callback) {
-            swoole_event_defer(php_swoole_callable_free, peo->writable_callback);
+            swoole_event_defer(sw_callable_free, peo->writable_callback);
         }
         peo->writable_callback = writable_callback;
     }
@@ -633,7 +633,7 @@ static PHP_FUNCTION(swoole_event_cycle) {
         if (sw_reactor()->idle_task.callback == nullptr) {
             RETURN_FALSE;
         } else {
-            swoole_event_defer(php_swoole_callable_free, sw_reactor()->idle_task.data);
+            swoole_event_defer(sw_callable_free, sw_reactor()->idle_task.data);
             sw_reactor()->idle_task.callback = nullptr;
             sw_reactor()->idle_task.data = nullptr;
             RETURN_TRUE;
@@ -642,14 +642,14 @@ static PHP_FUNCTION(swoole_event_cycle) {
 
     if (!before) {
         if (sw_reactor()->idle_task.data != nullptr) {
-            swoole_event_defer(php_swoole_callable_free, sw_reactor()->idle_task.data);
+            swoole_event_defer(sw_callable_free, sw_reactor()->idle_task.data);
         }
 
         sw_reactor()->idle_task.callback = event_end_callback;
         sw_reactor()->idle_task.data = callback;
     } else {
         if (sw_reactor()->future_task.data != nullptr) {
-            swoole_event_defer(php_swoole_callable_free, sw_reactor()->future_task.data);
+            swoole_event_defer(sw_callable_free, sw_reactor()->future_task.data);
         }
 
         sw_reactor()->future_task.callback = event_end_callback;