socket lock/unlock

lualib/socket.lua

@@ -88,7 +88,7 @@ socket_message[4] = function(id, newid, addr)
 		driver.close(newid)
 		return
 	end
-	skynet.fork(s.callback, newid, addr)
+	s.callback(newid, addr)
 end
 
 -- SKYNET_SOCKET_TYPE_ERROR = 5
@@ -231,10 +231,38 @@ function socket.listen(host,port,func)
 end
 
 function socket.lock(id)
+	local s = socket_pool[id]
+	assert(s)
+	local lock_set = s.lock
+	local co = coroutine.running()
+	if not lock_set then
+		lock_set = {}
+		s.lock = lock_set
+		lock_set[co] = true
+	elseif next(lock_set) == nil then
+		lock_set[co] = true
+	else
+		assert(lock_set[co] == nil)
+		lock_set[co] = true
+		skynet.wait()
+	end
 end
 
-function socket.unlock(fd)
+function socket.unlock(id)
-
+	local s = socket_pool[id]
+	assert(s)
+	local lock_set = s.lock
+	assert(lock_set)
+	local co = coroutine.running()
+	assert(lock_set[co])
+	lock_set[co] = nil
+	repeat
+		co = next(lock_set)
+		if co == nil then
+			break
+		end
+		lock_set[co] = nil
+	until skynet.wakeup(co)
 end
 
 return socket

service/testsocket.lua

@@ -1,8 +1,7 @@
 local skynet = require "skynet"
 local socket = require "socket"
 
-local function accepter(id, addr)
+local function accepter(id)
-	print("connect from " .. addr .. " " .. id)
 	socket.accept(id)
 	socket.write(id, "Hello Skynet\n")
 	while true do
@@ -18,5 +17,9 @@ local function accepter(id, addr)
 end
 
 skynet.start(function()
-	socket.listen("127.0.0.1", 8000, accepter)
+	socket.listen("127.0.0.1", 8000, function(id, addr)
+		print("connect from " .. addr .. " " .. id)
+		-- you can also call skynet.newservice for this socket id
+		skynet.fork(accepter, id)
+	end)
 end)