Merge branch 'main' into beta

symplely · Mar 10, 2023 · 793e808 · 793e808
2 parents 371d436 + b8384b7
commit 793e808
Show file tree

Hide file tree

Showing 13 changed files with 187 additions and 225 deletions.
diff --git a/headers/stubs/ze_ffi.stub.php b/headers/stubs/ze_ffi.stub.php
@@ -7,6 +7,10 @@ interface rsrc_dtor_func_t extends closure
 interface user_opcode_handler_t extends closure
 {
 }
+/** @var callable (zval *pElement) */
+interface copy_ctor_func_t extends closure
+{
+}
 /** @var callable (LPVOID lpParameter) */
 interface ThreadProc extends closure
 {
@@ -450,6 +454,15 @@ public function zend_hash_add_or_update(HashTable &$ht, zend_string &$key, zval
     /** @return zval */
     public function zend_hash_next_index_insert(HashTable &$ht, zval &$pData);
 
+    /** @return void */
+    public function zend_hash_copy(HashTable &$target, HashTable &$source, copy_ctor_func_t $pCopyConstructor);
+
+    /** @return void */
+    public function zend_hash_destroy(HashTable &$ht);
+
+    /** @return void */
+    public function zend_hash_clean(HashTable &$ht);
+
     /** @return zend_function */
     public function zend_fetch_function(zend_string &$name);
 

diff --git a/headers/ze81ts.h b/headers/ze81ts.h
@@ -1483,12 +1483,6 @@ void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_thread_begi
 void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread_end_handler);
 void *tsrm_set_shutdown_handler(tsrm_shutdown_func_t shutdown_handler);
 
-/* these 3 APIs should only be used by people that fully understand the threading model
- * used by PHP/Zend and the selected SAPI. */
-void *tsrm_new_interpreter_context(void);
-void *tsrm_set_interpreter_context(void *new_ctx);
-void tsrm_free_interpreter_context(void *context);
-
 void *tsrm_get_ls_cache(void);
 uint8_t tsrm_is_main_thread(void);
 uint8_t tsrm_is_shutdown(void);

diff --git a/headers/ze82ts.h b/headers/ze82ts.h
@@ -1502,12 +1502,6 @@ void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_thread_begi
 void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread_end_handler);
 void *tsrm_set_shutdown_handler(tsrm_shutdown_func_t shutdown_handler);
 
-/* these 3 APIs should only be used by people that fully understand the threading model
- * used by PHP/Zend and the selected SAPI. */
-void *tsrm_new_interpreter_context(void);
-void *tsrm_set_interpreter_context(void *new_ctx);
-void tsrm_free_interpreter_context(void *context);
-
 void *tsrm_get_ls_cache(void);
 uint8_t tsrm_is_main_thread(void);
 uint8_t tsrm_is_shutdown(void);

diff --git a/headers/ze83ts.h b/headers/ze83ts.h
@@ -1562,12 +1562,6 @@ void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_thread_begi
 void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread_end_handler);
 void *tsrm_set_shutdown_handler(tsrm_shutdown_func_t shutdown_handler);
 
-/* these 3 APIs should only be used by people that fully understand the threading model
- * used by PHP/Zend and the selected SAPI. */
-void *tsrm_new_interpreter_context(void);
-void *tsrm_set_interpreter_context(void *new_ctx);
-void tsrm_free_interpreter_context(void *context);
-
 void *tsrm_get_ls_cache(void);
 uint8_t tsrm_is_main_thread(void);
 uint8_t tsrm_is_shutdown(void);

diff --git a/headers/ze8ts.h b/headers/ze8ts.h
@@ -1304,12 +1304,6 @@ void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_thread_begi
 void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread_end_handler);
 void *tsrm_set_shutdown_handler(tsrm_shutdown_func_t shutdown_handler);
 
-/* these 3 APIs should only be used by people that fully understand the threading model
- * used by PHP/Zend and the selected SAPI. */
-void *tsrm_new_interpreter_context(void);
-void *tsrm_set_interpreter_context(void *new_ctx);
-void tsrm_free_interpreter_context(void *context);
-
 void *tsrm_get_ls_cache(void);
 uint8_t tsrm_is_main_thread(void);
 uint8_t tsrm_is_shutdown(void);

diff --git a/headers/zeWin81ts.h b/headers/zeWin81ts.h
@@ -1599,12 +1599,6 @@ void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_thread_begi
 void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread_end_handler);
 void *tsrm_set_shutdown_handler(tsrm_shutdown_func_t shutdown_handler);
 
-/* these 3 APIs should only be used by people that fully understand the threading model
- * used by PHP/Zend and the selected SAPI. */
-void *tsrm_new_interpreter_context(void);
-void *tsrm_set_interpreter_context(void *new_ctx);
-void tsrm_free_interpreter_context(void *context);
-
 void *tsrm_get_ls_cache(void);
 uint8_t tsrm_is_main_thread(void);
 uint8_t tsrm_is_shutdown(void);

