Merge branch 'master' of github.com:swoole/swoole-src

Author: matyhtf

core-tests/src/server/server.cpp

@@ -40,6 +40,38 @@ TEST(server, create_pipe_buffers) {
     }
 }
 
+TEST(server, schedule) {
+    int ret;
+    Server serv(Server::MODE_PROCESS);
+    serv.worker_num = 6;
+    serv.dispatch_mode = SW_DISPATCH_QUEUE;
+    ret = serv.create();
+    ASSERT_EQ(SW_OK, ret);
+
+    for (uint32_t i = 0; i < serv.worker_num; i++) {
+        serv.workers[i].status = SW_WORKER_BUSY;
+    }
+
+    std::set<int> _worker_id_set;
+
+    for (uint32_t i = 0; i < serv.worker_num; i++) {
+        auto worker_id = serv.schedule_worker(i*13, nullptr);
+        _worker_id_set.insert(worker_id);
+    }
+    ASSERT_EQ(_worker_id_set.size(), serv.worker_num);
+   
+    for (uint32_t i = 1; i < serv.worker_num - 1; i++) {
+        serv.workers[i].status = SW_WORKER_IDLE;
+    }
+
+    _worker_id_set.clear();
+    for (uint32_t i = 0; i < serv.worker_num; i++) {
+        auto worker_id = serv.schedule_worker(i*13, nullptr);
+        _worker_id_set.insert(worker_id);
+    }
+    ASSERT_EQ(_worker_id_set.size(), serv.worker_num - 2);
+}
+
 static const char *packet = "hello world\n";
 
 TEST(server, base) {

ext-src/swoole_runtime.cc

@@ -1860,6 +1860,11 @@ static void hook_func(const char *name, size_t l_name, zif_handler handler, zend
     if (zf == nullptr) {
         return;
     }
+#if PHP_VERSION_ID < 80000
+    if (zf->internal_function.handler == ZEND_FN(display_disabled_function)) {
+        return;
+    }
+#endif
 
     rf = (real_func *) emalloc(sizeof(real_func));
     sw_memset_zero(rf, sizeof(*rf));

include/swoole_process_pool.h

@@ -148,6 +148,18 @@ struct Worker {
     void *ptr2;
 
     ssize_t send_pipe_message(const void *buf, size_t n, int flags);
+
+    void set_status(enum swWorker_status _status) {
+        status = _status;
+    }
+
+    bool is_busy() {
+        return status == SW_WORKER_BUSY;
+    }
+
+    bool is_idle() {
+        return status == SW_WORKER_IDLE;
+    }
 };
 
 struct StreamInfo {