aboutsummaryrefslogtreecommitdiffstats
path: root/luaevent/test
diff options
context:
space:
mode:
Diffstat (limited to 'luaevent/test')
-rw-r--r--luaevent/test/test.lua34
-rw-r--r--luaevent/test/testClient.lua38
2 files changed, 36 insertions, 36 deletions
diff --git a/luaevent/test/test.lua b/luaevent/test/test.lua
index fd9919d..412857e 100644
--- a/luaevent/test/test.lua
+++ b/luaevent/test/test.lua
@@ -5,20 +5,30 @@
require"luaevent"
require"socket"
-local function echoHandler(skt)
- while true do
- local data,ret = luaevent.receive(skt, 10)
- if data == "quit" or ret == 'closed' or not data then
- break
- end
- --collectgarbage()
- if not luaevent.send(skt, data) then return end
- end
- if skt then skt:close() end
+local oldPrint = print
+print = function(...)
+ oldPrint("SRV", ...)
end
+local function echoHandler(skt)
+ while true do
+ local data,ret = luaevent.receive(skt, 10)
+ --print("GOT: ", data, ret)
+ if data == "quit" or ret == 'closed' then
+ break
+ end
+ luaevent.send(skt, data)
+ collectgarbage()
+ end
+ skt:close()
+ --print("DONE")
+end
local server = assert(socket.bind("localhost", 20000))
server:settimeout(0)
-
+local coro = coroutine.create
+coroutine.create = function(...)
+ local ret = coro(...)
+ return ret
+end
luaevent.addserver(server, echoHandler)
-luaevent.loop() \ No newline at end of file
+luaevent.loop()
diff --git a/luaevent/test/testClient.lua b/luaevent/test/testClient.lua
index 8d14887..fbbcf87 100644
--- a/luaevent/test/testClient.lua
+++ b/luaevent/test/testClient.lua
@@ -1,29 +1,19 @@
require"luaevent"
require"socket"
-local function setupHook(thread)
- if not thread then debug.sethook(function(event) print("TRACE >: ", debug.getinfo(2, 'n').name) end, 'c')
- else debug.sethook(thread, function(event) print("TRACE ", thread,">: ", debug.getinfo(2, 'n').name) end, 'c') end
+local oldPrint = print
+print = function(...)
+ oldPrint("CLT", ...)
end
-local count = 100
-local function func(sock)
+
+local function func()
+ print("ACTIVATED")
+ local sock = socket.tcp()
+ --sock:
sock = luaevent.wrap(sock)
- assert(sock:connect("localhost", 20000))
- for i = 1, 2 do
- local maxZ = 10
- for z = 1, maxZ do
- assert(sock:send("Greet me "))
- end
- assert(sock:receive(10 * maxZ))
- end
- if skt then skt:close() end
- count = count - 1
- if count > 0 then
- --local sock = assert(socket.tcp())
- --luaevent.addthread(sock, func, sock)
- end
+ print(assert(sock:connect("localhost", 20000)))
+ for i = 1, 100 do assert(sock:send("Greet me ")) assert(sock:receive(10)) collectgarbage() end
end
-for i = 1, 500 do
- local sock = assert(socket.tcp())
- luaevent.addthread(sock, func, sock)
-end
-luaevent.loop()
+
+luaevent.addthread(func)
+
+luaevent.loop() \ No newline at end of file