merge comflict

.gitignore

@@ -5,3 +5,4 @@
 *luajit
 *.code-workspace
 *.dat
+*.zip

README.md

@@ -1,6 +1,6 @@
 # Multi Version: 15.3.0 Connecting the dots
 **Key Changes**
-- 
+- Bug fix
 
 Found an issue? Please [submit it](https://github.com/rayaman/multi/issues) and someone will look into it!
 
@@ -22,7 +22,10 @@ Link to optional dependencies:
 
 To install copy the multi folder into your environment and you are good to go</br>
 If you want to use the system threads, then you'll need to install lanes or love2d game engine!
-**or** use luarocks `luarocks install multi`
+
+```
+luarocks install multi
+```
 
 Discord
 -------

changes.md

@@ -1,8 +1,12 @@
 # Changelog
 Table of contents
 ---
+[Update 15.2.1 - Bug fix](#update-1521---bug-fix)</br>
 [Update 15.2.0 - Upgrade Complete](#update-1520---upgrade-complete)</br>[Update 15.1.0 - Hold the thread!](#update-1510---hold-the-thread)</br>[Update 15.0.0 - The art of faking it](#update-1500---the-art-of-faking-it)</br>[Update 14.2.0 - Bloatware Removed](#update-1420---bloatware-removed)</br>[Update 14.1.0 - A whole new world of possibilities](#update-1410---a-whole-new-world-of-possibilities)</br>[Update 14.0.0 - Consistency, Additions and Stability](#update-1400---consistency-additions-and-stability)</br>[Update 13.1.0 - Bug fixes and features added](#update-1310---bug-fixes-and-features-added)</br>[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)</br>[Update 12.2.2 - Time for some more bug fixes!](#update-1222---time-for-some-more-bug-fixes)</br>[Update 12.2.1 - Time for some bug fixes!](#update-1221---time-for-some-bug-fixes)</br>[Update 12.2.0 - The chains of binding](#update-1220---the-chains-of-binding)</br>[Update 12.1.0 - Threads just can't hold on anymore](#update-1210---threads-just-cant-hold-on-anymore)</br>[Update: 12.0.0 - Big update (Lots of additions some changes)](#update-1200---big-update-lots-of-additions-some-changes)</br>[Update: 1.11.1 - Small Clarification on Love](#update-1111---small-clarification-on-love)</br>[Update: 1.11.0](#update-1110)</br>[Update: 1.10.0](#update-1100)</br>[Update: 1.9.2](#update-192)</br>[Update: 1.9.1 - Threads can now argue](#update-191---threads-can-now-argue)</br>[Update: 1.9.0](#update-190)</br>[Update: 1.8.7](#update-187)</br>[Update: 1.8.6](#update-186)</br>[Update: 1.8.5](#update-185)</br>[Update: 1.8.4](#update-184)</br>[Update: 1.8.3 - Mainloop recieves some needed overhauling](#update-183---mainloop-recieves-some-needed-overhauling)</br>[Update: 1.8.2](#update-182)</br>[Update: 1.8.1](#update-181)</br>[Update: 1.7.6](#update-176)</br>[Update: 1.7.5](#update-175)</br>[Update: 1.7.4](#update-174)</br>[Update: 1.7.3](#update-173)</br>[Update: 1.7.2](#update-172)</br>[Update: 1.7.1 - Bug Fixes Only](#update-171---bug-fixes-only)</br>[Update: 1.7.0 - Threading the systems](#update-170---threading-the-systems)</br>[Update: 1.6.0](#update-160)</br>[Update: 1.5.0](#update-150)</br>[Update: 1.4.1 (4/10/2017) - First Public release of the library](#update-141-4102017---first-public-release-of-the-library)</br>[Update: 1.4.0 (3/20/2017)](#update-140-3202017)</br>[Update: 1.3.0 (1/29/2017)](#update-130-1292017)</br>[Update: 1.2.0 (12.31.2016)](#update-120-12312016)</br>[Update: 1.1.0](#update-110)</br>[Update: 1.0.0](#update-100)</br>[Update: 0.6.3](#update-063)</br>[Update: 0.6.2](#update-062)</br>[Update: 0.6.1-6](#update-061-6)</br>[Update: 0.5.1-6](#update-051-6)</br>[Update: 0.4.1](#update-041)</br>[Update: 0.3.0 - The update that started it all](#update-030---the-update-that-started-it-all)</br>[Update: EventManager 2.0.0](#update-eventmanager-200)</br>[Update: EventManager 1.2.0](#update-eventmanager-120)</br>[Update: EventManager 1.1.0](#update-eventmanager-110)</br>[Update: EventManager 1.0.0 - Error checking](#update-eventmanager-100---error-checking)</br>[Version: EventManager 0.0.1 - In The Beginning things were very different](#version-eventmanager-001---in-the-beginning-things-were-very-different)
 
+# Update 15.2.1 - Bug fix
+Fixed issue #41
+
 # Update 15.3.0 - A world of connection
 
 Full Update Showcase

multi/init.lua

@@ -34,7 +34,7 @@ if not _G["$multi"] then
 	_G["$multi"] = {multi=multi,thread=thread}
 end
 
-multi.Version = "15.2.0"
+multi.Version = "15.3.0"
 multi.Name = "root"
 multi.NIL = {Type="NIL"}
 local NIL = multi.NIL
@@ -1487,6 +1487,7 @@ co_status = {
 	["normal"] = function(thd,ref)  end,
 	["running"] = function(thd,ref)  end,
 	["dead"] = function(thd,ref,task,i,th)
+		if ref.__processed then return end
 		if _ then
 			ref.OnDeath:Fire(ret,r1,r2,r3,r4,r5,r6,r7,r8,r9,r10,r11,r12,r13,r14,r15,r16)
 		else
@@ -1503,6 +1504,7 @@ co_status = {
 			end
 		end
 		_=nil r1=nil r2=nil r3=nil r4=nil r5=nil
+		ref.__processed = true
 	end,
 }
 handler = coroutine.wrap(function(self)

multi/integration/lanesManager/init.lua

@@ -139,19 +139,19 @@ function multi.InitSystemThreadErrorHandler()
 				elseif status == "error" then
 					livingThreads[temp.Id] = {false, temp.Name}
 					temp.alive = false
-					temp.OnError:Fire(temp,nil,unpack(temp.returns:receive(0,"returns") or {"Thread Killed!"}))
+					temp.OnError:Fire(temp,unpack(temp.returns:receive(0,"returns") or {"Thread Killed!"}))
 					GLOBAL["__THREADS__"] = livingThreads
 					table.remove(threads, i)
 				elseif status == "cancelled" then
 					livingThreads[temp.Id] = {false, temp.Name}
 					temp.alive = false
-					temp.OnError:Fire(temp,nil,"thread_cancelled")
+					temp.OnError:Fire(temp,"thread_cancelled")
 					GLOBAL["__THREADS__"] = livingThreads
 					table.remove(threads, i)
 				elseif status == "killed" then
 					livingThreads[temp.Id] = {false, temp.Name}
 					temp.alive = false
-					temp.OnError:Fire(temp,nil,"thread_killed")
+					temp.OnError:Fire(temp,"thread_killed")
 					GLOBAL["__THREADS__"] = livingThreads
 					table.remove(threads, i)
 				end

rockspecs/multi-15.2-1.rockspec

@@ -0,0 +1,39 @@
+package = "multi"
+version = "15.2-1"
+source = {
+   url = "git://github.com/rayaman/multi.git",
+   tag = "v15.2.1",
+}
+description = {
+   summary = "Lua Multi tasking library",
+   detailed = [[
+      This library contains many methods for multi tasking. Features non coroutine based multi-tasking, coroutine based multi-tasking, and system threading (Requires use of an integration).
+      Check github for documentation.
+   ]],
+   homepage = "https://github.com/rayaman/multi",
+   license = "MIT"
+}
+dependencies = {
+   "lua >= 5.1"
+}
+build = {
+   type = "builtin",
+   modules = {
+      ["multi"] = "multi/init.lua",
+      ["multi.integration.lanesManager"] = "multi/integration/lanesManager/init.lua",
+      ["multi.integration.lanesManager.extensions"] = "multi/integration/lanesManager/extensions.lua",
+      ["multi.integration.lanesManager.threads"] = "multi/integration/lanesManager/threads.lua",
+      ["multi.integration.loveManager"] = "multi/integration/loveManager/init.lua",
+      ["multi.integration.loveManager.extensions"] = "multi/integration/loveManager/extensions.lua",
+      ["multi.integration.loveManager.threads"] = "multi/integration/loveManager/threads.lua",
+      --["multi.integration.lovrManager"] = "multi/integration/lovrManager/init.lua",
+      --["multi.integration.lovrManager.extensions"] = "multi/integration/lovrManager/extensions.lua",
+      --["multi.integration.lovrManager.threads"] = "multi/integration/lovrManager/threads.lua",
+      ["multi.integration.pesudoManager"] = "multi/integration/pesudoManager/init.lua",
+      ["multi.integration.pesudoManager.extensions"] = "multi/integration/pesudoManager/extensions.lua",
+      ["multi.integration.pesudoManager.threads"] = "multi/integration/pesudoManager/threads.lua",
+      ["multi.integration.luvitManager"] = "multi/integration/luvitManager.lua",
+      ["multi.integration.threading"] = "multi/integration/threading.lua",
+      --["multi.integration.networkManager"] = "multi/integration/networkManager.lua",
+   }
+}

rockspecs/multi-15.3-0.rockspec

@@ -0,0 +1,39 @@
+package = "multi"
+version = "15.3-0"
+source = {
+   url = "git://github.com/rayaman/multi.git",
+   tag = "v15.3.0",
+}
+description = {
+   summary = "Lua Multi tasking library",
+   detailed = [[
+      This library contains many methods for multi tasking. Features non coroutine based multi-tasking, coroutine based multi-tasking, and system threading (Requires use of an integration).
+      Check github for documentation.
+   ]],
+   homepage = "https://github.com/rayaman/multi",
+   license = "MIT"
+}
+dependencies = {
+   "lua >= 5.1"
+}
+build = {
+   type = "builtin",
+   modules = {
+      ["multi"] = "multi/init.lua",
+      ["multi.integration.lanesManager"] = "multi/integration/lanesManager/init.lua",
+      ["multi.integration.lanesManager.extensions"] = "multi/integration/lanesManager/extensions.lua",
+      ["multi.integration.lanesManager.threads"] = "multi/integration/lanesManager/threads.lua",
+      ["multi.integration.loveManager"] = "multi/integration/loveManager/init.lua",
+      ["multi.integration.loveManager.extensions"] = "multi/integration/loveManager/extensions.lua",
+      ["multi.integration.loveManager.threads"] = "multi/integration/loveManager/threads.lua",
+      --["multi.integration.lovrManager"] = "multi/integration/lovrManager/init.lua",
+      --["multi.integration.lovrManager.extensions"] = "multi/integration/lovrManager/extensions.lua",
+      --["multi.integration.lovrManager.threads"] = "multi/integration/lovrManager/threads.lua",
+      ["multi.integration.pesudoManager"] = "multi/integration/pesudoManager/init.lua",
+      ["multi.integration.pesudoManager.extensions"] = "multi/integration/pesudoManager/extensions.lua",
+      ["multi.integration.pesudoManager.threads"] = "multi/integration/pesudoManager/threads.lua",
+      ["multi.integration.luvitManager"] = "multi/integration/luvitManager.lua",
+      ["multi.integration.threading"] = "multi/integration/threading.lua",
+      --["multi.integration.networkManager"] = "multi/integration/networkManager.lua",
+   }
+}

test.lua

@@ -1,6 +1,7 @@
-package.path = "./?/init.lua;"..package.path
+package.path = "./?/init.lua;?.lua;lua5.4/share/lua/?/init.lua;lua5.4/share/lua/?.lua;"..package.path
+package.cpath = "lua5.4/lib/lua/?/core.dll;"..package.cpath
 multi, thread = require("multi"):init{print=true}
-GLOBAL, THREAD = require("multi.integration.threading"):init()
+GLOBAL, THREAD = require("multi.integration.lanesManager"):init()
 
 function multi:newSystemThreadedConnection(name,...)
 	local master_conn = multi:newConnection(...)

test3.lua

@@ -1,51 +0,0 @@
-package.path = "./?.lua;?/init.lua;"..package.path
-local multi,thread = require("multi"):init{print=true}
---local GLOBAL,THREAD = require("multi.integration.lanesManager"):init()
-
--- func = THREAD:newFunction(function(a,b,c)
--- 	print("Hello Thread!",a,b,c)
--- 	return 1,2,3	
--- end)
-
--- func2 = THREAD:newFunction(function(a,b,c)
--- 	print("Hello Thread2!",a,b,c)
--- 	THREAD.sleep(1)
--- 	return 10,11,12	
--- end)
-
--- multi:newThread("Test thread",function()
--- 	handler = func(4,5,6)
--- 	handler2 = func2(7,8,9)
--- 	thread.hold(handler.OnReturn + handler2.OnReturn)
--- 	print("Function Done",handler.getReturns())
--- 	print("Function Done",handler2.getReturns())
--- end)
-
-
--- multi:benchMark(1):OnBench(function(sec,steps)
--- 	print("Steps:",steps)
--- 	os.exit()
--- end)
-print("Running benchmarks! ",_VERSION)
-local sleep_for = 1
-local a = 0
-local c = 1
-local function bench(t,step)
-	a = a + step
-	c = c + 1
-	os.exit()
-end
---multi:benchMark(sleep_for,multi.Priority_Idle,"Idle:"):OnBench(bench)
---multi:benchMark(sleep_for,multi.Priority_Very_Low,"Very Low:"):OnBench(bench)
---multi:benchMark(sleep_for,multi.Priority_Low,"Low:"):OnBench()
---multi:benchMark(sleep_for,multi.Priority_Below_Normal,"Below Normal:"):OnBench(bench)
---multi:benchMark(sleep_for,multi.Priority_Normal,"Normal:"):OnBench(bench)
---multi:benchMark(sleep_for,multi.Priority_Above_Normal,"Above Normal:"):OnBench(bench)
---multi:benchMark(sleep_for,multi.Priority_High,"High:"):OnBench(bench)
---multi:benchMark(sleep_for,multi.Priority_Very_High,"Very High:"):OnBench(bench)
-multi:benchMark(sleep_for,multi.Priority_Core,"Core:"):OnBench(bench)
-multi.OnExit(function()
-	print("Total: ".. a)
-end)
-
-multi:mainloop()