diff --git a/headers/zeWin82ts.h b/headers/zeWin82ts.h
@@ -1618,12 +1618,6 @@ void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_thread_begi
 void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread_end_handler);
 void *tsrm_set_shutdown_handler(tsrm_shutdown_func_t shutdown_handler);
 
-/* these 3 APIs should only be used by people that fully understand the threading model
- * used by PHP/Zend and the selected SAPI. */
-void *tsrm_new_interpreter_context(void);
-void *tsrm_set_interpreter_context(void *new_ctx);
-void tsrm_free_interpreter_context(void *context);
-
 void *tsrm_get_ls_cache(void);
 uint8_t tsrm_is_main_thread(void);
 uint8_t tsrm_is_shutdown(void);

diff --git a/headers/zeWin83ts.h b/headers/zeWin83ts.h
@@ -1680,12 +1680,6 @@ void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_thread_begi
 void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread_end_handler);
 void *tsrm_set_shutdown_handler(tsrm_shutdown_func_t shutdown_handler);
 
-/* these 3 APIs should only be used by people that fully understand the threading model
- * used by PHP/Zend and the selected SAPI. */
-void *tsrm_new_interpreter_context(void);
-void *tsrm_set_interpreter_context(void *new_ctx);
-void tsrm_free_interpreter_context(void *context);
-
 void *tsrm_get_ls_cache(void);
 uint8_t tsrm_is_main_thread(void);
 uint8_t tsrm_is_shutdown(void);

diff --git a/headers/zeWin8ts.h b/headers/zeWin8ts.h
@@ -1420,12 +1420,6 @@ void *tsrm_set_new_thread_begin_handler(tsrm_thread_begin_func_t new_thread_begi
 void *tsrm_set_new_thread_end_handler(tsrm_thread_end_func_t new_thread_end_handler);
 void *tsrm_set_shutdown_handler(tsrm_shutdown_func_t shutdown_handler);
 
-/* these 3 APIs should only be used by people that fully understand the threading model
- * used by PHP/Zend and the selected SAPI. */
-void *tsrm_new_interpreter_context(void);
-void *tsrm_set_interpreter_context(void *new_ctx);
-void tsrm_free_interpreter_context(void *context);
-
 void *tsrm_get_ls_cache(void);
 uint8_t tsrm_is_main_thread(void);
 uint8_t tsrm_is_shutdown(void);

diff --git a/preload.php b/preload.php
@@ -780,54 +780,10 @@ function zend_preloader(): void
           }
 
           \setup_ffi_loader('ts', $header);
+          \tsrmls_cache_define();
         }
       }
     }
-
-    if (\PHP_ZTS)
-      \tsrmls_cache_define();
-  }
-
-  function tsrmls_cache_define()
-  {
-    if (\PHP_ZTS) {
-      global $_tsrm_ls_cache;
-      $_tsrm_ls_cache = null;
-    }
-  }
-
-  function tsrmls_cache_update()
-  {
-    if (\PHP_ZTS) {
-      global $_tsrm_ls_cache;
-      $_tsrm_ls_cache = \ze_ffi()->tsrm_get_ls_cache();
-    }
-  }
-
-  function tsrmls_cache(): ?CData
-  {
-    if (\PHP_ZTS) {
-      global $_tsrm_ls_cache;
-      return $_tsrm_ls_cache;
-    }
-
-    return null;
-  }
-
-  function tsrmls_activate()
-  {
-    if (\PHP_ZTS) {
-      \ze_ffi()->ts_resource_ex(0, null);
-      \tsrmls_cache_update();
-    }
-  }
-
-  function tsrmls_deactivate()
-  {
-    if (\PHP_ZTS) {
-      \ze_ffi()->ts_free_id(0);
-      \tsrmls_cache_define();
-    }
   }
 
   \ze_init();

diff --git a/test_thread.php b/test_thread.php
@@ -45,9 +45,8 @@ function main()
     $index = c_array_type('int', 'ts', MAX_THREADS);
     $status = 0;
     $arrLen = 0;
-    $i = 0;
 
