增加一个测试

Author: actboy168

binding/lua_channel.cpp

@@ -19,46 +19,37 @@ namespace bee::lua_channel {
         using box = std::shared_ptr<channel>;
 
         bool init() noexcept {
-            if (!ev.open()) {
-                return false;
-            }
-            return true;
+            return ev.open();
         }
         net::fd_t fd() const noexcept {
             return ev.fd();
         }
-        void push(lua_State* L, int from) noexcept {
-            void* data = seri_pack(L, from, NULL);
+        void push(void* data) noexcept {
             std::unique_lock<spinlock> lk(mutex);
             queue.push(data);
             ev.set();
         }
-        int pop(lua_State* L) noexcept {
-            void* data;
-            {
-                std::unique_lock<spinlock> lk(mutex);
-                if (queue.empty()) {
-                    ev.clear();
-                    lua_pushboolean(L, 0);
-                    return 1;
-                }
-                data = queue.front();
-                queue.pop();
+        void* pop() noexcept {
+            std::unique_lock<spinlock> lk(mutex);
+            if (queue.empty()) {
+                ev.clear();
+                return nullptr;
             }
-            lua_pushboolean(L, 1);
-            return 1 + seri_unpackptr(L, data);
+            void* data = queue.front();
+            queue.pop();
+            if (queue.empty()) {
+                ev.clear();
+            }
+            return data;
         }
         void clear() noexcept {
             std::unique_lock<spinlock> lk(mutex);
-            for (;;) {
-                if (queue.empty()) {
-                    ev.clear();
-                    return;
-                }
+            while (!queue.empty()) {
                 void* data = queue.front();
                 free(data);
                 queue.pop();
             }
+            ev.clear();
         }
 
     private:
@@ -110,14 +101,21 @@ namespace bee::lua_channel {
     static channelmgr g_channel;
 
     static int lchannel_push(lua_State* L) {
-        auto& bc = lua::checkudata<channel::box>(L, 1);
-        bc->push(L, 1);
+        auto& bc   = lua::checkudata<channel::box>(L, 1);
+        void* data = seri_pack(L, 1, NULL);
+        bc->push(data);
         return 0;
     }
 
     static int lchannel_pop(lua_State* L) {
-        auto& bc = lua::checkudata<channel::box>(L, 1);
-        return bc->pop(L);
+        auto& bc   = lua::checkudata<channel::box>(L, 1);
+        void* data = bc->pop();
+        if (!data) {
+            lua_pushboolean(L, 0);
+            return 1;
+        }
+        lua_pushboolean(L, 1);
+        return 1 + seri_unpackptr(L, data);
     }
 
     static int lchannel_fd(lua_State* L) {

test/test_channel.lua

@@ -213,3 +213,57 @@ function test_channel:test_fd()
     channel.destroy "testRes"
     assertNotThreadError()
 end
+
+function test_channel:test_fd_2()
+    assertNotThreadError()
+    local req = channel.create "testReq"
+    local res = channel.create "testRes"
+    local thd = thread.create [[
+        local thread = require "bee.thread"
+        local channel = require "bee.channel"
+        local epoll = require "bee.epoll"
+        local req = channel.query "testReq"
+        local res = channel.query "testRes"
+        local function dispatch(ok, what, ...)
+            if not ok then
+                return 1
+            end
+            if what == "exit" then
+                return 0
+            end
+            res:push(what, ...)
+        end
+        while true do
+            local r = dispatch(req:pop())
+            thread.sleep(1)
+            if r == 0 then
+                return
+            elseif r == 1 then
+                thread.sleep(0)
+            end
+        end
+    ]]
+    local expected = {}
+    local epfd <close> = epoll.create(16)
+    epfd:event_add(res:fd(), epoll.EPOLLIN)
+    TestSuit(function (...)
+        req:push(...)
+        expected[#expected+1] = table.pack(true, ...)
+    end)
+    req:push "exit"
+    while #expected > 0 do
+        for _, event in epfd:wait() do
+            if event & (epoll.EPOLLERR | epoll.EPOLLHUP) ~= 0 then
+                lt.failure("unknown error")
+            end
+            if event & epoll.EPOLLIN ~= 0 then
+                local actual = table.pack(res:pop())
+                lt.assertEquals(actual, table.remove(expected, 1))
+            end
+        end
+    end
+    thread.wait(thd)
+    channel.destroy "testReq"
+    channel.destroy "testRes"
+    assertNotThreadError()
+end