make sleep work
This commit is contained in:
@@ -33,7 +33,6 @@ function kernel.log(msg, level)
|
|||||||
kernel.currentTask=kernel.kernelTask
|
kernel.currentTask=kernel.kernelTask
|
||||||
kernel.tty.print(tostring(computer:time()).." "..kernel.user.." "..kernel.process.."["..tostring(level or "INFO").."]: "..msg)
|
kernel.tty.print(tostring(computer:time()).." "..kernel.user.." "..kernel.process.."["..tostring(level or "INFO").."]: "..msg)
|
||||||
kernel.currentTask=kernel.standbyTask
|
kernel.currentTask=kernel.standbyTask
|
||||||
|
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,3 @@
|
|||||||
|
|
||||||
function string.hasSuffix(str, suffix)
|
function string.hasSuffix(str, suffix)
|
||||||
return string.sub(str, #suffix+1) == suffix
|
return string.sub(str, #suffix+1) == suffix
|
||||||
end
|
end
|
||||||
@@ -195,7 +194,10 @@ end
|
|||||||
|
|
||||||
local oldtype=type
|
local oldtype=type
|
||||||
local oldgetmetatable=getmetatable
|
local oldgetmetatable=getmetatable
|
||||||
function type(object)
|
function type(object, trueType)
|
||||||
|
if trueType then
|
||||||
|
return oldtype(object)
|
||||||
|
end
|
||||||
if oldtype(object)~="table" then
|
if oldtype(object)~="table" then
|
||||||
return oldtype(object)
|
return oldtype(object)
|
||||||
else
|
else
|
||||||
@@ -225,7 +227,7 @@ function getmetatable(object)
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
function isEqual(a, ...)
|
function isEqualToAny(a, ...)
|
||||||
local args={...}
|
local args={...}
|
||||||
for i=0, #args do
|
for i=0, #args do
|
||||||
if a==args[i] then
|
if a==args[i] then
|
||||||
@@ -235,6 +237,16 @@ function isEqual(a, ...)
|
|||||||
return false
|
return false
|
||||||
end
|
end
|
||||||
|
|
||||||
|
function isEqualToAll(a, ...)
|
||||||
|
local args={...}
|
||||||
|
for i=0, #args do
|
||||||
|
if a~=args[i] then
|
||||||
|
return false
|
||||||
|
end
|
||||||
|
end
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
|
||||||
function table.keys(t)
|
function table.keys(t)
|
||||||
local a = {}
|
local a = {}
|
||||||
for n in pairs(t) do table.insert(a, n) end
|
for n in pairs(t) do table.insert(a, n) end
|
||||||
@@ -256,7 +268,8 @@ function table.indexOf(t, value)
|
|||||||
return -1
|
return -1
|
||||||
end
|
end
|
||||||
|
|
||||||
syscall = setmetatable({}, {__index = function(self, name)
|
syscall = setmetatable({}, {
|
||||||
|
__index = function(self, name)
|
||||||
return function(...)
|
return function(...)
|
||||||
local res = table.pack(coroutine.yield("syscall", name, ...))
|
local res = table.pack(coroutine.yield("syscall", name, ...))
|
||||||
if res[1] then
|
if res[1] then
|
||||||
@@ -265,6 +278,7 @@ syscall = setmetatable({}, {__index = function(self, name)
|
|||||||
error(res[2], 2)
|
error(res[2], 2)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end})
|
end
|
||||||
|
})
|
||||||
|
|
||||||
table.serialize=serialize
|
table.serialize=serialize
|
||||||
@@ -144,30 +144,6 @@ data["eeprom"] = {
|
|||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
data["stdin"] = {
|
|
||||||
type = "link",
|
|
||||||
read = function(amount)
|
|
||||||
return kernel.currentTask.fd[0].read(amount)
|
|
||||||
end,
|
|
||||||
write = function() error("Permission denied") end
|
|
||||||
}
|
|
||||||
|
|
||||||
data["stdout"] = {
|
|
||||||
type = "link",
|
|
||||||
read = function() error("Permission denied") end,
|
|
||||||
write = function(data)
|
|
||||||
kernel.currentTask.fd[1].write(data)
|
|
||||||
end
|
|
||||||
}
|
|
||||||
|
|
||||||
data["stderr"] = {
|
|
||||||
type = "link",
|
|
||||||
read = function() error("Permission denied") end,
|
|
||||||
write = function(data)
|
|
||||||
kernel.currentTask.fd[2] = data
|
|
||||||
end
|
|
||||||
}
|
|
||||||
|
|
||||||
local keyboard = kernel.newFifo()
|
local keyboard = kernel.newFifo()
|
||||||
local mouse = kernel.newFifo()
|
local mouse = kernel.newFifo()
|
||||||
data["input"] = newDirectory()
|
data["input"] = newDirectory()
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ local function serialize(table, seen)
|
|||||||
end
|
end
|
||||||
|
|
||||||
while true do
|
while true do
|
||||||
--print(serialize(kernel.tasks))
|
kernel.log(serialize(kernel.tasks))
|
||||||
kernel.saveLog()
|
kernel.saveLog()
|
||||||
sleep(1000)
|
sleep(1000)
|
||||||
end
|
end
|
||||||
@@ -76,7 +76,7 @@ local function serialize(table, seen)
|
|||||||
end
|
end
|
||||||
|
|
||||||
while true do
|
while true do
|
||||||
kernel.log(serialize(kernel.tasks))
|
--kernel.log(serialize(kernel.tasks))
|
||||||
kernel.saveLog()
|
kernel.saveLog()
|
||||||
sleep(1000)
|
sleep(1000)
|
||||||
end
|
end
|
||||||
@@ -36,7 +36,7 @@ end
|
|||||||
|
|
||||||
local function wrapPeripheral(name)
|
local function wrapPeripheral(name)
|
||||||
if native.isPresent(name) then
|
if native.isPresent(name) then
|
||||||
return native.wrap(name)
|
return wrapPeripheral(name)
|
||||||
end
|
end
|
||||||
for n = 1, #sides do
|
for n = 1, #sides do
|
||||||
local side = sides[n]
|
local side = sides[n]
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ end
|
|||||||
|
|
||||||
kernel.syscalls["HPV_spawn"]=sys.spawn
|
kernel.syscalls["HPV_spawn"]=sys.spawn
|
||||||
kernel.syscalls["HPV_sleep"]=sys.sleep
|
kernel.syscalls["HPV_sleep"]=sys.sleep
|
||||||
kernel._G.sleep=function(...)coroutine.yield("HPV_sleep",...)end
|
kernel._G.sleep=function(...)coroutine.yield("syscall","HPV_sleep",...)end
|
||||||
|
|
||||||
local function reapDeadTasks()
|
local function reapDeadTasks()
|
||||||
for pid, task in pairs(tasks) do
|
for pid, task in pairs(tasks) do
|
||||||
@@ -161,16 +161,16 @@ function kernel.main()
|
|||||||
if ret[2]=="syscall" then
|
if ret[2]=="syscall" then
|
||||||
if kernel.syscalls[ret[3]] then
|
if kernel.syscalls[ret[3]] then
|
||||||
if kernel.config.debugSyscalls then
|
if kernel.config.debugSyscalls then
|
||||||
kernel.log("Task "..task.pid.." invoking syscall: "..ret[3])
|
kernel.log("Task "..task.pid.." invoking syscall: "..ret[3], "DBUG")
|
||||||
end
|
end
|
||||||
local sysret = {xpcall(kernel.syscalls[ret[3]], debug.traceback, table.unpack(ret, 4))}
|
local sysret = {xpcall(kernel.syscalls[ret[3]], debug.traceback, table.unpack(ret, 4))}
|
||||||
if kernel.config.debugSyscalls then
|
if kernel.config.debugSyscalls then
|
||||||
if not sysret[1] then
|
if not sysret[1] then
|
||||||
kernel.log("Task "..task.pid.." syscall "..ret[3].." failed: "..tostring(sysret[2]))
|
kernel.log("Task "..task.pid.." syscall "..ret[3].." failed: "..tostring(sysret[2]))
|
||||||
else
|
else
|
||||||
kernel.log("Task "..task.pid.." syscall "..ret[3].." completed returning "..tostring(#sysret-1).." values")
|
kernel.log("Task "..task.pid.." syscall "..ret[3].." completed returning "..tostring(#sysret-1).." values", "DBUG")
|
||||||
for i=2,#sysret do
|
for i=2,#sysret do
|
||||||
kernel.log(" retval["..tostring(i-1).."] = "..tostring(sysret[i]))
|
kernel.log(" retval["..tostring(i-1).."] = "..tostring(sysret[i]), "DBUG")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user