diff options
| author | ruki <[email protected]> | 2020-01-31 23:47:32 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-01-31 16:45:13 +0800 |
| commit | 01af47d386620ef4f4401505d85a3f36fe8243c6 (patch) | |
| tree | 18ab8862d9f19d6d85cc7dc8d4635d3b0c45d651 | |
| parent | b1d0a3540bac162914f3fd77d2fc82b344125036 (diff) | |
add pipe.connect and named pipe tests
| -rw-r--r-- | core/src/xmake/io/pipe_connect.c | 59 | ||||
| -rw-r--r-- | core/src/xmake/machine.c | 2 | ||||
| -rw-r--r-- | core/src/xmake/makefile | 1 | ||||
| -rw-r--r-- | tests/modules/pipe/echo_client.lua | 15 | ||||
| -rw-r--r-- | tests/modules/pipe/echo_server.lua | 23 | ||||
| -rw-r--r-- | xmake/core/base/pipe.lua | 31 | ||||
| -rw-r--r-- | xmake/core/sandbox/modules/import/core/base/pipe.lua | 9 |
7 files changed, 140 insertions, 0 deletions
diff --git a/core/src/xmake/io/pipe_connect.c b/core/src/xmake/io/pipe_connect.c new file mode 100644 index 000000000..3c0fc58b5 --- /dev/null +++ b/core/src/xmake/io/pipe_connect.c @@ -0,0 +1,59 @@ +/*!A cross-platform build utility based on Lua + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * Copyright (C) 2015-2020, TBOOX Open Source Group. + * + * @author ruki + * @file pipe_connect.c + * + */ + +/* ////////////////////////////////////////////////////////////////////////////////////// + * trace + */ +#define TB_TRACE_MODULE_NAME "pipe_connect" +#define TB_TRACE_MODULE_DEBUG (0) + +/* ////////////////////////////////////////////////////////////////////////////////////// + * includes + */ +#include "prefix.h" + +/* ////////////////////////////////////////////////////////////////////////////////////// + * interfaces + */ + +// io.pipe_connect(pipefile) +tb_int_t xm_io_pipe_connect(lua_State* lua) +{ + // check + tb_assert_and_check_return_val(lua, 0); + + // check pipe + if (!lua_isuserdata(lua, 1)) + { + lua_pushnumber(lua, -1); + lua_pushliteral(lua, "invalid pipe!"); + return 2; + } + + // get pipe file + tb_pipe_file_ref_t pipefile = (tb_pipe_file_ref_t)lua_touserdata(lua, 1); + tb_check_return_val(pipefile, 0); + + // connect pipe + lua_pushnumber(lua, (tb_int_t)tb_pipe_file_connect(pipefile)); + return 1; +} + diff --git a/core/src/xmake/machine.c b/core/src/xmake/machine.c index d81044e0e..2bcafad54 100644 --- a/core/src/xmake/machine.c +++ b/core/src/xmake/machine.c @@ -131,6 +131,7 @@ tb_int_t xm_io_pipe_close(lua_State* lua); tb_int_t xm_io_pipe_read(lua_State* lua); tb_int_t xm_io_pipe_write(lua_State* lua); tb_int_t xm_io_pipe_wait(lua_State* lua); +tb_int_t xm_io_pipe_connect(lua_State* lua); // the io/poller functions tb_int_t xm_io_poller_insert(lua_State* lua); @@ -291,6 +292,7 @@ static luaL_Reg const g_io_functions[] = , { "pipe_read", xm_io_pipe_read } , { "pipe_write", xm_io_pipe_write } , { "pipe_wait", xm_io_pipe_wait } +, { "pipe_connect", xm_io_pipe_connect } , { "poller_insert", xm_io_poller_insert } , { "poller_modify", xm_io_poller_modify } , { "poller_remove", xm_io_poller_remove } diff --git a/core/src/xmake/makefile b/core/src/xmake/makefile index 3952f4b07..44105cd32 100644 --- a/core/src/xmake/makefile +++ b/core/src/xmake/makefile @@ -86,6 +86,7 @@ xmake_C_FILES += \ io/pipe_read \ io/pipe_write \ io/pipe_wait \ + io/pipe_connect \ path/relative \ path/absolute \ path/translate \ diff --git a/tests/modules/pipe/echo_client.lua b/tests/modules/pipe/echo_client.lua new file mode 100644 index 000000000..4061b08b6 --- /dev/null +++ b/tests/modules/pipe/echo_client.lua @@ -0,0 +1,15 @@ +import("core.base.pipe") + +function main(name) + local pipefile = pipe.open(name or "test", 'w') + local count = 0 + while count < 10000 do + local write = pipefile:write("hello world..", {block = true}) + if write <= 0 then + break + end + count = count + 1 + end + print("%s: write ok, count: %d!", pipefile, count) + pipefile:close() +end diff --git a/tests/modules/pipe/echo_server.lua b/tests/modules/pipe/echo_server.lua new file mode 100644 index 000000000..15f15291b --- /dev/null +++ b/tests/modules/pipe/echo_server.lua @@ -0,0 +1,23 @@ +import("core.base.pipe") + +function main(name) + + local pipefile = pipe.open(name or "test", 'r') + if pipefile:connect() > 0 then + print("%s: connected", pipefile) + local count = 0 + local result = nil + while count < 10000 do + local read, data = pipefile:read(13, {block = true}) + if read > 0 then + result = data + count = count + 1 + else + break + end + end + print("%s: read: %d, count: %d", pipefile, result and result:size() or 0, count) + result:dump() + end + pipefile:close() +end diff --git a/xmake/core/base/pipe.lua b/xmake/core/base/pipe.lua index d99b8bcb4..7a09a6d15 100644 --- a/xmake/core/base/pipe.lua +++ b/xmake/core/base/pipe.lua @@ -184,6 +184,37 @@ function _instance:read(size, opt) return read, data_or_errors end +-- connect pipe, only for named pipe (server-side) +function _instance:connect(opt) + + -- ensure opened + local ok, errors = self:_ensure_opened() + if not ok then + return -1, errors + end + + -- only for named pipe + if not self:name() then + return -1, string.format("%s: cannot connect to anonymous pipe!", self) + end + + -- connect it + local ok, errors = io.pipe_connect(self:cdata()) + if ok == 0 then + opt = opt or {} + local events, waiterrs = self:wait(pipe.EV_CONN, opt.timeout or -1) + if events == pipe.EV_CONN then + ok, errors = io.pipe_connect(self:cdata()) + else + errors = waiterrs + end + end + if ok < 0 and errors then + errors = string.format("%s: %s", self, errors) + end + return ok, errors +end + -- wait pipe events function _instance:wait(events, timeout) diff --git a/xmake/core/sandbox/modules/import/core/base/pipe.lua b/xmake/core/sandbox/modules/import/core/base/pipe.lua index f6f3fc5d6..cc026d8ef 100644 --- a/xmake/core/sandbox/modules/import/core/base/pipe.lua +++ b/xmake/core/sandbox/modules/import/core/base/pipe.lua @@ -59,6 +59,15 @@ function sandbox_core_base_pipe_instance.wait(pipefile, events, timeout) return events end +-- connect pipe, only for named pipe (server-side) +function sandbox_core_base_pipe_instance.connect(pipefile, opt) + local ok, errors = pipefile:_connect(opt) + if ok < 0 and errors then + raise(errors) + end + return ok +end + -- write data to pipe file function sandbox_core_base_pipe_instance.write(pipefile, data, opt) local real, errors = pipefile:_write(data, opt) |
