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
parent: 4751:0c7ae4bfc835
child: 4812:5bcdc384e485
--- 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 ()