From 07c421194ecd61be6d4a9788fcea7bc19fd23750 Mon Sep 17 00:00:00 2001 From: Ryan Ward Date: Tue, 10 Mar 2020 11:47:20 -0400 Subject: [PATCH] Bug fixes --- changes.md | 4 +++- multi/init.lua | 10 +++++----- multi/integration/lanesManager/extensions.lua | 2 +- multi/integration/loveManager/extensions.lua | 2 +- multitut.lua | 15 --------------- 5 files changed, 10 insertions(+), 23 deletions(-) delete mode 100644 multitut.lua diff --git a/changes.md b/changes.md index 4924d12..d2fcf81 100644 --- a/changes.md +++ b/changes.md @@ -4,7 +4,7 @@ Table of contents --- [Update 14.1.0 - A whole new world of possibilities](#update-1410---a-whole-new-world-of-possibilities)
[Update 14.0.0 - Consistency, Additions and Stability](#update-1400-consistency-additions-and-stability)
[Update 13.1.0 - Bug fixes and features added](#update-1310-bug-fixes-and-features-added)
[Update 13.0.0 - Added some documentation, and some new features too check it out!](#update-1300-added-some-documentation-and-some-new-features-too-check-it-out)
[Update 12.2.2 - Time for some more bug fixes!](#update-1222-time-for-some-more-bug-fixes)
[Update 12.2.1 - Time for some bug fixes!](#update-1221-time-for-some-bug-fixes)
[Update 12.2.0 - The chains of binding](#update-1220---the-chains-of-binding)
[Update 12.1.0 - Threads just can't hold on anymore](#update-1210---threads-just-cant-hold-on-anymore)
[Update: 12.0.0 - Big update (Lots of additions some changes)](#update-1200-big-update-lots-of-additions-some-changes)
[Update: 1.11.1 - Small Clarification on Love](#update-1111---small-clarification-on-love)
[Update: 1.11.0](#update-1110)
[Update: 1.10.0](#update-1100)
[Update: 1.9.2](#update-192)
[Update: 1.9.1 - Threads can now argue](#update-191---threads-can-now-argue)
[Update: 1.9.0](#update-190)
[Update: 1.8.7](#update-187)
[Update: 1.8.6](#update-186)
[Update: 1.8.5](#update-185)
[Update: 1.8.4](#update-184)
[Update: 1.8.3 - Mainloop recieves some needed overhauling](#update-183---mainloop-recieves-some-needed-overhauling)
[Update: 1.8.2](#update-182)
[Update: 1.8.1](#update-181)
[Update: 1.7.6](#update-176)
[Update: 1.7.5](#update-175)
[Update: 1.7.4](#update-174)
[Update: 1.7.3](#update-173)
[Update: 1.7.2](#update-172)
[Update: 1.7.1 - Bug Fixes Only](#update-171---bug-fixes-only)
[Update: 1.7.0 - Threading the systems](#update-170---threading-the-systems)
[Update: 1.6.0](#update-160)
[Update: 1.5.0](#update-150)
[Update: 1.4.1 (4/10/2017) - First Public release of the library](#update-141-4102017---first-public-release-of-the-library)
[Update: 1.4.0 (3/20/2017)](#update-140-3202017)
[Update: 1.3.0 (1/29/2017)](#update-130-1292017)
[Update: 1.2.0 (12.31.2016)](#update-120-12312016)
[Update: 1.1.0](#update-110)
[Update: 1.0.0](#update-100)
[Update: 0.6.3](#update-063)
[Update: 0.6.2](#update-062)
[Update: 0.6.1-6](#update-061-6)
[Update: 0.5.1-6](#update-051-6)
[Update: 0.4.1](#update-041)
[Update: 0.3.0 - The update that started it all](#update-030---the-update-that-started-it-all)
[Update: EventManager 2.0.0](#update-eventmanager-200)
[Update: EventManager 1.2.0](#update-eventmanager-120)
[Update: EventManager 1.1.0](#update-eventmanager-110)
[Update: EventManager 1.0.0 - Error checking](#update-eventmanager-100---error-checking)
[Version: EventManager 0.0.1 - In The Beginning things were very different](#version-eventmanager-001---in-the-beginning-things-were-very-different) -# Update 14.1.0 - A whole new world of possibilities +# Update 14.1.3 - A whole new world of possibilities Full Update Showcase --- Something I plan on doing each version going forward @@ -116,6 +116,8 @@ Bug Fixes: - Fixed Issue with Service's task method not being set at creation - 1.14.2 - Fixed Issue with connections not returning a connection_link +- 1.14.3 + - Fixed Issue with hold like methods not accepting `false` as a valid return Going Forward: --- diff --git a/multi/init.lua b/multi/init.lua index 23b8ec9..2c64ebf 100644 --- a/multi/init.lua +++ b/multi/init.lua @@ -28,8 +28,8 @@ local thread = {} if not _G["$multi"] then _G["$multi"] = {multi=multi,thread=thread} end -multi.Version = "14.1.1" -multi._VERSION = "14.1.1" +multi.Version = "14.1.3" +multi._VERSION = "14.1.3" multi.stage = "stable" multi.__index = multi multi.Name = "multi.root" @@ -1751,7 +1751,7 @@ function multi.initThreads(justThreads) end elseif threads[i] and threads[i].task == "hold" then --GOHERE t0,t1,t2,t3,t4,t5,t6 = threads[i].func() - if t0 then + if t0~=nil then if t0==multi.NIL then t0 = nil end @@ -1765,7 +1765,7 @@ function multi.initThreads(justThreads) end elseif threads[i] and threads[i].task == "holdF" then t0,t1,t2,t3,t4,t5,t6 = threads[i].func() - if t0 then + if t0~=nil then threads[i].task = "" threads[i].__ready = true elseif clock() - threads[i].time>=threads[i].sec then @@ -1777,7 +1777,7 @@ function multi.initThreads(justThreads) elseif threads[i] and threads[i].task == "holdW" then threads[i].pos = threads[i].pos + 1 t0,t1,t2,t3,t4,t5,t6 = threads[i].func() - if t0 then + if t0~=nil then threads[i].task = "" threads[i].__ready = true elseif threads[i].count==threads[i].pos then diff --git a/multi/integration/lanesManager/extensions.lua b/multi/integration/lanesManager/extensions.lua index e2092a1..4a2bb63 100644 --- a/multi/integration/lanesManager/extensions.lua +++ b/multi/integration/lanesManager/extensions.lua @@ -103,7 +103,7 @@ function multi:newSystemThreadedJobQueue(n) end) return thread.hold(function() if rets then - return unpack(rets) + return unpack(rets) or multi.NIL end end) end,holup),name diff --git a/multi/integration/loveManager/extensions.lua b/multi/integration/loveManager/extensions.lua index 3cab758..add2234 100644 --- a/multi/integration/loveManager/extensions.lua +++ b/multi/integration/loveManager/extensions.lua @@ -121,7 +121,7 @@ function multi:newSystemThreadedJobQueue(n) end) return thread.hold(function() if rets then - return unpack(rets) + return unpack(rets) or multi.NIL end end) end,holup),name diff --git a/multitut.lua b/multitut.lua deleted file mode 100644 index 81bdd4e..0000000 --- a/multitut.lua +++ /dev/null @@ -1,15 +0,0 @@ -package.path="?/init.lua;?.lua;"..package.path -local multi = require("multi") ---~ local GLOBAL, THREAD = require("multi.integration.lanesManager").init() ---~ nGLOBAL = require("multi.integration.networkManager").init() - - -local a = 0 -local clock = os.clock -b = clock() -while clock()-b <1 do - a = a +1 -end -print("a: "..a) ---~ multi:benchMark(1,nil,"Bench:") ---~ multi:mainloop()