-    $arrLen = ffi_sizeof($arrPaintings);
+    $arrLen = ffi_sizeof($arrPaintings) * \count($arrPaintings);
 
     srand(time());                  /* initialize random seed */
     for ($i = 0; $i < MAX_THREADS; $i++) {
@@ -59,6 +58,7 @@ function main()
             $t->addr_of($i),
             null,
             function (CData $arg) {
+                echo '---> ';
                 $arrPaintings = [
                     "The Last Supper", "Mona Lisa", "Potato Eaters",
                     "Cypresses", "Starry Night", "Water Lilies"

diff --git a/zend/Threading.php b/zend/Threading.php
@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use FFI\CData;
 use ZE\PThread;
 use ZE\Thread;
 
@@ -71,4 +72,167 @@ function pthread_init(): PThread
 
         return new PThread($module);
     }
+
+    function tsrmls_cache_define(): void
+    {
+        if (\PHP_ZTS) {
+            global $_tsrm_ls_cache;
+            $_tsrm_ls_cache[\ze_ffi()->tsrm_thread_id()] = null;
+        }
+    }
+
+    function tsrmls_cache_update(): void
+    {
+        if (\PHP_ZTS) {
+            global $_tsrm_ls_cache;
+            $_tsrm_ls_cache[\ze_ffi()->tsrm_thread_id()] = \ze_ffi()->tsrm_get_ls_cache();
+        }
+    }
+
+    function tsrmls_cache(): ?CData
+    {
+        if (\PHP_ZTS) {
+            global $_tsrm_ls_cache;
+            return $_tsrm_ls_cache[\ze_ffi()->tsrm_thread_id()];
+        }
+
+        return null;
+    }
+
+    function tsrmls_activate(): void
+    {
+        if (\PHP_ZTS) {
+            \ze_ffi()->ts_resource_ex(0, null);
+            \tsrmls_cache_update();
+        }
+    }
+
+    function tsrmls_deactivate(): void
+    {
+        if (\PHP_ZTS) {
+            \ze_ffi()->ts_free_id(0);
+            \tsrmls_cache_define();
+        }
+    }
+    /*
+static void php_thread_executor_globals_reinit(zend_executor_globals *dest,
+		zend_executor_globals *src)
+{
+	dest->current_module = src->current_module;
+}
+*/
+
+    /*
+static void php_thread_compiler_globals_reinit(zend_compiler_globals *dest,
+		zend_compiler_globals *src)
+{
+	zend_hash_clean(dest->function_table);
+	zend_hash_copy(dest->function_table, src->function_table,
+			(copy_ctor_func_t)function_add_ref, NULL,
+			sizeof(zend_function));
+	zend_hash_clean(dest->class_table);
+	zend_hash_copy(dest->class_table, src->class_table,
+			(copy_ctor_func_t)zend_class_add_ref, NULL,
+			sizeof(zend_class_entry*));
+}
+*/
+    function thread_startup($runtime) //: Thread
+    {
+        \ze_ffi()->ts_resource_ex(0, null);
+
+        if (\IS_WINDOWS) {
+            \tsrmls_cache_update();
+            \zend_pg('com_initialized', 0);
+        }
+
+        \zend_pg('in_error_log', 0);
+
+        \ze_ffi()->php_output_activate();
+
+        \zend_pg('modules_activated', 0);
+        \zend_pg('header_is_being_sent', 0);
+        \zend_pg('connection_status', 0);
+        \zend_pg('in_user_include', 0);
+
+        //\ze_ffi()->php_request_startup();
+
+        //    \zend_sg('server_context', $runtime()->parent->server);
+
+        \zend_pg('expose_php', 0);
+        \zend_pg('auto_globals_jit', 1);
+        if (\PHP_VERSION_ID >= 80100)
+            \zend_pg('enable_dl', true);
+        else
+            \zend_pg('enable_dl', 1);
+
+        \zend_pg('during_request_startup', 0);
+        \zend_sg('sapi_started', 0);
+        \zend_sg('headers_sent', 1);
+        \zend_sg('request_info')->no_headers = 1;
+
+        //  \ze_ffi()->tsrm_mutex_unlock($this->module_mutex);
+        // return $runtime;
+    }
+
+    function thread_shutdown()
+    {
+        /* Flush all output buffers */
+        \ze_ffi()->php_output_end_all();
+
+        /* Shutdown output layer (send the set HTTP headers, cleanup output handlers, etc.) */
+        \ze_ffi()->php_output_deactivate();
+
+        /* SAPI related shutdown (free stuff) */
+        \ze_ffi()->sapi_deactivate();
+
+        //  \ze_ffi()->php_request_shutdown(null);
+        //\zend_sg('server_context', NULL);
+
+        \ze_ffi()->sapi_shutdown();
+        \ze_ffi()->ts_free_thread();
+    }
+
+    function thread_func(CData $arg)
+    {
+        /** @var Thread|PThread */
+        $thread = \thread_startup(\zval_native_cast('zval*', $arg));
+
+        do {
+            /*
+                if (!$thread instanceof PThread) {
+                    $status = $thread->wait();
+                    if ($status != \ZE::SUCCESS) {
+                        break;
+                    }
+                }*/
+
+            while (!$thread->empty()) {
+                $thread->execute();
+            }
+            //	pthread_mutex_lock($thread->counter_mutex);
+            //        $thread->num_threads_working--;
+            //	if (!$thread>num_threads_working) {
+            //		pthread_cond_signal($thread->counter_all_idle);
+            //	}
+            //	pthread_mutex_unlock($thread->counter_mutex);
+        } while (true);
+
+        $exception = \zend_eg('exception');
+        if (\is_cdata($exception))
+            \ze_ffi()->zend_exception_error($exception, \E_ERROR);
+
+        \thread_shutdown();
+
+        return NULL;
+    }
+
+    /* Wait until all jobs have finished */
+    function thread_wait(Thread $pool)
+    {
+        //  pthread_mutex_lock($thpool_p->thcount_lock);
+        // while ($thpool_p->jobqueue->len || $thpool_p->num_threads_working) {
+        //       pthread_cond_wait($thpool_p->threads_all_idle, $thpool_p->thcount_lock);
+        //   }
+        //    pthread_mutex_unlock($thpool_p->thcount_lock);
+    }
 }