fix tests, add core test for thread server

core-tests/src/server/server.cpp

@@ -163,6 +163,50 @@ TEST(server, process) {
     delete lock;
 }
 
+TEST(server, thread) {
+    Server serv(Server::MODE_THREAD);
+    serv.worker_num = 2;
+
+    sw_logger()->set_level(SW_LOG_WARNING);
+
+    ListenPort *port = serv.add_port(SW_SOCK_TCP, TEST_HOST, 0);
+    ASSERT_TRUE(port);
+
+    mutex lock;
+    lock.lock();
+
+    ASSERT_EQ(serv.create(), SW_OK);
+
+    std::thread t1([&]() {
+        swoole_signal_block_all();
+
+        lock.lock();
+
+        network::SyncClient c(SW_SOCK_TCP);
+        c.connect(TEST_HOST, port->port);
+        c.send(packet, strlen(packet));
+        char buf[1024];
+        c.recv(buf, sizeof(buf));
+        c.close();
+
+        serv.shutdown();
+    });
+
+    serv.onWorkerStart = [&lock](Server *serv, Worker *worker) { lock.unlock(); };
+
+    serv.onReceive = [](Server *serv, RecvData *req) -> int {
+        EXPECT_EQ(string(req->data, req->info.len), string(packet));
+
+        string resp = string("Server: ") + string(packet);
+        serv->send(req->info.fd, resp.c_str(), resp.length());
+
+        return SW_OK;
+    };
+
+    serv.start();
+    t1.join();
+}
+
 TEST(server, reload_all_workers) {
     Server serv(Server::MODE_PROCESS);
     serv.worker_num = 2;

src/protocol/message_bus.cc

@@ -289,7 +289,7 @@ size_t MessageBus::get_memory_size() {
 
 void MessageBus::init_pipe_socket(network::Socket *sock) {
     int pipe_fd = sock->get_fd();
-    if (pipe_fd >= pipe_sockets_.size()) {
+    if ((size_t) pipe_fd >= pipe_sockets_.size()) {
         pipe_sockets_.resize(pipe_fd + 1);
     }
     auto _socket = make_socket(pipe_fd, SW_FD_PIPE);

src/server/thread.cc

@@ -29,6 +29,7 @@ Factory *Server::create_thread_factory() {
     }
     reactor_threads = new ReactorThread[reactor_num]();
     reactor_pipe_num = 1;
+    worker_thread_start = [](const WorkerFn &fn) { fn(); };
     return new ThreadFactory(this);
 }