mirror of
https://github.com/cloudwu/skynet.git
synced 2026-07-24 20:23:06 +00:00
new socket service and socket lib instead of old connection, and rewrite redis lib
This commit is contained in:
云风
@@ -1,46 +1,15 @@
|
||||
local skynet = require "skynet"
|
||||
local socket = require "socket"
|
||||
|
||||
local function readline(sep)
|
||||
while true do
|
||||
local line = socket.readline(sep)
|
||||
if line then
|
||||
return line
|
||||
end
|
||||
coroutine.yield()
|
||||
end
|
||||
end
|
||||
|
||||
local function split_package()
|
||||
while true do
|
||||
local cmd = readline "\n"
|
||||
if cmd ~= "" then
|
||||
skynet.send(skynet.self(), "text", cmd)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local split_co = coroutine.create(split_package)
|
||||
|
||||
skynet.register_protocol {
|
||||
name = "client",
|
||||
id = 3,
|
||||
pack = function(...) return ... end,
|
||||
unpack = function(msg,sz)
|
||||
assert(msg , "Stdin closed")
|
||||
socket.push(msg,sz)
|
||||
assert(coroutine.resume(split_co))
|
||||
end,
|
||||
dispatch = function () end
|
||||
}
|
||||
|
||||
|
||||
skynet.start(function()
|
||||
skynet.dispatch("text", function (session, address, cmd)
|
||||
local handle = skynet.newservice(cmd)
|
||||
local stdin = socket.stdin()
|
||||
socket.lock(stdin)
|
||||
while true do
|
||||
local cmdline = socket.readline(stdin, "\n")
|
||||
local handle = skynet.newservice(cmdline)
|
||||
if handle == nil then
|
||||
print("Launch error:",cmd)
|
||||
print("Launch error:",cmdline)
|
||||
end
|
||||
end)
|
||||
socket.stdin()
|
||||
end
|
||||
socket.unlock(stdin)
|
||||
end)
|
||||
|
||||
@@ -2,8 +2,8 @@ local skynet = require "skynet"
|
||||
|
||||
skynet.start(function()
|
||||
print("Server start")
|
||||
skynet.launch("socket",128)
|
||||
local service = skynet.launch("snlua","service_mgr")
|
||||
local connection = skynet.launch("connection","256")
|
||||
local lualog = skynet.launch("snlua","lualog")
|
||||
local console = skynet.launch("snlua","console")
|
||||
local remoteroot = skynet.launch("snlua","remote_root")
|
||||
|
||||
@@ -1,242 +0,0 @@
|
||||
local skynet = require "skynet"
|
||||
local socket = require "socket"
|
||||
local int64 = require "int64"
|
||||
local string = string
|
||||
local table = table
|
||||
local tonumber = tonumber
|
||||
local ipairs = ipairs
|
||||
local unpack = unpack
|
||||
local batch_mode = {}
|
||||
local batch_count = {}
|
||||
local batch_reply = {}
|
||||
local redis_server, redis_db = ...
|
||||
|
||||
local function compose_message(msg)
|
||||
local lines = { "*" .. #msg }
|
||||
for _,v in ipairs(msg) do
|
||||
local t = type(v)
|
||||
if t == "number" then
|
||||
v = tostring(v)
|
||||
elseif t == "userdata" then
|
||||
v = int64.tostring(int64.new(v),10)
|
||||
end
|
||||
table.insert(lines,"$"..#v)
|
||||
table.insert(lines,v)
|
||||
end
|
||||
table.insert(lines,"")
|
||||
|
||||
local cmd = table.concat(lines,"\r\n")
|
||||
return cmd
|
||||
end
|
||||
|
||||
local function select_db(id)
|
||||
local result , ok = skynet.call(skynet.self(), "lua", "SELECT", tostring(id))
|
||||
assert(result and ok == "OK")
|
||||
end
|
||||
|
||||
local request_queue = { head = 1, tail = 1 }
|
||||
|
||||
local function push_request_queue(reply)
|
||||
request_queue[request_queue.tail] = reply
|
||||
request_queue.tail = request_queue.tail + 1
|
||||
end
|
||||
|
||||
local function pop_request_queue()
|
||||
assert(request_queue.head < request_queue.tail)
|
||||
local reply = request_queue[request_queue.head]
|
||||
request_queue[request_queue.head] = nil
|
||||
request_queue.head = request_queue.head + 1
|
||||
return reply
|
||||
end
|
||||
|
||||
local function batch_close(address,session)
|
||||
local reply = batch_reply[address]
|
||||
skynet.redirect(address,0, "response", session, skynet.pack(not (type(reply) == "string"), reply))
|
||||
batch_mode[address] = nil
|
||||
batch_count[address] = nil
|
||||
batch_reply[address] = nil
|
||||
end
|
||||
|
||||
local function batch_dec(address)
|
||||
local bc = batch_count[address]
|
||||
batch_count[address] = bc - 1
|
||||
if bc == 1 then
|
||||
local session = batch_mode[address]
|
||||
if type(session) == "number" then
|
||||
batch_close(address, session)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local function response(suc, value)
|
||||
local reply = pop_request_queue()
|
||||
local mode = reply.batch
|
||||
local address = reply.address
|
||||
if mode == "read" then
|
||||
if suc then
|
||||
local br = batch_reply[address]
|
||||
if type(br) == "table" then
|
||||
br.n = br.n + 1
|
||||
br[br.n] = value
|
||||
end
|
||||
else
|
||||
batch_reply[address] = value
|
||||
end
|
||||
batch_dec(address)
|
||||
elseif mode == "write" then
|
||||
if not suc then
|
||||
batch_reply[address] = value
|
||||
end
|
||||
batch_dec(address)
|
||||
else
|
||||
skynet.redirect(address,0, "response", reply.session, skynet.pack(suc, value))
|
||||
end
|
||||
end
|
||||
|
||||
local function readline(sep)
|
||||
while true do
|
||||
local line = socket.readline(sep)
|
||||
if line then
|
||||
return line
|
||||
end
|
||||
coroutine.yield()
|
||||
end
|
||||
end
|
||||
|
||||
local function readbytes(bytes)
|
||||
while true do
|
||||
local block = socket.read(bytes)
|
||||
if block then
|
||||
return block
|
||||
end
|
||||
coroutine.yield()
|
||||
end
|
||||
end
|
||||
|
||||
local redcmd = {}
|
||||
|
||||
redcmd[42] = function(data) -- '*'
|
||||
local n = tonumber(data)
|
||||
if n < 0 then
|
||||
response(true, nil)
|
||||
return
|
||||
end
|
||||
local bulk = {}
|
||||
for i = 1,n do
|
||||
local line = readline "\r\n"
|
||||
local bytes = tonumber(string.sub(line,2))
|
||||
if bytes < 0 then
|
||||
table.insert(bulk, nil)
|
||||
else
|
||||
local data = readbytes(bytes + 2)
|
||||
table.insert(bulk, string.sub(data,1,-3))
|
||||
end
|
||||
end
|
||||
response(true, bulk)
|
||||
end
|
||||
|
||||
redcmd[36] = function(data) -- '$'
|
||||
local bytes = tonumber(data)
|
||||
if bytes < 0 then
|
||||
response(true,nil)
|
||||
return
|
||||
end
|
||||
local firstline = readbytes(bytes+2)
|
||||
response(true,string.sub(firstline,1,-3))
|
||||
end
|
||||
|
||||
redcmd[43] = function(data) -- '+'
|
||||
response(true,data)
|
||||
end
|
||||
|
||||
redcmd[45] = function(data) -- '-'
|
||||
response(false,data)
|
||||
end
|
||||
|
||||
redcmd[58] = function(data) -- ':'
|
||||
-- todo: return string later
|
||||
response(true, tonumber(data))
|
||||
end
|
||||
|
||||
local function split_package()
|
||||
while true do
|
||||
local result = readline "\r\n"
|
||||
local firstchar = string.byte(result)
|
||||
local data = string.sub(result,2)
|
||||
local f = redcmd[firstchar]
|
||||
assert(f)
|
||||
f(data)
|
||||
end
|
||||
end
|
||||
|
||||
local function init()
|
||||
while socket.connect(redis_server) do
|
||||
skynet.sleep(1000)
|
||||
end
|
||||
if redis_db then
|
||||
select_db(redis_db)
|
||||
end
|
||||
end
|
||||
|
||||
local split_co = coroutine.create(split_package)
|
||||
|
||||
local function reconnect()
|
||||
init()
|
||||
for i = request_queue.head, request_queue.tail-1 do
|
||||
local request = request_queue[i]
|
||||
socket.write(request.cmd)
|
||||
end
|
||||
split_co = coroutine.create(split_package)
|
||||
end
|
||||
|
||||
skynet.register_protocol {
|
||||
name = "client",
|
||||
id = 3,
|
||||
pack = function(...) return ... end,
|
||||
unpack = function(msg,sz)
|
||||
if sz == 0 then
|
||||
skynet.timeout(0, reconnect)
|
||||
return
|
||||
end
|
||||
socket.push(msg,sz)
|
||||
assert(coroutine.resume(split_co))
|
||||
end,
|
||||
dispatch = function () end
|
||||
}
|
||||
|
||||
skynet.start(function()
|
||||
skynet.dispatch("text", function(session, address, mode)
|
||||
local last = batch_mode[address]
|
||||
if mode == "end" then
|
||||
assert(last == "read" or last == "write" , "Invalid end")
|
||||
if batch_count[address] == 0 then
|
||||
batch_close(address, session)
|
||||
else
|
||||
batch_mode[address] = session
|
||||
end
|
||||
else
|
||||
assert(last == nil, "Already in batch mode")
|
||||
if mode == "read" then
|
||||
batch_reply[address] = { n = 0 }
|
||||
batch_count[address] = 0
|
||||
elseif mode == "write" then
|
||||
batch_count[address] = 0
|
||||
else
|
||||
error ("Invalid last batch operation : " .. last)
|
||||
end
|
||||
batch_mode[address] = mode
|
||||
end
|
||||
end)
|
||||
skynet.dispatch("lua", function(session, address, ...)
|
||||
local message = { ... }
|
||||
local cmd = compose_message(message)
|
||||
socket.write(cmd)
|
||||
local mode = batch_mode[address]
|
||||
if mode == "read" or mode == "write" then
|
||||
batch_count[address] = batch_count[address] + 1
|
||||
end
|
||||
push_request_queue { session = session , address = address, cmd = cmd , batch = mode }
|
||||
end)
|
||||
init()
|
||||
end)
|
||||
|
||||
@@ -1,26 +0,0 @@
|
||||
local skynet = require "skynet"
|
||||
local log = require "log"
|
||||
local config = require "config"
|
||||
|
||||
local redis_conf = skynet.getenv "redis"
|
||||
local name = config (redis_conf)
|
||||
local connection = {}
|
||||
|
||||
skynet.start(function()
|
||||
skynet.dispatch("lua", function (session, from, dbname)
|
||||
if connection[dbname] then
|
||||
skynet.ret(skynet.pack(connection[dbname]))
|
||||
return
|
||||
end
|
||||
if name[dbname] == nil then
|
||||
log.Error("Invalid db name : "..dbname)
|
||||
skynet.ret(skynet.pack(nil))
|
||||
return
|
||||
end
|
||||
|
||||
local redis_cli = skynet.newservice("redis-cli", name[dbname])
|
||||
connection[dbname] = redis_cli
|
||||
skynet.ret(skynet.pack(redis_cli))
|
||||
end)
|
||||
end)
|
||||
|
||||
@@ -3,10 +3,11 @@ local redis = require "redis"
|
||||
|
||||
skynet.start(function()
|
||||
local db = redis.connect "main"
|
||||
print(db:select(0))
|
||||
db:batch "write" -- ignore results
|
||||
db:set("A", "hello")
|
||||
db:set("B", "world")
|
||||
db:batch "end"
|
||||
print(db:batch "end")
|
||||
|
||||
db:batch "read"
|
||||
db:get("A")
|
||||
@@ -19,6 +20,7 @@ skynet.start(function()
|
||||
print(db:get "A")
|
||||
print(db:set("A","hello world"))
|
||||
print(db:get("A"))
|
||||
db:disconnect()
|
||||
skynet.exit()
|
||||
end)
|
||||
|
||||
|
||||
Reference in New Issue
Block a user