Skip to content

Fixes timer deviations #3796

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fixes timer deviations #3796

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions src/main/resources/assets/opencomputers/loot/network/data/bin/ping.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,14 @@ local stats = {
}

local function doSleep()

local epsilon = 1e-6
local deadline = computer.uptime() + (tonumber(options.i) or tonumber(options.interval) or 1)
repeat
event.pull(deadline - computer.uptime())
until computer.uptime() >= deadline
local remaining = deadline - computer.uptime()
if remaining <= epsilon then break end

event.pull(math.max(remaining, 0.001))
until computer.uptime() >= deadline - epsilon
end

local function doPing()
Expand Down
8 changes: 6 additions & 2 deletions src/main/resources/assets/opencomputers/loot/openos/boot/02_os.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,13 @@ end
function os.sleep(timeout)
checkArg(1, timeout, "number", "nil")
local deadline = computer.uptime() + (timeout or 0)
local epsilon = 1e-6
repeat
event.pull(deadline - computer.uptime())
until computer.uptime() >= deadline
local remaining = deadline - computer.uptime()
if remaining <= epsilon then break end

event.pull(math.max(remaining, 0.001))
until computer.uptime() >= deadline - epsilon
end

os.setenv("PATH", "/bin:/usr/bin:/home/bin:.")
Expand Down
Loading