Minecraft/cc-mek-scada
1
0
Fork 0
mirror of https://github.com/MikaylaFischler/cc-mek-scada.git synced 2024-08-30 18:22:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

check shutdown flag in worker loops so they don't lock up the exit process

Browse Source
This commit is contained in:
Mikayla Fischler 2022-04-27 16:38:41 -04:00
parent 82726520b8
commit 46a27a3f3a
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reactor-plc/startup.lua
View File

@ -12,7 +12,7 @@ os.loadAPI("config.lua")
os.loadAPI("plc.lua") os.loadAPI("plc.lua")
os.loadAPI("threads.lua") os.loadAPI("threads.lua")
local R_PLC_VERSION = "alpha-v0.4.3" local R_PLC_VERSION = "alpha-v0.4.4"
local print = util.print local print = util.print
local println = util.println local println = util.println

4
reactor-plc/threads.lua
View File

@ -239,7 +239,7 @@ function thread__iss(smem)
end end
-- check for messages in the message queue -- check for messages in the message queue
while iss_queue.ready() do while iss_queue.ready() and not plc_state.shutdown do
local msg = iss_queue.pop() local msg = iss_queue.pop()
if msg.qtype == mqueue.TYPE.COMMAND then if msg.qtype == mqueue.TYPE.COMMAND then
@ -331,7 +331,7 @@ function thread__comms(smem)
-- thread loop -- thread loop
while true do while true do
-- check for messages in the message queue -- check for messages in the message queue
while comms_queue.ready() do while comms_queue.ready() and not plc_state.shutdown do
local msg = comms_queue.pop() local msg = comms_queue.pop()
if msg.qtype == mqueue.TYPE.COMMAND then if msg.qtype == mqueue.TYPE.COMMAND then

2
rtu/startup.lua
View File

@ -19,7 +19,7 @@ os.loadAPI("dev/boiler_rtu.lua")
os.loadAPI("dev/imatrix_rtu.lua") os.loadAPI("dev/imatrix_rtu.lua")
os.loadAPI("dev/turbine_rtu.lua") os.loadAPI("dev/turbine_rtu.lua")
local RTU_VERSION = "alpha-v0.4.3" local RTU_VERSION = "alpha-v0.4.4"
local print = util.print local print = util.print
local println = util.println local println = util.println

2
rtu/threads.lua
View File

@ -121,7 +121,7 @@ function thread__comms(smem)
-- thread loop -- thread loop
while true do while true do
-- check for messages in the message queue -- check for messages in the message queue
while comms_queue.ready() do while comms_queue.ready() and not plc_state.shutdown do
local msg = comms_queue.pop() local msg = comms_queue.pop()
if msg.qtype == mqueue.TYPE.COMMAND then if msg.qtype == mqueue.TYPE.COMMAND then