added a proper environment variable system rather than just sticking stuff in the process' table

This commit is contained in:
Izaya 2019-01-02 16:41:39 +11:00
parent 7615cf67dc
commit d71dec7b8d

View File

@ -1,13 +1,19 @@
tTasks,nPid,nTimeout,cPid = {},1,1,0 do
function os.spawn(f,n) tTasks,nPid,nTimeout,cPid = {},1,1,0 -- table of tasks, next process ID, event timeout, current PID
tTasks[nPid] = {["c"]=coroutine.create(f),["n"]=n,["p"]=nPid} function os.spawn(f,n) -- creates a process from function *f* with name *n*
for k,v in pairs(tTasks[cPid] or {}) do tTasks[nPid] = {["c"]=coroutine.create(f),["n"]=n,["p"]=nPid,e={}}
tTasks[nPid][k] = tTasks[nPid][k] or v if tTasks[cPid] then
for k,v in pairs(tTasks[cPid].e) do
tTasks[nPid].e[k] = tTasks[nPid].e[k] or v
end
end end
nPid = nPid + 1 nPid = nPid + 1
return nPid - 1 return nPid - 1
end end
function sched() function os.kill(pid) -- removes process *pid* from the task list
tTasks[pid] = nil
end
function sched() -- the actual scheduler function
while #tTasks > 0 do while #tTasks > 0 do
local tEv = {computer.pullSignal(nTimeout)} local tEv = {computer.pullSignal(nTimeout)}
for k,v in pairs(tTasks) do for k,v in pairs(tTasks) do
@ -20,3 +26,14 @@ function sched()
end end
end end
end end
function os.setenv(k,v) -- set's the current process' environment variable *k* to *v*, which is passed to children
if tTasks[cPid] then
tTasks[cPid].e[k] = v
end
end
function os.getenv(k) -- gets a process' *k* environment variable
if tTasks[cPid] then
return tTasks[cPid].e[k]
end
end
end