Software / code / prosody
Changeset
4808:07d0a3a75c8a
net.server, net.timer, net.server_select: Rearrange dependencies between these three modules. server.addtimer() is no longer a public function (renamed to _addtimer) and is not available at all from server_event (compat code removed to prevent traceback) (thanks Nulani)
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 03 May 2012 16:48:34 +0100 |
| parents | 4807:2999f0fd1347 |
| children | 4810:3bf0100d7303 |
| files | net/server.lua net/server_select.lua util/timer.lua |
| diffstat | 3 files changed, 9 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/net/server.lua Wed May 02 18:21:47 2012 +0100 +++ b/net/server.lua Thu May 03 16:48:34 2012 +0100 @@ -18,19 +18,8 @@ local server; if use_luaevent then - server = require "net.server_event"; - -- util.timer requires "net.server", so instead of having - -- Lua look for, and load us again (causing a loop) - set this here - -- (usually it isn't set until we return, look down there...) - package.loaded["net.server"] = server; - - -- Backwards compatibility for timers, addtimer - -- called a function roughly every second - local add_task = require "util.timer".add_task; - function server.addtimer(f) - return add_task(1, function (...) f(...); return 1; end); - end - + server = require "net.server_select"; + -- Overwrite signal.signal() because we need to ask libevent to -- handle them instead local ok, signal = pcall(require, "util.signal"); @@ -48,7 +37,6 @@ end else server = require "net.server_select"; - package.loaded["net.server"] = server; end -- require "net.server" shall now forever return this,
--- a/net/server_select.lua Wed May 02 18:21:47 2012 +0100 +++ b/net/server_select.lua Thu May 03 16:48:34 2012 +0100 @@ -75,7 +75,6 @@ local loop local stats local idfalse -local addtimer local closeall local addsocket local addserver @@ -921,6 +920,7 @@ ----------------------------------// PUBLIC INTERFACE //-- return { + _addtimer = addtimer, addclient = addclient, wrapclient = wrapclient, @@ -930,7 +930,6 @@ step = step, stats = stats, closeall = closeall, - addtimer = addtimer, addserver = addserver, getserver = getserver, setlogger = setlogger,
--- a/util/timer.lua Wed May 02 18:21:47 2012 +0100 +++ b/util/timer.lua Thu May 03 16:48:34 2012 +0100 @@ -6,11 +6,7 @@ -- COPYING file in the source package for more information. -- - -local ns_addtimer = require "net.server".addtimer; -local event = require "net.server".event; -local event_base = require "net.server".event_base; - +local server = require "net.server"; local math_min = math.min local math_huge = math.huge local get_time = require "socket".gettime; @@ -24,7 +20,7 @@ module "timer" local _add_task; -if not event then +if not server.event then function _add_task(delay, callback) local current_time = get_time(); delay = delay + current_time; @@ -38,7 +34,7 @@ end end - ns_addtimer(function() + server._addtimer(function() local current_time = get_time(); if #new_data > 0 then for _, d in pairs(new_data) do @@ -64,7 +60,10 @@ return next_time; end); else + local event = require "net.server".event; + local event_base = require "net.server".event_base; local EVENT_LEAVE = (event.core and event.core.LEAVE) or -1; + function _add_task(delay, callback) local event_handle; event_handle = event_base:addevent(nil, 0, function ()
