Software / code / prosody
Changeset
8685:2548111e71d6
util.timer: Move sleep() here from util.async
This is to solve a indirect dependency issue where net.server was initialized before the config was read
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Fri, 23 Mar 2018 21:18:15 +0100 |
| parents | 8684:801f253ef52d |
| children | 8686:a0f728c3aa69 |
| files | util/async.lua util/timer.lua |
| diffstat | 2 files changed, 8 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/util/async.lua Fri Mar 23 20:57:34 2018 +0100 +++ b/util/async.lua Fri Mar 23 21:18:15 2018 +0100 @@ -1,6 +1,5 @@ local log = require "util.logger".init("util.async"); local new_id = require "util.id".short; -local timer = require "util.timer"; local function checkthread() local thread, main = coroutine.running(); @@ -226,16 +225,9 @@ return pcall(checkthread); end -local function sleep(s) - local wait, done = waiter(); - timer.add_task(s, done); - wait(); -end - return { ready = ready; waiter = waiter; guarder = guarder; runner = runner; - sleep = sleep; };
--- a/util/timer.lua Fri Mar 23 20:57:34 2018 +0100 +++ b/util/timer.lua Fri Mar 23 21:18:15 2018 +0100 @@ -10,6 +10,7 @@ local log = require "util.logger".init("timer"); local server = require "net.server"; local get_time = require "util.time".now +local async = require "util.async"; local type = type; local debug_traceback = debug.traceback; local tostring = tostring; @@ -102,9 +103,16 @@ return id; end +local function sleep(s) + local wait, done = async.waiter(); + add_task(s, done); + wait(); +end + return { add_task = add_task; stop = stop; reschedule = reschedule; + sleep = sleep; };
