Optimize code

swoole · Sep 10, 2024 · 5f6d0e2 · 5f6d0e2
1 parent 5e226cd
commit 5f6d0e2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/ext-src/php_swoole_thread.h b/ext-src/php_swoole_thread.h
@@ -24,7 +24,7 @@
 #include "swoole_lock.h"
 
 typedef uint32_t ThreadResourceId;
-struct ThreadResource;
+class ThreadResource;
 struct ZendArray;
 
 extern zend_class_entry *swoole_thread_ce;
@@ -145,7 +145,8 @@ struct ArrayItem {
     }
 };
 
-struct ZendArray : ThreadResource {
+class ZendArray : public ThreadResource {
+ protected:
     swoole::RWLock lock_;
     zend_array ht;
 
@@ -154,6 +155,7 @@ struct ZendArray : ThreadResource {
         delete item;
     }
 
+ public:
     ZendArray() : ThreadResource(), lock_(0) {
         zend_hash_init(&ht, 0, NULL, item_dtor, 1);
     }

diff --git a/ext-src/swoole_coroutine.cc b/ext-src/swoole_coroutine.cc
@@ -226,14 +226,6 @@ static int coro_exit_handler(zend_execute_data *execute_data) {
 #else
 extern ZEND_FUNCTION(exit);
 PHP_FUNCTION(swoole_exit) {
-    zend_string *message = NULL;
-    zend_long status = 0;
-
-    ZEND_PARSE_PARAMETERS_START(0, 1)
-    Z_PARAM_OPTIONAL
-    Z_PARAM_STR_OR_LONG(message, status)
-    ZEND_PARSE_PARAMETERS_END();
-
     zend_long flags = 0;
     if (Coroutine::get_current()) {
         flags |= SW_EXIT_IN_COROUTINE;
@@ -244,6 +236,14 @@ PHP_FUNCTION(swoole_exit) {
     }
 
     if (flags) {
+        zend_string *message = NULL;
+        zend_long status = 0;
+
+        ZEND_PARSE_PARAMETERS_START(0, 1)
+        Z_PARAM_OPTIONAL
+        Z_PARAM_STR_OR_LONG(message, status)
+        ZEND_PARSE_PARAMETERS_END();
+
         zval ex = {};
         zend_object *obj = zend_throw_exception(swoole_exit_exception_ce, (message ? ZSTR_VAL(message) : "swoole exit"), 0);
         ZVAL_OBJ(&ex, obj);