Comparison

util/timer.lua @ 7989:5632aa85e0b6

Merge 0.10->trunk
author Kim Alvefur <zash@zash.se>
date Mon, 20 Mar 2017 03:11:27 +0100
parent 7015:17e275e8bd79
parent 7988:dc758422d896
child 8555:4f0f5b49bb03
comparison
equal deleted inserted replaced
7986:522099269b49 7989:5632aa85e0b6
7 -- 7 --
8 8
9 local indexedbheap = require "util.indexedbheap"; 9 local indexedbheap = require "util.indexedbheap";
10 local log = require "util.logger".init("timer"); 10 local log = require "util.logger".init("timer");
11 local server = require "net.server"; 11 local server = require "net.server";
12 local get_time = require "socket".gettime; 12 local get_time = require "util.time".now
13 local type = type; 13 local type = type;
14 local debug_traceback = debug.traceback; 14 local debug_traceback = debug.traceback;
15 local tostring = tostring; 15 local tostring = tostring;
16 local xpcall = xpcall; 16 local xpcall = xpcall;
17 17