net.server_select: Move code from :lock_read into :pause and :resume
authorKim Alvefur <zash@zash.se>
Sun, 28 Oct 2018 16:53:10 +0100
changeset 9579 913a17d6c449
parent 9578 1fb3e7c550bf
child 9580 388b93b3eecf
net.server_select: Move code from :lock_read into :pause and :resume
net/server_select.lua
--- a/net/server_select.lua	Sun Oct 28 16:51:58 2018 +0100
+++ b/net/server_select.lua	Sun Oct 28 16:53:10 2018 +0100
@@ -459,26 +459,28 @@
 	handler.lock_read = function (self, switch)
 		out_error( "server.lua, lock_read() is deprecated, use pause() and resume()" )
 		if switch == true then
-			local tmp = _readlistlen
-			_readlistlen = removesocket( _readlist, socket, _readlistlen )
-			_readtimes[ handler ] = nil
-			if _readlistlen ~= tmp then
-				noread = true
-			end
+			return self:pause()
 		elseif switch == false then
-			if noread then
-				noread = false
-				_readlistlen = addsocket(_readlist, socket, _readlistlen)
-				_readtimes[ handler ] = _currenttime
-			end
+			return self:resume()
 		end
 		return noread
 	end
 	handler.pause = function (self)
-		return self:lock_read(true);
+		local tmp = _readlistlen
+		_readlistlen = removesocket( _readlist, socket, _readlistlen )
+		_readtimes[ handler ] = nil
+		if _readlistlen ~= tmp then
+			noread = true
+		end
+		return noread;
 	end
 	handler.resume = function (self)
-		return self:lock_read(false);
+		if noread then
+			noread = false
+			_readlistlen = addsocket(_readlist, socket, _readlistlen)
+			_readtimes[ handler ] = _currenttime
+		end
+		return noread;
 	end
 	handler.lock = function( self, switch )
 		handler.lock_read (switch)