.github/workflows/love.yml

@@ -1,25 +0,0 @@
-name: Build & Run tests Love2d
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-    runs-on: "ubuntu-latest"
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: recursive
-    - name: Install love2d
-      run: |
-        sudo apt install fuse
-        wget https://github.com/love2d/love/releases/download/11.4/love-11.4-x86_64.AppImage -O love.AppImage
-        sudo chmod +x love.AppImage
-    - name: Run Tests
-      run: |
-        ./love.AppImage tests

.github/workflows/nix_ci.yml

@@ -1,41 +0,0 @@
-name: Build & Run tests Ubuntu
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    branches: [ master ]
-
-jobs:
-  build:
-    strategy:
-      fail-fast: false
-      matrix:
-        build-type: [Release] # Debug
-        lua: ["lua 5.1", "lua 5.2", "lua 5.3", "lua 5.4", "luajit 2.1.0-beta3"]
-        os: ["ubuntu-latest"]
-    runs-on: ${{ matrix.os }}
-    steps:
-    - uses: actions/checkout@v2
-      with:
-        submodules: recursive
-
-    - uses: actions/setup-python@v2
-      with:
-        python-version: '3.10'
-
-    - name: Setup env
-      run: |
-        pip install hererocks
-        hererocks lua-pkg --${{ matrix.lua }} -rlatest
-
-    - name: Install lanes and multi
-      run: |
-        source ${{github.workspace}}/lua-pkg/bin/activate
-        luarocks install lanes
-        luarocks install rockspecs/multi-16.0-0.rockspec
-
-    - name: Run Tests
-      run: |
-        source ${{github.workspace}}/lua-pkg/bin/activate
-        lua tests/runtests.lua

.gitignore

@@ -1,3 +1,15 @@
-*.code-workspace
-lua5.4/*
+
+test2.lua
+*.mp3
+*.exe
+*.dll
+lanestestclient.lua
+lanestest.lua
+sample-node.lua
+sample-master.lua
+Ayn Rand - The Virtue of Selfishness-Mg4QJheclsQ.m4a
+Atlas Shrugged by Ayn Rand Audiobook-9s2qrEau63E.webm
 test.lua
+test.lua
+*.code-workspace
+*.dat

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Ryan Ward
+Copyright (c) 2021 Ryan Ward
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

NetworkManager.md

@@ -1,26 +0,0 @@
-# NTHREAD Namespace 
-- [ ] NTHREAD.set(name, val)
-- [ ] NTHREAD.get(name, val)
-- [ ] NTHREAD.waitFor(name)
-- [ ] NTHREAD.getCores()*
-- [ ] NTHREAD.getConsole()
-- [ ] NTHREAD.getThreads()
-- [ ] NTHREAD.kill()
-- [ ] NTHREAD.getName()
-- [ ] NTHREAD.getID()
-- [ ] NTHREAD.pushStatus(...)
-- [ ] NTHREAD.sleep(n)
-- [ ] NTHREAD.hold(n)
-- [ ] NTHREAD.setENV(env)
-- [ ] NTHREAD.getENV()
-
-# Extensions
-- [ ] multi:newNetworkThreadedQueue(name)
-- [ ] multi:newNetworkThreadedTable(name)
-- [ ] multi:newNetworkThreadedJobQueue(n)
-- [ ] multi:newNetworkThreadedConnection(name)
-
-# Core
-- [ ] NTHREAD:newFunction(func, holdme)
-- [ ] NTHREAD:newNetworkThread(name, func, ...)
-- [ ] mulit:newNetworkThread(name, func, ...)

README.md

@@ -1,87 +1,56 @@
-# Multi Version: 16.0.1 - Bug fix
+# Multi Version: 15.1.0 Hold the thread
+**Key Changes**
+- thread.hold has been updated to allow all variants to work as well as some new features. Check the changelog or documentation for more info.
+- multi:newProccesor() Creates a process that acts like the multi namespace that can be managed independently from the mainloop.
+- Connections can be added together
 
 Found an issue? Please [submit it](https://github.com/rayaman/multi/issues) and someone will look into it!
 
-My multitasking library for lua. It is a pure lua binding, with exceptions of the integrations.
-
-</br>
-
-Progress is being made in [v16.1.0](https://github.com/rayaman/multi/tree/v16.1.0)
----
-
-</br>
+My multitasking library for lua. It is a pure lua binding, with exceptions of the integrations and the love2d compat.
 
 INSTALLING
 ----------
-Link to optional dependencies:
-- [lanes](https://github.com/LuaLanes/lanes) `luarocks install lanes`
-
-- [chronos](https://github.com/ldrumm/chronos) `luarocks install chronos`
-
-- [love2d](https://love2d.org/)
-	
-   When using love2d add multi:uManager() or any processor to love.update()
-
-   ```lua
-   function love.update(dt)
-		multi:uManager()
-   end
-   ```
+Links to dependencies:
+[lanes](https://github.com/LuaLanes/lanes)
 
 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!
+If you want to use the system threads, then you'll need to install lanes!
+**or** use luarocks `luarocks install multi`
 
-```
-luarocks install multi
-```
+Going forward I will include a Release zip for love2d.
+**The Network Manager rework is currently being worked on and the old version is not included in this version.**
 
 Discord
 -------
-Have a question or need realtime assistance? Feel free to join the discord!</br>
-https://discord.gg/U8UspuA
+Have a question? Or need realtime assistance? Feel free to join the discord!</br>
+https://discord.gg/U8UspuA</br>
 
 Planned features/TODO
 ---------------------
-- [x] ~~Create test suite (In progress, mostly done)~~
+- [x] ~~Finish Documentation~~ Finished
+- [ ] Create test suite
 - [ ] Network Parallelism rework
 
-Usage: [Check out the documentation for more info](https://github.com/rayaman/multi/blob/master/Documentation.md)
+Usage: [Check out the documentation for more info](https://github.com/rayaman/multi/blob/master/Documentation.md)</br>
 -----
 
-You can run tests in 2 ways:
-```
-lua tests/runtests.lua (Runs all tests, attempts to use lanes)
-love tests (Runs all tests in love2d env)
-```
-
 ```lua
+package.path="?.lua;?/init.lua;?.lua;?/?/init.lua;"..package.path
 local multi, thread = require("multi"):init()
 GLOBAL, THREAD = require("multi.integration.threading"):init()
-
 multi:newSystemThread("System Thread",function()
     while true do
-		THREAD.sleep(.1)
-		io.write(" World")
-		THREAD.kill()
+        THREAD.sleep(1)
+        print("World!")
     end
 end)
-
 multi:newThread("Coroutine Based Thread",function()
     while true do
-		io.write("Hello")
-		thread.sleep(.1)
-		thread.kill()
+        print("Hello")
+        thread.sleep(1)
     end
 end)
-
-multi:newTLoop(function(loop)
-	print("!")
-	loop:Destroy()
-	os.exit()
-end,.3)
-
 multi:mainloop()
-
 --[[
 while true do
     multi:uManager()

integration/debugManager/init.lua

@@ -1,106 +0,0 @@
-local multi, thread = require("multi"):init()
-
-multi.defaultSettings.debugging = true
-
-local dbg = {}
-dbg.__index = dbg
-dbg.processors = {}
-
--- Hooks to all on object created events!
-local c_cache = {}
-local d_cache = {}
-
-local proc = multi:newProcessor("Debug_Processor").Start()
-
-dbg.OnObjectCreated = function(obj, process)
-    if c_cache[obj] then
-        return false
-    else
-        c_cache[obj] = true
-        proc:newTask(function()
-            c_cache[obj] = false
-        end)
-        return true
-    end
-end .. multi:newConnection()
-
-dbg.OnObjectDestroyed = function(obj, process)
-    if d_cache[obj] then
-        return false
-    else
-        d_cache[obj] = true
-        proc:newTask(function()
-            d_cache[obj] = false
-        end)
-        return true
-    end
-end .. multi:newConnection()
-
-local creation_hook, destruction_hook
-local types
-local objects = {}
-
-creation_hook = function(obj, process)
-    types = multi:getTypes()
-    if obj.Type == multi.PROCESS and not dbg.processors[obj] then
-        obj.OnObjectCreated(creation_hook)
-        obj.OnObjectDestroyed(destruction_hook)
-    end
-
-    table.insert(objects, obj)
-
-    dbg.OnObjectCreated:Fire(obj, process)
-end
-
-destruction_hook = function(obj, process)
-    for i = 1, #objects do
-        if objects[i] == obj then
-            table.remove(objects, i)
-            break
-        end
-    end
-    dbg.OnObjectDestroyed:Fire(obj, process)
-end
-
-function dbg:getObjects(typ)
-    if type(typ) == "string" then
-        local objs = {}
-        for i = 1, #objects do
-            if objects[i].Type == typ then
-                objs[#objs+1] = objects[i]
-            end
-        end
-        return objs
-    elseif type(typ) == "table" then -- Process
-        local objs = {}
-        for i = 1, #objects do
-            if objects[i].Parent == typ then
-                objs[#objs+1] = objects[i]
-            end
-        end
-        return objs
-    elseif type(typ) == "function" then
-        local objs = {}
-        -- Keep objects local/private, return true to add to list, false to reject, "break" to break loop
-        for i = 1, #objects do
-            local ret = typ(objects[i])
-            if ret then
-                objs[#objs+1] = objects[i]
-            elseif ret == "break" then
-                break
-            end
-        end
-        return objs
-    end
-end
-
-local debug_stats = {}
-
-local tmulti = multi:getThreadManagerProcess()
-multi.OnObjectCreated(creation_hook)
-tmulti.OnObjectCreated(creation_hook)
-multi.OnObjectDestroyed(destroction_hook)
-tmulti.OnObjectDestroyed(destroction_hook)
-
--- We write to a debug interface in the multi namespace
-multi.debugging = dbg

integration/effilManager/init.lua

@@ -1,46 +0,0 @@
-local multi, thread = require("multi"):init{error=true}
-multi.error("Currntly not supported!")
-os.exit(1)
-local effil = require("effil")
-
--- I like some of the things that this library offers.
--- Current limitations prevent me from being able to use effil, 
---	but I might fork and work on it myself.
-
--- Configs
-effil.allow_table_upvalues(false)
-
-local GLOBAL,THREAD = require("multi.integration.effilManager.threads").init()
-local count = 1
-local started = false
-local livingThreads = {}
-
-function multi:newSystemThread(name, func, ...)
-    local name = name or multi.randomString(16)
-	local rand = math.random(1, 10000000)
-    c = {}
-	c.name = name
-	c.Name = name
-	c.Id = count
-end
-
-function THREAD:newFunction(func, holdme)
-	return thread:newFunctionBase(function(...)
-		return multi:newSystemThread("TempSystemThread",func,...)
-	end, holdme, multi.SFUNCTION)()
-end
-
-THREAD.newSystemThread = function(...)
-    multi:newSystemThread(...)
-end
-
-multi.print("Integrated Effil Threading!")
-multi.integration = {} -- for module creators
-multi.integration.GLOBAL = GLOBAL
-multi.integration.THREAD = THREAD
-require("multi.integration.effilManager.extensions")
-return {
-	init = function()
-		return GLOBAL, THREAD
-	end
-}

integration/lanesManager/extensions.lua

@@ -1,393 +0,0 @@
---[[
-MIT License
-
-Copyright (c) 2022 Ryan Ward
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sub-license, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-]]
-local multi, thread = require("multi"):init()
-
-if not (GLOBAL and THREAD) then
-	GLOBAL, THREAD = multi.integration.GLOBAL, multi.integration.THREAD
-else
-	lanes = require("lanes")
-end
-
-function multi:newSystemThreadedQueue(name)
-	local name = name or multi.randomString(16)
-	local c = {}
-	c.Name = name
-	c.linda = lanes.linda()
-	c.Type = multi.registerType("s_queue")
-
-	function c:push(v)
-		self.linda:send("Q", v)
-	end
-
-	function c:pop()
-		return ({self.linda:receive(0, "Q")})[2]
-	end
-
-	function c:peek()
-		return self.linda:get("Q")
-	end
-
-	function c:init()
-		return self
-	end
-
-	if multi.isMainThread then
-		multi.integration.GLOBAL[name] = c
-	else
-		GLOBAL[name] = c
-	end
-
-	function c:Hold(opt)
-		local multi, thread = require("multi"):init()
-        if opt.peek then
-            return thread.hold(function()
-                return self:peek()
-            end)
-        else
-            return thread.hold(function()
-                return self:pop()
-            end)
-        end
-	end
-
-	self:create(c)
-
-	return c
-end
-
-function multi:newSystemThreadedTable(name)
-	local name = name or multi.randomString(16)
-    local c = {}
-    c.link = lanes.linda()
-	c.Name = name
-	c.Type = multi.registerType("s_table")
-
-    function c:init()
-        return self
-    end
-	
-	setmetatable(c,{
-        __index = function(t,k)
-            return c.link:get(k)
-        end,
-        __newindex = function(t,k,v)
-            c.link:set(k, v)
-        end
-    })
-
-    if multi.isMainThread then
-		multi.integration.GLOBAL[name] = c
-	else
-		GLOBAL[name] = c
-	end
-
-	function c:Hold(opt)
-		local multi, thread = require("multi"):init()
-        if opt.key then
-            return thread.hold(function()
-                return self.tab[opt.key]
-            end)
-        else
-            multi.error("Must provide a key to check opt.key = 'key'")
-        end
-    end
-
-	self:create(c)
-
-	return c
-end
-
-function multi:newSystemThreadedJobQueue(n)
-    local c = {}
-    c.cores = n or THREAD.getCores()*2
-	c.Type = multi.registerType("s_jobqueue")
-    c.OnJobCompleted = multi:newConnection()
-    local funcs = multi:newSystemThreadedTable()
-    local queueJob = multi:newSystemThreadedQueue()
-    local queueReturn = multi:newSystemThreadedQueue()
-    local doAll = multi:newSystemThreadedQueue()
-    local ID=1
-    local jid = 1
-    function c:isEmpty()
-        return queueJob:peek()==nil
-    end
-    function c:doToAll(func,...)
-        for i=1,c.cores do
-            doAll:push{ID,func,...}
-        end
-        ID = ID + 1
-        return self
-    end
-    function c:registerFunction(name,func)
-        funcs[name]=func
-        return self
-    end
-    function c:pushJob(name,...)
-        queueJob:push{name,jid,multi.pack(...)}
-        jid = jid + 1
-        return jid-1
-    end
-    local nFunc = 0
-    function c:newFunction(name, func, holup) -- This registers with the queue
-        if type(name)=="function" then
-            holup = func
-            func = name
-            name = "JQ_Function_"..nFunc
-        end
-        nFunc = nFunc + 1
-        c:registerFunction(name,func)
-        return thread:newFunction(function(...)
-            local id = c:pushJob(name,...)
-            local link
-            local rets
-            link = c.OnJobCompleted(function(jid,...)
-                if id==jid then
-                    rets = multi.pack(...)
-                end
-            end)
-            return thread.hold(function()
-                if rets then
-					if #rets == 0 then
-						return multi.NIL
-					else
-                    	return multi.unpack(rets)
-					end
-                end
-            end)
-        end, holup), name
-    end
-    thread:newThread("JobQueueManager",function()
-        while true do
-            local job = thread.hold(function()
-                return queueReturn:pop()
-            end)
-			if job then
-				local id = table.remove(job,1)
-				c.OnJobCompleted:Fire(id,multi.unpack(job))
-			end
-        end
-    end)
-    for i=1,c.cores do
-        multi:newSystemThread("STJQ_"..multi.randomString(8),function(queue)
-            local multi, thread = require("multi"):init()
-            local idle = os.clock()
-            local clock = os.clock
-            local ref = 0
-			_G["__QR"] = queueReturn
-            setmetatable(_G,{__index = funcs})
-            thread:newThread("JobHandler",function()
-                while true do
-                    local dat = thread.hold(function()
-                        return queueJob:pop()
-                    end)
-                    idle = clock()
-					thread:newThread("JobQueue-Spawn",function()
-						local name = table.remove(dat, 1)
-						local jid = table.remove(dat, 1)
-						local args = table.remove(dat, 1)
-						queueReturn:push{jid, funcs[name](args[1],args[2],args[3],args[4],args[5],args[6],args[7],args[8]), queue}
-					end)
-                end
-            end)
-            thread:newThread("DoAllHandler",function()
-                while true do
-                    local dat = thread.hold(function()
-                        return doAll:peek()
-                    end)
-                    if dat then
-                        if dat[1]>ref then
-							ref = table.remove(dat, 1)
-							func = table.remove(dat, 1)
-                            idle = clock()
-                            func(unpack(dat))
-                            doAll:pop()
-                        end
-                    end
-                end
-            end)
-            thread:newThread("IdleHandler",function()
-                while true do
-                    thread.hold(function()
-                        return clock()-idle>3
-                    end)
-                    THREAD.sleep(.01)
-                end
-            end)
-            multi:mainloop()
-        end,i)
-    end
-
-	function c:Hold(opt)
-        return thread.hold(self.OnJobCompleted)
-    end
-
-	self:create(c)
-
-    return c
-end
-
-function multi:newSystemThreadedConnection(name)
-	local name = name or multi.randomString(16)
-	local c = {}
-	c.Type = multi.registerType("s_connection")
-	c.CONN = 0x00
-	c.TRIG = 0x01
-	c.PING = 0x02
-	c.PONG = 0x03
-	local function remove(a, b)
-		local ai = {}
-		local r = {}
-		for k,v in pairs(a) do ai[v]=true end
-		for k,v in pairs(b) do 
-			if ai[v]==nil then table.insert(r,a[k]) end
-		end
-		return r
-	end
-	c.CID = THREAD_ID
-	c.subscribe = multi:newSystemThreadedQueue("SUB_STC_"..self.Name):init()
-	c.Name = name
-	c.links = {} -- All triggers sent from main connection. When a connection is triggered on another thread, they speak to the main then send stuff out.
-	-- Locals will only live in the thread that creates the original object
-	local ping
-	local pong = function(link, links)
-		local res = thread.hold(function()
-			return link:peek()[1] == c.PONG
-		end,{sleep=3})
-
-		if not res then
-			for i=1,#links do 
-				if links[i] == link then
-					table.remove(links,i,link)
-					break
-				end
-			end
-		else
-			link:pop()
-		end
-	end
-
-	ping = thread:newFunction(function(self)
-		ping:Pause()
-		multi.ForEach(self.links, function(link) -- Sync new connections
-			link:push{self.PING}
-			multi:newThread("pong Thread", pong, link, self.links)
-		end)
-
-		thread.sleep(3)
-
-		ping:Resume()
-	end,false)
-
-	local function fire(...)
-		for _, link in pairs(c.links) do
-			link:push {c.TRIG, multi.pack(...)}
-		end
-	end
-
-	thread:newThread("STC_SUB_MAN"..name,function()
-		local item
-		local sub_func = function() -- This will keep things held up until there is something to process
-			return c.subscribe:pop()
-		end
-		while true do
-			thread.yield()
-			-- We need to check on broken connections
-			ping(c) -- Should return instantlly and process this in another thread
-			item = thread.hold(sub_func)
-			if item[1] == c.CONN then
-				multi.ForEach(c.links, function(link) -- Sync new connections
-					item[2]:push{c.CONN, link}
-				end)
-				c.links[#c.links+1] = item[2]
-			elseif item[1] == c.TRIG then
-				fire(multi.unpack(item[2]))
-				c.proxy_conn:Fire(multi.unpack(item[2]))
-			end
-		end
-	end)
-	--- ^^^ This will only exist in the init thread
-
-	function c:Fire(...)
-		local args = multi.pack(...)
-		if self.CID == THREAD_ID then -- Host Call
-			for _, link in pairs(self.links) do
-				link:push {self.TRIG, args}
-			end
-			self.proxy_conn:Fire(...)
-		else
-			self.subscribe:push {self.TRIG, args}
-		end
-	end
-
-	function c:init()
-		local multi, thread = require("multi"):init()
-		self.links = {}
-		self.proxy_conn = multi:newConnection()
-		local mt = getmetatable(self.proxy_conn)
-		local tempMT = {}
-		for i,v in pairs(mt) do
-			tempMT[i] = v
-		end
-		tempMT.__index = self.proxy_conn
-		tempMT.__call = function(t,func) self.proxy_conn(func) end
-		setmetatable(self, tempMT)
-		if self.CID == THREAD_ID then return self end
-		thread:newThread("STC_CONN_MAN"..name,function()
-			local item
-			local link_self_ref = multi:newSystemThreadedQueue()
-			self.subscribe:push{self.CONN, link_self_ref}
-			while true do
-				item = thread.hold(function()
-					return link_self_ref:peek()
-				end)
-				if item[1] == self.PING then
-					link_self_ref:push{self.PONG}
-					link_self_ref:pop()
-				elseif item[1] == self.CONN then
-					if item[2].Name ~= link_self_ref.Name then
-						table.insert(self.links, item[2])
-					end
-					link_self_ref:pop()
-				elseif item[1] == self.TRIG then
-					self.proxy_conn:Fire(multi.unpack(item[2]))
-					link_self_ref:pop()
-				else
-					-- This shouldn't be the case
-				end
-			end
-		end)
-		return self
-	end
-
-	if multi.isMainThread then
-		multi.integration.GLOBAL[name] = c
-	else
-		GLOBAL[name] = c
-	end
-
-	self:create(c)
-
-	return c
-end
-require("multi.integration.sharedExtensions")

integration/lanesManager/init.lua

@@ -1,205 +0,0 @@
---[[
-MIT License
-
-Copyright (c) 2022 Ryan Ward
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sub-license, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-]]
-
-package.path = "?/init.lua;?.lua;" .. package.path
-multi, thread = require("multi"):init() -- get it all and have it on all lanes
-if multi.integration then -- This allows us to call the lanes manager from supporting modules without a hassle
-	return {
-		init = function()
-			return multi.integration.GLOBAL, multi.integration.THREAD
-		end
-	}
-end
--- Step 1 get lanes
-lanes = require("lanes").configure()
-multi.SystemThreads = {}
-multi.isMainThread = true
-
-_G.THREAD_NAME = "MAIN_THREAD"
-_G.THREAD_ID = 0
-
-function multi:canSystemThread()
-	return true
-end
-
-function multi:getPlatform()
-	return "lanes"
-end
-
--- Step 2 set up the Linda objects
-local __GlobalLinda = lanes.linda() -- handles global stuff
-local __SleepingLinda = lanes.linda() -- handles sleeping stuff
-local __ConsoleLinda = lanes.linda() -- handles console stuff
-local __StatusLinda = lanes.linda() -- handles pushstatus for stfunctions
-
-local GLOBAL,THREAD = require("multi.integration.lanesManager.threads").init(__GlobalLinda, __SleepingLinda, __StatusLinda, __ConsoleLinda)
-local count = 1
-local started = false
-local livingThreads = {}
-
-function THREAD:newFunction(func, holdme)
-	return thread:newFunctionBase(function(...)
-		return multi:newSystemThread("TempSystemThread",func,...)
-	end, holdme, multi.registerType("s_function"))()
-end
-
-function multi:newSystemThread(name, func, ...)
-	local name = name or multi.randomString(16)
-	multi.InitSystemThreadErrorHandler()
-	local rand = math.random(1, 10000000)
-	local return_linda = lanes.linda()
-	c = {}
-	c.Name = name
-	c.ID = count
-	c.loadString = {"base","package","os","io","math","table","string","coroutine"}
-	livingThreads[count] = {true, name}
-	c.returns = return_linda
-	c.Type = multi.registerType("s_thread")
-	c.creationTime = os.clock()
-	c.alive = true
-	c.priority = THREAD.Priority_Normal
-	local multi_settings = multi.defaultSettings
-	local globe = {
-		THREAD_NAME = name,
-		THREAD_ID = count,
-		THREAD = THREAD,
-		GLOBAL = GLOBAL,
-		_Console = __ConsoleLinda,
-		_DEFER = {}
-	}
-	if GLOBAL["__env"] then
-		for i,v in pairs(GLOBAL["__env"]) do
-			globe[i] = v
-		end
-	end
-	c.thread = lanes.gen("*",
-	{
-		globals = globe,
-		priority = c.priority
-	},function(...)
-		multi, thread = require("multi"):init(multi_settings)
-		require("multi.integration.lanesManager.extensions")
-		require("multi.integration.sharedExtensions")
-		local has_error = true
-		returns = {pcall(func, ...)}
-		return_linda:set("returns", returns)
-		for i,v in pairs(_DEFER) do
-			pcall(v)
-		end
-		has_error = false
-	end)(...)
-	count = count + 1
-	function c:getName()
-		return c.Name
-	end
-	function c:kill()
-		self.thread:cancel()
-		self.alive = false
-	end
-	table.insert(multi.SystemThreads, c)
-	c.OnDeath = multi:newConnection()
-	c.OnError = multi:newConnection()
-	GLOBAL["__THREADS__"] = livingThreads
-	c.OnError(multi.error)
-
-	if self.isActor then
-		self:create(c)
-	else
-		multi.create(multi, c)
-	end
-
-	return c
-end
-
-THREAD.newSystemThread = function(...)
-    multi:newSystemThread(...)
-end
-
-function multi.InitSystemThreadErrorHandler()
-	if started == true then
-		return
-	end
-	started = true
-	thread:newThread("SystemThreadScheduler",function()
-		local threads = multi.SystemThreads
-		local _,data,status,push,temp
-		while true do
-			thread.yield()
-			_,data = __ConsoleLinda:receive(0, "Q")
-			if data then
-				--print(data[1])
-			end
-			for i = #threads, 1, -1 do
-				temp = threads[i]
-				status = temp.thread.status
-				push = __StatusLinda:get(temp.ID)
-				if push then
-					temp.statusconnector:Fire(multi.unpack(({__StatusLinda:receive(nil, temp.ID)})[2]))
-				end
-				if status == "done" or temp.returns:get("returns") then
-					returns = ({temp.returns:receive(0, "returns")})[2]
-					livingThreads[temp.ID] = {false, temp.Name}
-					temp.alive = false
-					if returns[1] == false then
-						temp.OnError:Fire(temp, returns[2])
-					else
-						table.remove(returns,1)
-						temp.OnDeath:Fire(multi.unpack(returns))
-					end
-					GLOBAL["__THREADS__"] = livingThreads
-					table.remove(threads, i)
-				elseif status == "running" then
-					--
-				elseif status == "waiting" then
-					--
-				elseif status == "error" then
-					-- The thread never really errors, we handle this through our linda object
-				elseif status == "cancelled" then
-					livingThreads[temp.ID] = {false, temp.Name}
-					temp.alive = false
-					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,"thread_killed")
-					GLOBAL["__THREADS__"] = livingThreads
-					table.remove(threads, i)
-				end
-			end
-		end
-	end).OnError(multi.error)
-end
-
-multi.print("Integrated Lanes Threading!")
-multi.integration = {} -- for module creators
-multi.integration.GLOBAL = GLOBAL
-multi.integration.THREAD = THREAD
-require("multi.integration.lanesManager.extensions")
-return {
-	init = function()
-		return GLOBAL, THREAD
-	end
-}

integration/loveManager/extensions.lua

@@ -1,244 +0,0 @@
-if not ISTHREAD then
-	multi, thread = require("multi").init()
-	GLOBAL = multi.integration.GLOBAL
-	THREAD = multi.integration.THREAD
-end
-
-function multi:newSystemThreadedQueue(name)
-	local name = name or multi.randomString(16)
-
-	local c = {}
-
-	c.Name = name
-	c.Type = multi.registerType("s_queue")
-    c.chan = love.thread.getChannel(name)
-
-    function c:push(dat)
-        self.chan:push(THREAD.packValue(dat))
-    end
-
-    function c:pop()
-		return THREAD.unpackValue(self.chan:pop())
-    end
-
-    function c:peek()
-		return THREAD.unpackValue(self.chan:peek())
-    end
-
-    function c:init()
-		self.chan = love.thread.getChannel(self.Name)
-        return self
-    end
-
-    function c:Hold(opt)
-		local multi, thread = require("multi"):init()
-        if opt.peek then
-            return thread.hold(function()
-                return self:peek()
-            end)
-        else
-            return thread.hold(function()
-                return self:pop()
-            end)
-        end
-	end
-
-    GLOBAL[name] = c
-
-	self:create(c)
-
-	return c
-end
-
-function multi:newSystemThreadedTable(name)
-	local name = name or multi.randomString(16)
-    
-	local c = {}
-
-    c.Name = name
-	c.Type = multi.registerType("s_table")
-    c.tab = THREAD.createTable(name)
-
-    function c:init()
-        self.tab = THREAD.createTable(self.Name)
-        setmetatable(self,{
-            __index = function(t, k)
-                return self.tab[k]
-            end,
-            __newindex = function(t,k,v)
-                self.tab[k] = v
-            end
-        })
-        return self
-    end
-
-	c.__init = c.init
-
-    function c:Hold(opt)
-		local multi, thread = require("multi"):init()
-        if opt.key then
-            return thread.hold(function()
-                return self.tab[opt.key]
-            end)
-        else
-            multi.error("Must provide a key to check opt.key = 'key'")
-        end
-    end
-
-    setmetatable(c,{
-        __index = function(t, k)
-            return c.tab[k]
-        end,
-        __newindex = function(t,k,v)
-            c.tab[k] = v
-        end
-    })
-
-    GLOBAL[name] = c
-
-	self:create(c)
-
-	return c
-end
-
-local jqc = 1
-function multi:newSystemThreadedJobQueue(n)
-	local c = {}
-
-	c.cores = n or THREAD.getCores()
-	c.registerQueue = {}
-	c.Type = multi.registerType("s_jobqueue")
-	c.funcs = THREAD.createTable("__JobQueue_"..jqc.."_table")
-	c.queue = multi:newSystemThreadedQueue("__JobQueue_"..jqc.."_queue")
-	c.queueReturn = multi:newSystemThreadedQueue("__JobQueue_"..jqc.."_queueReturn")
-	c.queueAll = multi:newSystemThreadedQueue("__JobQueue_"..jqc.."_queueAll")
-	c.id = 0
-	c.OnJobCompleted = multi:newConnection()
-
-	local allfunc = 0
-
-	function c:doToAll(func)
-		for i = 1, self.cores do
-			self.queueAll:push({allfunc, func})
-		end
-		allfunc = allfunc + 1
-	end
-	function c:registerFunction(name, func)
-		if self.funcs[name] then
-			multi.error("A function by the name "..name.." has already been registered!") 
-		end
-		self.funcs[name] = func
-	end
-	function c:pushJob(name,...)
-		self.id = self.id + 1
-		self.queue:push{name,self.id,...}
-		return self.id
-	end
-	function c:isEmpty()
-        return queueJob:peek()==nil
-    end
-	local nFunc = 0
-    function c:newFunction(name,func,holup) -- This registers with the queue
-        if type(name)=="function" then
-            holup = func
-            func = name
-            name = "JQ_Function_"..nFunc
-        end
-        nFunc = nFunc + 1
-        c:registerFunction(name,func)
-        return thread:newFunction(function(...)
-            local id = c:pushJob(name,...)
-            local link
-            local rets
-            link = c.OnJobCompleted(function(jid,...)
-                if id==jid then
-                    rets = multi.pack(...)
-                end
-            end)
-            return thread.hold(function()
-                if rets then
-                    return multi.unpack(rets) or multi.NIL
-                end
-            end)
-        end,holup),name
-    end
-	thread:newThread("jobManager",function()
-		while true do
-			thread.yield()
-			local dat = c.queueReturn:pop()
-			if dat then
-				c.OnJobCompleted:Fire(multi.unpack(dat))
-			end
-		end
-	end)
-	for i=1,c.cores do
-		multi:newSystemThread("JobQueue_"..jqc.."_worker_"..i,function(jqc)
-			local multi, thread = require("multi"):init()
-			require("love.timer")
-			love.timer.sleep(1)
-			local clock = os.clock
-			local funcs = THREAD.createTable("__JobQueue_"..jqc.."_table")
-			local queue = THREAD.waitFor("__JobQueue_"..jqc.."_queue")
-			local queueReturn = THREAD.waitFor("__JobQueue_"..jqc.."_queueReturn")
-			local lastProc = clock()
-			local queueAll = THREAD.waitFor("__JobQueue_"..jqc.."_queueAll")
-			local registry = {}
-			_G["__QR"] = queueReturn
-			setmetatable(_G,{__index = funcs})
-			thread:newThread("startUp",function()
-				while true do
-					thread.yield()
-					local all = queueAll:peek()
-					if all and not registry[all[1]] then
-						lastProc = os.clock()
-						queueAll:pop()[2]()
-					end
-				end
-			end)
-			thread:newThread("runner",function()
-				thread.sleep(.1)
-				while true do
-					thread.yield()
-					local all = queueAll:peek()
-					if all and not registry[all[1]] then
-						lastProc = os.clock()
-						queueAll:pop()[2]()
-					end
-					local dat = thread.hold(queue)
-					if dat then
-						multi:newThread("Test",function()
-							lastProc = os.clock()
-							local name = table.remove(dat,1)
-							local id = table.remove(dat,1)
-							local tab = {funcs[name](multi.unpack(dat))}
-							table.insert(tab,1,id)
-							--local test = queueReturn.push
-							queueReturn:push(tab)
-						end)
-					end
-				end
-			end)
-			thread:newThread("Idler",function()
-				while true do
-					thread.yield()
-					if clock()-lastProc> 2 then
-						THREAD.sleep(.05)
-					else
-						THREAD.sleep(.001)
-					end
-				end
-			end)
-			multi:mainloop()
-		end,jqc)
-	end
-
-    function c:Hold(opt)
-        return thread.hold(self.OnJobCompleted)
-    end
-
-	jqc = jqc + 1
-
-	self:create(c)
-
-	return c
-end

integration/loveManager/init.lua

@@ -1,137 +0,0 @@
-if ISTHREAD then
-    error("You cannot require the loveManager from within a thread!")
-end
-
-local ThreadFileData = [[
-ISTHREAD = true
-args = {...}
-THREAD_ID = args[1]
-THREAD_NAME = args[2]
-GLOBAL, THREAD, DEFER = require("multi.integration.loveManager.threads"):init()
-__FUNC = THREAD.unpackValue(args[3])
-ARGS = THREAD.unpackValue(args[4])
-settings = args[5]
-if ARGS == nil then ARGS = {} end
-math.randomseed(THREAD_ID)
-math.random()
-math.random()
-math.random()
-stab = THREAD.createTable(THREAD_NAME .. THREAD_ID)
-if GLOBAL["__env"] then
-    local env = THREAD.getENV()
-    for i,v in pairs(env) do
-        _G[i] = v
-    end
-end
-multi, thread = require("multi"):init{error=true, warning=true, print=true, priority=true}
-multi.defaultSettings.print = true
-require("multi.integration.loveManager.extensions")
-require("multi.integration.sharedExtensions")
-local returns = {pcall(__FUNC, multi.unpack(ARGS))}
-table.remove(returns,1)
-stab["returns"] = returns
-for i,v in pairs(DEFER) do
-    pcall(v)
-end
-]]
-
-_G.THREAD_NAME = "MAIN_THREAD"
-_G.THREAD_ID = 0
-
-local multi, thread = require("multi"):init()
-local GLOBAL, THREAD = require("multi.integration.loveManager.threads"):init()
-
-multi.registerType("s_function")
-multi.registerType("s_thread")
-
-multi.integration = {}
-multi.isMainThread = true
-local threads = {}
-local tid = 0
-function multi:newSystemThread(name, func, ...)
-    multi.InitSystemThreadErrorHandler()
-    local name = name or multi.randomString(16)
-    tid = tid + 1
-    local c = {}
-    c.Type = multi.STHREAD
-    c.Name = name
-    c.ID = tid
-    c.thread = love.thread.newThread(ThreadFileData)
-    c.thread:start(c.ID, c.Name, THREAD.packValue(func), THREAD.packValue({...}), multi.defaultSettings)
-    c.stab = THREAD.createTable(name .. c.ID)
-    c.creationTime = os.clock()
-    c.OnDeath = multi:newConnection()
-    c.OnError = multi:newConnection()
-    c.status_channel = love.thread.getChannel("__status_channel__" .. c.ID)
-
-    function c:getName() return c.name end
-
-    table.insert(threads, c)
-
-    c.OnError(multi.error)
-
-    if self.isActor then
-		self:create(c)
-	else
-		multi.create(multi, c)
-	end
-
-    return c
-end
-
-local started = false
-local console_channel = love.thread.getChannel("__console_channel__")
-
-function THREAD:newFunction(func, holdme)
-    return thread:newFunctionBase(function(...)
-        return multi:newSystemThread("SystemThreaded Function Handler", func, ...)
-    end, holdme, multi.SFUNCTION)()
-end
-
-function love.threaderror(thread, errorstr)
-    multi.error("Thread error! " .. errorstr)
-end
-
-function multi.InitSystemThreadErrorHandler()
-	if started == true then return end
-	started = true
-    thread:newThread("Love System Thread Handler", function()
-        while true do
-            thread.yield()
-            for i = #threads, 1, -1 do
-                local th = threads[i]
-                if th.status_channel:peek() ~= nil then
-                    th.statusconnector:Fire(multi.unpack(th.status_channel:pop()))
-                end
-                local th_err = th.thread:getError()
-                if th_err == "Thread Killed!\1" then
-                    th.OnDeath:Fire("Thread Killed!")
-                    table.remove(threads, i)
-                elseif th_err then
-                    th.OnError:Fire(th, th_err)
-                    table.remove(threads, i)
-                elseif th.stab.returns then
-                    th.OnDeath:Fire(multi.unpack(th.stab.returns))
-                    th.stab.returns = nil
-                    table.remove(threads, i)
-                end
-            end
-        end
-    end)
-end
-
-THREAD.newSystemThread = function(...)
-    multi:newSystemThread(...)
-end
-
-multi.integration.GLOBAL = GLOBAL
-multi.integration.THREAD = THREAD
-require("multi.integration.loveManager.extensions")
-require("multi.integration.sharedExtensions")
-multi.print("Integrated Love Threading!")
-
-return {
-    init = function()
-        return GLOBAL, THREAD
-    end
-}

integration/loveManager/threads.lua

@@ -1,228 +0,0 @@
---[[
-MIT License
-
-Copyright (c) 2022 Ryan Ward
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sub-license, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-]]
-require("love.timer")
-require("love.system")
-require("love.data")
-require("love.thread")
-local multi, thread = require("multi"):init()
-
--- Checks if the given value is a LOVE2D object (i.e. has metatable with __index field) and if that __index field contains functions typical of LOVE2D objects
-function isLoveObject(value)
-    -- Check if the value has metatable
-    if type(value) == "userdata" and getmetatable(value) then
-        -- Check if the metatable has the __index field
-        local index = getmetatable(value).__index
-        if type(index) == "table" then
-            -- Check if the metatable's __index table contains functions typical of LOVE2D objects
-            if index.draw or index.update or index.getWidth or index.getHeight or index.getString or index.getPointer then
-                return true
-            end
-        end
-    end
-    return false
-end
-
--- Converts any function values in a table to a string with the value "\1\2:func:<function_string>" where <function_string> is the Lua stringified version of the function
-function tableToFunctionString(t)
-    if type(t) == "nil" then return "\1\2:nil:" end
-    if type(t) == "function" then return "\1\2:func:"..string.dump(t) end
-    if type(t) ~= "table" then return t end
-    local newtable = {}
-    for k, v in pairs(t) do
-        if type(v) == "function" then
-            newtable[k] = "\1\2:func:"..string.dump(v)
-        elseif type(v) == "table" then
-            newtable[k] = tableToFunctionString(v)
-        elseif isLoveObject(v) then
-            newtable[k] = v
-        elseif type(v) == "userdata" then
-            newtable[k] = tostring(v)
-        else
-            newtable[k] = v
-        end
-    end
-    return newtable
-end
-
--- Converts strings with the value "\1\2:func:<function_string>" back to functions
-function functionStringToTable(t)
-    if type(t) == "string" and t:sub(1, 8) == "\1\2:func:" then return loadstring(t:sub(9, -1)) end
-    if type(t) == "string" and t:sub(1, 7) == "\1\2:nil:" then return nil end
-    if type(t) ~= "table" then return t end
-    for k, v in pairs(t) do
-        if type(v) == "string" then
-            if v:sub(1, 8) == "\1\2:func:" then
-                t[k] = loadstring(v:sub(9, -1))
-            else
-                t[k] = v
-            end
-        elseif type(v) == "table" then
-            t[k] = functionStringToTable(v)
-        else
-            t[k] = v
-        end
-    end
-    if t.init then
-        t:init()
-    end
-    return t
-end
-
-local function packValue(t)
-    return tableToFunctionString(t)
-end
-
-local function unpackValue(t)
-    return functionStringToTable(t)
-end
-
-local function createTable(n)
-    if not n then
-        n = "STAB"..multi.randomString(8)
-    end
-    local __proxy = {}
-    local function set(name, val)
-        local chan = love.thread.getChannel(n .. name)
-        if chan:getCount() == 1 then chan:pop() end
-        __proxy[name] = true
-        chan:push(packValue(val))
-    end
-    local function get(name)
-        return unpackValue(love.thread.getChannel(n .. name):peek())
-        -- if type(data) == "table" and data.init then
-        --     return data:init()
-        -- else
-        --     return data
-        -- end
-    end
-    return setmetatable({},
-        {
-            __index = function(t, k)
-                return get(k)
-            end,
-            __newindex = function(t, k, v)
-                set(k,v)
-            end
-        }
-    )
-end
-
-function INIT()
-    local GLOBAL, THREAD, DEFER = createTable("__GLOBAL__"), {}, {}
-    local status_channel, console_channel = love.thread.getChannel("__status_channel__" .. THREAD_ID), 
-                                            love.thread.getChannel("__console_channel__")
-
-    -- Non portable methods, shouldn't be used unless you know what you are doing
-    THREAD.packValue = packValue
-    THREAD.unpackValue = unpackValue
-    THREAD.createTable = createTable
-
-    function THREAD.set(name, val)
-        GLOBAL[name] = val
-    end
-
-    function THREAD.get(name, val)
-        return GLOBAL[name]
-    end
-
-    THREAD.waitFor = thread:newFunction(function(name)
-        local function wait()
-            math.randomseed(os.time())
-            thread.yield()
-        end
-        repeat
-            wait()
-        until GLOBAL[name] ~= nil
-        return GLOBAL[name]
-    end, true)
-
-    function THREAD.getCores()
-        return love.system.getProcessorCount()
-    end
-
-    function THREAD.getConsole()
-        local c = {}
-        c.queue = console_channel
-        function c.print(...)
-            c.queue:push(table.concat(multi.pack(...), "\t"))
-        end
-        function c.error(err)
-            c.queue:push("Error in <"..THREAD_NAME..":" .. THREAD_ID .. ">: ".. err)
-            multi.error(err)
-        end
-        return c
-    end
-
-    function THREAD.getThreads()
-        --
-    end
-
-    function THREAD.kill() -- trigger the lane destruction
-        error("Thread was killed!\1")
-    end
-
-    function THREAD.pushStatus(...)
-        status_channel:push(multi.pack(...))
-    end
-
-    function THREAD.sleep(n)
-        love.timer.sleep(n)
-    end
-
-    THREAD.hold = thread:newFunction(function(n)
-        thread.hold(n)
-    end, true)
-
-    function THREAD.setENV(env, name)
-        GLOBAL[name or "__env"] = env
-    end
-
-    function THREAD.getENV(name)
-        return GLOBAL[name or "__env"]
-    end
-
-    function THREAD.exposeENV(name)
-        name = name or "__env"
-        local env = THREAD.getENV(name)
-        for i,v in pairs(env) do
-            _G[i] = v
-        end
-    end
-
-    function THREAD.defer(func)
-        table.insert(DEFER, func)
-    end
-
-    function THREAD.sync()
-        -- Maybe do something...
-    end
-
-    return GLOBAL, THREAD, DEFER
-end
-
-return {
-    init = function()
-        return INIT()
-    end
-}

integration/priorityManager/init.lua

@@ -1,213 +0,0 @@
--- Advanced process management. Mutates the multi namespace
-local multi, thread = require("multi"):init()
-local ok, chronos = pcall(require, "chronos") -- hpc
-
-if not ok then chronos = nil end
-
--- This is an integration, we cannot directly access locals that are in the main file.
-
-local PList = {
-	multi.Priority_Core,
-	multi.Priority_Very_High,
-	multi.Priority_High,
-	multi.Priority_Above_Normal,
-	multi.Priority_Normal,
-	multi.Priority_Below_Normal,
-	multi.Priority_Low,
-	multi.Priority_Very_Low,
-	multi.Priority_Idle
-}
-
--- Restructered these functions since they rely on local variables from the core library
-
-local mainloop = multi.mainloopRef
-local mainloop_p = multi.mainloop_p
-local uManagerRef = multi.uManagerRef
-local uManagerRefP = multi.uManagerRefP1
-
-local PROFILE_COUNT = 5
-
--- self:setCurrentProcess() a bit slower than using the local var, but there isn't another option
-
-local priorityManager = multi:newProcessor("Priority Manager", true)
-priorityManager.newThread = function() multi.warn("You cannot spawn threads on the priority manager!") end
-
-priorityManager.setPriorityScheme = function() multi.warn("You cannot set priority on the priorityManager!") end
-
-local function average(t)
-	local sum = 0
-	for _,v in pairs(t) do
-		sum = sum + v
-	end
-	return sum / #t
-end
-
-local function getPriority(obj)
-	local avg = average(obj.__profiling)
-	if avg < 0.0002 then
-		return PList[1]
-	elseif avg < 0.0004 then
-		return PList[2]
-	elseif avg < 0.0008 then
-		return PList[3]
-	elseif avg < 0.001 then
-		return PList[4]
-	elseif avg < 0.0025 then
-		return PList[5]
-	elseif avg < 0.005 then
-		return PList[6]
-	elseif avg < 0.008 then
-		return PList[7]
-	elseif avg < 0.01 then
-		return PList[8]
-	else
-		return PList[9]
-	end
-end
-
-local start, stop
-
-priorityManager.uManager = function(self)
-	-- proc.run already checks if the processor is active
-	self:setCurrentProcess()
-	local Loop=self.Mainloop
-	local ctask
-	for _D=#Loop,1,-1 do
-		ctask = Loop[_D]
-		ctask:setCurrentTask()
-		start = chronos.nanotime()
-		if ctask:Act() then
-			stop = chronos.nanotime()
-			if ctask.__profiling then
-				table.insert(ctask.__profiling, stop - start)
-			end
-			if ctask.__profiling and #ctask.__profiling == PROFILE_COUNT then
-				ctask:setPriority(getPriority(ctask))
-				ctask:reallocate(ctask.__restoreProc)
-				ctask.__restoreProc = nil
-				ctask.__profiling = nil
-			end
-		end
-		self:setCurrentProcess()
-	end
-end
-
-local function processHook(obj, proc)
-	if obj.Type == multi.registerType("process", "processes") or not(obj.IsAnActor) then return end
-	obj.__restoreProc = proc
-	obj.__profiling = {}
-	obj:reallocate(priorityManager)
-end
-
-local function init()
-	local registry = {}
-
-    multi.priorityScheme = {
-        RoundRobin = "RoundRobin",
-        PriorityBased = "PriorityBased",
-        TimeBased = "TimeBased"
-    }
-
-	function multi:setProfilerCount(count)
-		PROFILE_COUNT = count
-	end
-
-	function multi:recalibrate()
-		if self.__processConn then
-			local items = self.Mainloop
-			for i,v in pairs(items) do
-				processHook(v, self)
-			end
-		else
-			multi.error("Cannot recalibrate the priority if not using Time based mangement!")
-		end
-	end
-
-	function multi:isRegistredScheme(scheme)
-		return registry[name] ~= nil
-	end
-
-	function multi:getRegisteredScheme(scheme)
-		return registry[name].mainloop, registry[name].umanager, registry[name].condition
-	end
-
-	local empty_func = function() return true end
-	function multi:registerScheme(name,options)
-		local mainloop = options.mainloop or multi.error("You must provide a mainloop option when registring a scheme!")
-		local umanager = options.umanager or multi.error("You must provide a umanager option when registring a scheme!")
-
-		if not options.condition then 
-			multi.warn("You might want to use condition when registring a scheme! A function that returns true has been auto generated for you!")
-		end
-
-		local condition = options.condition or empty_func
-
-		if registry[name] and not registry[name].static then 
-			multi.warn("A scheme named: \"" .. name .. "\" has already been registred, overriting!") 
-		else
-			multi.error("A scheme named: \"" .. name .. "\" has already been registred!")
-		end
-
-		registry[name] = {
-			mainloop = mainloop,
-			umanager = umanger,
-			condition = condition,
-			static = options.static or false
-		}
-
-		multi.priorityScheme[name] = name
-
-		return true
-	end
-
-    function multi:setPriorityScheme(scheme)
-
-        if not self.Type == multi.registerType("process", "processes") or not self.Type == multi.registerType("rootprocess") then
-			multi.warn("You should only invoke setPriorityScheme on a processor object!")
-		end
-
-        if scheme == multi.priorityScheme.RoundRobin then
-			if self.__processConn then self.OnObjectCreated:Unconnect(self.__processConn) self.__processConn = nil end
-			self.mainloop = mainloop
-			self.uManager = uManagerRef
-		elseif scheme == multi.priorityScheme.PriorityBased then
-			if self.__processConn then self.OnObjectCreated:Unconnect(self.__processConn) self.__processConn = nil end
-			self.mainloop = mainloop_p
-			self.uManager = uManagerRefP
-		elseif scheme == multi.priorityScheme.TimeBased then
-			if not chronos then return multi.warn("Unable to use TimeBased Priority without the chronos library!") end
-			if self.__processConn then multi.warn("Already enabled TimeBased Priority!") end
-			self.__processConn = self.OnObjectCreated(processHook)
-			self.mainloop = mainloop_p
-			self.uManager = uManagerRefP
-		elseif self:isRegistredScheme(scheme) then
-			local mainloop, umanager, condition = self:getRegisteredScheme(scheme)
-			if condition() then
-				self.mainloop = mainloop
-				self.uManager = umanager
-			end
-		else
-			self.error("Invalid priority scheme selected!")
-		end
-
-    end
-end
-
-local function init_chronos()
-	-- Let's implement a higher precision clock
-	multi.setClock(chronos.nanotime) -- This is also in .000 format. So a plug and play works.
-	thread:newThread("System Priority Manager", function()
-		while true do
-			thread.yield()
-			priorityManager.run()
-		end
-	end)
-end
-
-if chronos then
-    init_chronos()
-else
-    multi.warn("In order to have time based priority management, you need to install the chronos library!")
-end
-
-init()

integration/pseudoManager/extensions.lua

@@ -1,221 +0,0 @@
---[[
-MIT License
-
-Copyright (c) 2022 Ryan Ward
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sub-license, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-]]
-local multi, thread = require("multi"):init()
-local GLOBAL, THREAD = multi.integration.GLOBAL, multi.integration.THREAD
-
-local function stripUpValues(func)
-    local dmp = string.dump(func)
-    if setfenv then
-        return loadstring(dmp,"IsolatedThread_PesudoThreading")
-    else
-        return load(dmp,"IsolatedThread_PesudoThreading","bt")
-    end
-end
-
-function multi:newSystemThreadedQueue(name)
-	local c = {}
-	c.data = {}
-	c.Type = multi.registerType("s_queue")
-	function c:push(v)
-		table.insert(self.data,v)
-	end
-	function c:pop()
-		return table.remove(self.data,1)
-	end
-	function c:peek()
-		return self.data[1]
-	end
-	function c:init()
-		return self
-	end
-    function c:Hold(opt)
-        if opt.peek then
-            return thread.hold(function()
-                return self:peek()
-            end)
-        else
-            return thread.hold(function()
-                return self:pop()
-            end)
-        end
-	end
-	GLOBAL[name or "_"] = c
-	return c
-end
-
-function multi:newSystemThreadedTable(name)
-    local c = {}
-	c.Type = multi.registerType("s_table")
-    function c:init()
-        return self
-    end
-    function c:Hold(opt)
-        if opt.key then
-            return thread.hold(function()
-                return self.tab[opt.key]
-            end)
-        else
-            multi.error("Must provide a key to check opt.key = 'key'")
-        end
-    end
-    GLOBAL[name or "_"] = c
-	return c
-end
-
-local setfenv = multi.isolateFunction
-
-local jqc = 1
-function multi:newSystemThreadedJobQueue(n)
-	local c = {}
-
-	c.cores = n or THREAD.getCores()
-	c.registerQueue = {}
-	c.Type = multi.registerType("s_jobqueue")
-	c.funcs = multi:newSystemThreadedTable("__JobQueue_"..jqc.."_table")
-	c.queue = multi:newSystemThreadedQueue("__JobQueue_"..jqc.."_queue")
-	c.queueReturn = multi:newSystemThreadedQueue("__JobQueue_"..jqc.."_queueReturn")
-	c.queueAll = multi:newSystemThreadedQueue("__JobQueue_"..jqc.."_queueAll")
-	c.id = 0
-	c.OnJobCompleted = multi:newConnection()
-
-	local allfunc = 0
-
-	function c:doToAll(func)
-		for i = 1, self.cores do
-			self.queueAll:push({allfunc, func})
-		end
-		allfunc = allfunc + 1
-	end
-	function c:registerFunction(name, func)
-		if self.funcs[name] then
-			multi.error("A function by the name "..name.." has already been registered!") 
-		end
-		self.funcs[name] = func
-	end
-	function c:pushJob(name,...)
-		self.id = self.id + 1
-		self.queue:push{name,self.id,...}
-		return self.id
-	end
-	function c:isEmpty()
-        return queueJob:peek()==nil
-    end
-	local nFunc = 0
-    function c:newFunction(name,func,holup) -- This registers with the queue
-        if type(name)=="function" then
-            holup = func
-            func = name
-            name = "JQ_Function_"..nFunc
-        end
-        nFunc = nFunc + 1
-        c:registerFunction(name,func)
-        return thread:newFunction(function(...)
-            local id = c:pushJob(name,...)
-            local link
-            local rets
-            link = c.OnJobCompleted(function(jid,...)
-                if id==jid then
-                    rets = multi.pack(...)
-                end
-            end)
-            return thread.hold(function()
-                if rets then
-                    return multi.unpack(rets) or multi.NIL
-                end
-            end)
-        end,holup),name
-    end
-	thread:newThread("jobManager",function()
-		while true do
-			thread.yield()
-			local dat = c.queueReturn:pop()
-			if dat then
-				c.OnJobCompleted:Fire(multi.unpack(dat))
-			end
-		end
-	end)
-	for i=1,c.cores do
-		multi:newSystemThread("STJQ_"..multi.randomString(8),function(jqc)
-			local GLOBAL, THREAD = require("multi.integration.pseudoManager"):init()
-			local multi, thread = require("multi"):init()
-			local clock = os.clock
-			local funcs = THREAD.waitFor("__JobQueue_"..jqc.."_table")
-			local queue = THREAD.waitFor("__JobQueue_"..jqc.."_queue")
-			local queueReturn = THREAD.waitFor("__JobQueue_"..jqc.."_queueReturn")
-			local queueAll = THREAD.waitFor("__JobQueue_"..jqc.."_queueAll")
-			local registry = {}
-			_G["__QR"] = queueReturn
-			setmetatable(_G,{__index = funcs})
-			thread:newThread("startUp",function()
-				while true do
-					thread.yield()
-					local all = queueAll:peek()
-					if all and not registry[all[1]] then
-						queueAll:pop()[2]()
-					end
-				end
-			end)
-			thread:newThread("runner",function()
-				thread.sleep(.1)
-				while true do
-					thread.yield()
-					local all = queueAll:peek()
-					if all and not registry[all[1]] then
-						queueAll:pop()[2]()
-					end
-					local dat = thread.hold(queue)
-					if dat then
-						multi:newThread("JobSubRunner",function()
-							local name = table.remove(dat,1)
-							local id = table.remove(dat,1)
-							local tab = {multi.isolateFunction(funcs[name],_G)(multi.unpack(dat))}
-							table.insert(tab,1,id)
-							queueReturn:push(tab)
-						end)
-					end
-				end
-			end)
-			multi:mainloop()
-		end, jqc)
-	end
-
-    function c:Hold(opt)
-        return thread.hold(self.OnJobCompleted)
-    end
-
-	jqc = jqc + 1
-
-	self:create(c)
-
-	return c
-end
-
-function multi:newSystemThreadedConnection(name)
-	local conn = multi:newConnection()
-	conn.init = function(self) return self end
-	GLOBAL[name or "_"] = conn
-	return conn
-end
-
-require("multi.integration.sharedExtensions")

integration/sharedExtensions/init.lua

@@ -1,336 +0,0 @@
---[[ todo finish the targeted job!
-MIT License
-
-Copyright (c) 2023 Ryan Ward
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sub-license, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-]]
-
-local multi, thread = require("multi"):init()
-
--- Returns a handler that allows a user to interact with an object on another thread!
--- Create on the thread that you want to interact with, send over the handle
-
-function multi:chop(obj)
-	if not _G["UIDS"] then
-		_G["UIDS"] = {}
-	end
-	local multi, thread = require("multi"):init()
-	local list = {[0] = multi.randomString(12)}
-	_G[list[0]] = obj
-	for i,v in pairs(obj) do
-		if type(v) == "function" or type(v) == "table" and v.Type == multi.registerType("s_function") then
-			table.insert(list, i)
-		elseif type(v) == "table" and v.Type == multi.registerType("connector", "connections") then	
-			table.insert(list, {i, multi:newProxy(multi:chop(v)):init()})
-		end
-	end
-	return list
-end
-
-function multi:newProxy(list)
-	
-	local c = {}
-
-	c.name = multi.randomString(12)
-	c.is_init = false
-	local multi, thread = nil, nil
-	function c:init()
-		local multi, thread = nil, nil
-		local function copy(obj)
-			if type(obj) ~= 'table' then return obj end
-			local res = {}
-			for k, v in pairs(obj) do res[copy(k)] = copy(v) end
-			return res
-		end
-		if not(self.is_init) then
-			THREAD.sync()
-			self.is_init = true
-			local multi, thread = require("multi"):init()
-			self.proxy_link = "PL" .. multi.randomString(12)
-
-			if multi.integration then
-				GLOBAL = multi.integration.GLOBAL
-				THREAD = multi.integration.THREAD
-			end
-
-			GLOBAL[self.proxy_link] = self
-
-			local function check()
-				return self.send:pop()
-			end
-
-			self.send = multi:newSystemThreadedQueue(self.name.."_S"):init()
-			self.recv = multi:newSystemThreadedQueue(self.name.."_R"):init()
-			self.funcs = list
-			self._funcs = copy(list)
-			self.Type = multi.registerType("proxy", "proxies")
-			self.TID = THREAD_ID
-
-			thread:newThread("Proxy_Handler_" .. multi.randomString(4), function()
-				while true do
-					local data = thread.hold(check)
-					if data then
-						-- Let's not hold the main threadloop
-						thread:newThread("Temp_Thread", function()
-							local func = table.remove(data, 1)
-							local sref = table.remove(data, 1)
-							local ret
-							if sref then
-								ret = {_G[list[0]][func](_G[list[0]], multi.unpack(data))}
-							else
-								ret = {_G[list[0]][func](multi.unpack(data))}
-							end
-
-							for i = 1,#ret do
-								if type(ret[i]) == "table" and ret[i].Type ~= nil and ret[i].Type ~= multi.registerType("proxy", "proxies") then
-									ret[i] = "\1PARENT_REF"
-								end
-								if type(ret[i]) == "table" and getmetatable(ret[i]) then
-									setmetatable(ret[i],nil) -- remove that metatable, we do not need it on the other side!
-								end
-								if ret[i] == _G[list[0]] then
-									-- We cannot return itself, that return can contain bad values.
-									ret[i] = "\1SELF_REF"
-								end
-							end
-							table.insert(ret, 1, func)
-							self.recv:push(ret)
-						end)
-					end
-				end
-			end)
-			return self
-		else
-			THREAD.sync()
-			if not self.funcs then return self end
-			local function copy(obj)
-				if type(obj) ~= 'table' then return obj end
-				local res = {}
-				for k, v in pairs(obj) do res[copy(k)] = copy(v) end
-				return res
-			end
-			local multi, thread = require("multi"):init()
-			local me = self
-			local funcs = copy(self.funcs)
-			if multi.integration then
-				GLOBAL = multi.integration.GLOBAL
-				THREAD = multi.integration.THREAD
-			end
-			self.send = THREAD.waitFor(self.name.."_S"):init()
-			self.recv = THREAD.waitFor(self.name.."_R"):init()
-			self.Type = multi.registerType("proxy", "proxies")
-			for _,v in pairs(funcs) do
-				if type(v) == "table" then
-					-- We have a connection
-					v[2]:init(proc_name)
-					self[v[1]] = v[2]
-					v[2].Parent = self
-					setmetatable(v[2],getmetatable(multi:newConnection()))
-				else
-					self[v] = thread:newFunction(function(self,...)
-						if self == me then
-							me.send:push({v, true, ...})
-						else
-							me.send:push({v, false, ...})
-						end
-						return thread.hold(function()
-							local data = me.recv:peek()
-							if data and data[1] == v then
-								me.recv:pop()
-								table.remove(data, 1)
-								for i=1,#data do
-									if data[i] == "\1SELF_REF" then
-										data[i] = me
-									elseif data[i] == "\1PARENT_REF" then
-										data[i] = me.Parent
-									end
-								end
-								return multi.unpack(data)
-							end
-						end)
-					end, true)
-				end
-			end
-			return self
-		end
-	end
-	function c:getTransferable()
-		local cp = {}
-		local multi, thread = require("multi"):init()
-		local function copy(obj)
-			if type(obj) ~= 'table' then return obj end
-			local res = {}
-			for k, v in pairs(obj) do res[copy(k)] = copy(v) end
-			return res
-		end
-		cp.is_init = true
-		cp.proxy_link = self.proxy_link
-		cp.name = self.name
-		cp.funcs = copy(self._funcs)
-		cp.init = function(self)
-			local multi, thread = require("multi"):init()
-			if multi.integration then
-				GLOBAL = multi.integration.GLOBAL
-				THREAD = multi.integration.THREAD
-			end
-			local proxy = THREAD.waitFor(self.proxy_link)
-			proxy.funcs = self.funcs
-			return proxy:init()
-		end
-		return cp
-	end
-	self:create(c)
-	return c
-end
-
-local targets = {}
-local references = {}
-
-local jid = -1
-function multi:newSystemThreadedProcessor(cores)
-
-	local name = "STP_"..multi.randomString(4) -- set a random name if none was given.
-
-	local autoscale = autoscale or false -- Will scale up the number of cores that the process uses.
-	local c = {}
-	
-	setmetatable(c,{__index = multi})
-	
-	c.Type = multi.registerType("s_process", "s_processes")
-	c.threads = {}
-	c.cores = cores or 8
-	c.Name = name
-	c.Mainloop = {}
-	c.__count = 0
-	c.processors = {}
-	c.proc_list = {}
-	c.OnObjectCreated = multi:newConnection()
-	c.parent = self
-	c.jobqueue = multi:newSystemThreadedJobQueue(c.cores)
-
-	function c:pushJob(ID, name, ...)
-		local tq = THREAD.waitFor(self.Name .. "_target_tq_" .. ID):init()
-		tq:push{name, jid, multi.pack(...)}
-        jid = jid - 1
-        return jid + 1
-    end
-
-	c.jobqueue:registerFunction("packObj",function(obj)
-		local multi, thread = require("multi"):init()
-
-		local list = multi:chop(obj)
-		obj.__link_name = list[0]
-
-		local proxy = multi:newProxy(list):init()
-
-		return proxy
-	end)
-
-	c.spawnThread = c.jobqueue:newFunction("__spawnThread__", function(name, func, ...)
-		local multi, thread = require("multi"):init()
-		local obj = thread:newThread(name, func, ...)
-		return packObj(obj)
-	end, true)
-
-	c.spawnTask = c.jobqueue:newFunction("__spawnTask__", function(obj, func, ...)
-		local multi, thread = require("multi"):init()
-		local obj = multi[obj](multi, func, ...)
-		return packObj(obj)
-	end, true)
-
-	local implement = {
-		"newLoop",
-		"newTLoop",
-		"newUpdater",
-		"newEvent",
-		"newAlarm",
-		"newStep",
-		"newTStep",
-		"newService"
-	}
-
-	for _, method in pairs(implement) do
-		c[method] = thread:newFunction(function(self, ...)
-			proxy = self.spawnTask(method, ...)
-			proxy:init()
-			references[proxy] = self
-			return proxy
-		end, true)
-	end
-
-	function c:newThread(name, func, ...)
-		proxy = self.spawnThread(name, func, ...):init(self.Name)
-		references[proxy] = self
-		table.insert(self.threads, proxy)
-		return proxy
-	end
-
-	function c:newFunction(func, holdme)
-		return self.jobqueue:newFunction(func, holdme)
-	end
-
-	function c:newSharedTable(name)
-		if not name then multi.error("You must provide a name when creating a table!") end
-		local tbl_name = "TABLE_"..multi.randomString(8)
-		self.jobqueue:doToAll(function(tbl_name, interaction)
-			_G[interaction] = THREAD.waitFor(tbl_name):init()
-		end, tbl_name, name)
-		return multi:newSystemThreadedTable(tbl_name):init()
-	end
-
-	function c:getHandler()
-		return function() end -- return empty function
-	end
-
-	function c:getThreads()
-		return self.threads
-	end
-
-	function c:getFullName()
-		return self.parent:getFullName() .. "." .. c.Name
-	end
-
-	function c:getName()
-		return self.Name
-	end
-
-	function c.run()
-		return self
-	end
-
-	function c.isActive()
-		return true
-	end
-	
-	function c.Start()
-		return self
-	end
-
-	function c.Stop()
-		return self
-	end
-
-	function c:Destroy()
-		return false
-	end
-
-	return c
-end
-

lovethreads/conf.lua

@@ -1,20 +0,0 @@
-function love.conf(t)
-	t.identity = nil -- The name of the save directory (string)
-	t.version = "12.0" -- The LOVE version this game was made for (string)
-	t.console = true -- Attach a console (boolean, Windows only)
-
-	-- t.modules.audio = false -- Enable the audio module (boolean)
-	-- t.modules.event = false -- Enable the event module (boolean)
-	-- t.modules.graphics = false -- Enable the graphics module (boolean)
-	-- t.modules.image = false -- Enable the image module (boolean)
-	-- t.modules.joystick = false -- Enable the joystick module (boolean)
-	-- t.modules.keyboard = false -- Enable the keyboard module (boolean)
-	-- t.modules.math = false -- Enable the math module (boolean)
-	-- t.modules.mouse = false -- Enable the mouse module (boolean)
-	-- t.modules.physics = false -- Enable the physics module (boolean)
-	-- t.modules.sound = false -- Enable the sound module (boolean)
-	-- t.modules.system = true -- Enable the system module (boolean)
-	-- t.modules.timer = true -- Enable the timer module (boolean)
-	-- t.modules.window = false -- Enable the window module (boolean)
-	-- t.modules.thread = true -- Enable the thread module (boolean)
-end

lovethreads/main.lua

@@ -1,75 +0,0 @@
-package.path = "../?/init.lua;../?.lua;"..package.path
-local multi, thread = require("multi"):init{print=true, warning = true, error=true}
-local utils = require("multi.integration.loveManager.utils")
-
-local people = {1,2,3}
-
-function dump(o)
-    if type(o) == 'table' then
-        local s = '{ '
-        for k,v in pairs(o) do
-            if type(k) ~= 'number' then k = '"'..k..'"' end
-            s = s .. '['..k..'] = ' .. dump(v) .. '('..type(v):sub(1,1)..'),'
-        end
-        return s .. '} '
-    else
-        return tostring(o)
-    end
-end
-
-local fpeople = utils.pack(people)
-
-print("Pack:", dump(fpeople))
-
-local people = utils.unpack(fpeople)
-
-print("Unpack:", dump(people))
-print(type(people[3]))
- 
--- GLOBAL, THREAD = require("multi.integration.loveManager"):init()
-
--- local queue = multi:newSystemThreadedQueue("TestQueue")
--- local tab = multi:newSystemThreadedTable("TestTable")
-
--- local test = multi:newSystemThread("Test",function()
---     local queue = THREAD.waitFor("TestQueue")
---     local tab = THREAD.waitFor("TestTable")
---     print("THREAD_ID:",THREAD_ID)
---     queue:push("Did it work?")
---     tab["Test"] = true
---     return 1,2,3
--- end)
-
--- multi:newThread("QueueTest", function()
---     print(thread.hold(queue))
---     print(thread.hold(tab, {key="Test"}))
---     print("Done!")
--- end)
-
--- local jq = multi:newSystemThreadedJobQueue(n)
-
--- jq:registerFunction("test2",function()
---     print("This works!")
--- end)
-
--- jq:registerFunction("test",function(a, b, c)
---     print(a, b+c)
---     test2()
---     return a+b+c
--- end)
-
--- print("Job:",jq:pushJob("test",1,2,3))
--- print("Job:",jq:pushJob("test",2,3,4))
--- print("Job:",jq:pushJob("test",5,6,7))
-
--- jq.OnJobCompleted(function(...)
---     print("Job Completed!", ...)
--- end)
-
--- function love.draw()
---     --
--- end
-
--- function love.update()
---     multi:uManager()
--- end

lovethreads/multi

@@ -1 +0,0 @@
-../

multi/compat/love2d.lua

@@ -0,0 +1,273 @@
+--[[
+MIT License
+
+Copyright (c) 2020 Ryan Ward
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sub-license, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+]]
+if table.unpack then
+	unpack=table.unpack
+end
+function table.val_to_str ( v )
+  if "string" == type( v ) then
+    v = string.gsub( v, "\n", "\\n" )
+    if string.match( string.gsub(v,"[^'\"]",""), '^"+$' ) then
+      return "'" .. v .. "'"
+    end
+    return '"' .. string.gsub(v,'"', '\\"' ) .. '"'
+  else
+    return "table" == type( v ) and table.tostring( v ) or
+      tostring( v )
+  end
+end
+
+function table.key_to_str ( k )
+  if "string" == type( k ) and string.match( k, "^[_%a][_%a%d]*$" ) then
+    return k
+  else
+    return "[" .. table.val_to_str( k ) .. "]"
+  end
+end
+
+function table.tostring( tbl )
+  local result, done = {}, {}
+  for k, v in ipairs( tbl ) do
+    table.insert( result, table.val_to_str( v ) )
+    done[ k ] = true
+  end
+  for k, v in pairs( tbl ) do
+    if not done[ k ] then
+      table.insert( result,
+        table.key_to_str( k ) .. "=" .. table.val_to_str( v ) )
+    end
+  end
+  return "{" .. table.concat( result, "," ) .. "}"
+end
+function table.merge(t1, t2)
+	t1,t2= t1 or {},t2 or {}
+    for k,v in pairs(t2) do
+    	if type(v) == "table" then
+    		if type(t1[k] or false) == "table" then
+    			table.merge(t1[k] or {}, t2[k] or {})
+    		else
+    			t1[k] = v
+    		end
+    	else
+    		t1[k] = v
+    	end
+    end
+    return t1
+end
+Library={}
+function Library.inject(lib,dat,arg)
+	if type(lib)=="table" then
+		if type(dat)=="table" then
+			table.merge(lib,dat)
+		elseif type(dat)=="string" then
+			if lib.Version and dat:match("(%d-)%.(%d-)%.(%d-)") then
+				lib.Version={dat:match("(%d+)%.(%d+)%.(%d+)")}
+			elseif dat=="meta" and type(arg)=="table" then
+				local _mt=getmetatable(lib) or {}
+				local mt={}
+				table.merge(mt,arg)
+				table.merge(_mt,mt)
+				setmetatable(lib,_mt)
+			elseif dat=="compat" then
+				lib["getVersion"]=function(self) return self.Version[1].."."..self.Version[2].."."..self.Version[3] end
+				if not lib.Version then
+					lib.Version={1,0,0}
+				end
+			elseif dat=="inhert" then
+				if not(lib["!%"..arg.."%!"]) then print("Wrong Password!!") return end
+				lib["!%"..arg.."%!"].__index=lib["!!%"..arg.."%!!"]
+			end
+		elseif type(dat)=="function" then
+			for i,v in pairs(lib) do
+				dat(lib,i,v)
+			end
+		end
+	elseif type(lib)=="function" or type(lib)=="userdata" then
+		if lib==unpack then
+			print("function unpack cannot yet be injected!")
+			return unpack
+		elseif lib==pairs then
+			print("function pairs cannot yet be injected!")
+			return lib
+		elseif lib==ipairs then
+			print("function ipairs cannot yet be injected!")
+			return lib
+		elseif lib==type then
+			print("function type cannot yet be injected!")
+			return lib
+		end
+		temp={}
+		local mt={
+			__call=function(t,...)
+				local consume,MainRet,init={},{},{...}
+				local tt={}
+				for i=1,#t.__Link do
+					tt={}
+					if t.__Link[i]==t.__Main then
+						if #consume~=0 then
+							MainRet={t.__Link[i](unpack(consume))}
+						else
+							MainRet={t.__Link[i](unpack(init))}
+						end
+					else
+						if i==1 then
+							consume=(t.__Link[i](unpack(init)))
+						else
+							if type(MainRet)=="table" then
+								table.merge(tt,MainRet)
+							end
+							if type(consume)=="table" then
+								table.merge(tt,consume)
+							end
+							consume={t.__Link[i](unpack(tt))}
+						end
+						if i==#t.__Link then
+							return unpack(consume)
+						end
+						if consume then if consume[0]=="\1\7\6\3\2\99\125" then consume[0]=nil return unpack(consume) end end
+					end
+				end
+				if type(MainRet)=="table" then
+					table.merge(tt,MainRet)
+				end
+				if type(consume)=="table" then
+					table.merge(tt,consume)
+				end
+				return unpack(tt)
+			end,
+		}
+		temp.__Link={lib}
+		temp.__Main=lib
+		temp.__self=temp
+		function temp:inject(func,i)
+			if i then
+				table.insert(self.__Link,i,func)
+			else
+				table.insert(self.__Link,func)
+			end
+		end
+		function temp:consume(func)
+			for i=1,#self.__Link do
+				if self.__Link[i]==self.__Main then
+					self.__Link[i]=func
+					self.__self.__Main=func
+					return true
+				end
+			end
+			return false
+		end
+		setmetatable(temp,mt)
+		return temp
+	else
+		return "arg1 must be a table or a function"
+	end
+end
+function Library.convert(...)
+	local temp,rets={...},{}
+	for i=1,#temp do
+		if type(temp[i])=="function" then
+			table.insert(rets,Library.inject(temp[i]))
+		else
+			error("Takes only functions and returns in order from functions given. arg # "..i.." is not a function!!! It is a "..type(temp[i]))
+		end
+	end
+	return unpack(rets)
+end
+
+local link={MainLibrary=Library}
+Library.inject(Library,"meta",{
+	__Link=link,
+	__call=function(self,func) func(link) end,
+})
+local multi, thread = require("multi").init()
+os.sleep = love.timer.sleep
+multi.drawF = {}
+function multi:onDraw(func, i)
+	i = i or 1
+	table.insert(self.drawF, i, func)
+end
+multi.OnKeyPressed = multi:newConnection()
+multi.OnKeyReleased = multi:newConnection()
+multi.OnMousePressed = multi:newConnection()
+multi.OnMouseReleased = multi:newConnection()
+multi.OnMouseWheelMoved = multi:newConnection()
+multi.OnMouseMoved = multi:newConnection()
+multi.OnDraw = multi:newConnection()
+multi.OnTextInput = multi:newConnection()
+multi.OnUpdate = multi:newConnection()
+multi.OnQuit = multi:newConnection()
+multi.OnPreLoad(function()
+	local function Hook(func, conn)
+		if love[func] ~= nil then
+			love[func] = Library.convert(love[func])
+			love[func]:inject(function(...)
+				conn:Fire(...)
+				return {...}
+			end,1)
+		elseif love[func] == nil then
+			love[func] = function(...)
+				conn:Fire(...)
+			end
+		end
+	end
+	Hook("quit", multi.OnQuit)
+	Hook("keypressed", multi.OnKeyPressed)
+	Hook("keyreleased", multi.OnKeyReleased)
+	Hook("mousepressed", multi.OnMousePressed)
+	Hook("mousereleased", multi.OnMouseReleased)
+	Hook("wheelmoved", multi.OnMouseWheelMoved)
+	Hook("mousemoved", multi.OnMouseMoved)
+	Hook("draw", multi.OnDraw)
+	Hook("textinput", multi.OnTextInput)
+	Hook("update", multi.OnUpdate)
+	multi.OnDraw(function()
+		for i = 1, #multi.drawF do
+			love.graphics.setColor(255, 255, 255, 255)
+			multi.drawF[i]()
+		end
+	end)
+end)
+
+function multi:loveloop(light)
+	local link
+	link = multi:newThread(function()
+		local mainloop = love.run()
+		while true do
+			thread.yield()
+			pcall(mainloop)
+		end
+	end).OnError(function(...)
+		print(...)
+	end)
+	if light==false then
+		multi:mainloop()
+	else
+		multi:lightloop()
+	end
+end
+
+multi.OnQuit(function()
+	multi.Stop()
+	love.event.quit()
+end)
+return multi

multi/compat/lovr.lua

@@ -0,0 +1,281 @@
+--[[
+MIT License
+
+Copyright (c) 2020 Ryan Ward
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sub-license, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+]]
+if table.unpack then
+	unpack=table.unpack
+end
+function table.val_to_str ( v )
+  if "string" == type( v ) then
+    v = string.gsub( v, "\n", "\\n" )
+    if string.match( string.gsub(v,"[^'\"]",""), '^"+$' ) then
+      return "'" .. v .. "'"
+    end
+    return '"' .. string.gsub(v,'"', '\\"' ) .. '"'
+  else
+    return "table" == type( v ) and table.tostring( v ) or
+      tostring( v )
+  end
+end
+
+function table.key_to_str ( k )
+  if "string" == type( k ) and string.match( k, "^[_%a][_%a%d]*$" ) then
+    return k
+  else
+    return "[" .. table.val_to_str( k ) .. "]"
+  end
+end
+
+function table.tostring( tbl )
+  local result, done = {}, {}
+  for k, v in ipairs( tbl ) do
+    table.insert( result, table.val_to_str( v ) )
+    done[ k ] = true
+  end
+  for k, v in pairs( tbl ) do
+    if not done[ k ] then
+      table.insert( result,
+        table.key_to_str( k ) .. "=" .. table.val_to_str( v ) )
+    end
+  end
+  return "{" .. table.concat( result, "," ) .. "}"
+end
+function table.merge(t1, t2)
+	t1,t2= t1 or {},t2 or {}
+    for k,v in pairs(t2) do
+    	if type(v) == "table" then
+    		if type(t1[k] or false) == "table" then
+    			table.merge(t1[k] or {}, t2[k] or {})
+    		else
+    			t1[k] = v
+    		end
+    	else
+    		t1[k] = v
+    	end
+    end
+    return t1
+end
+Library={}
+function Library.inject(lib,dat,arg)
+	if type(lib)=="table" then
+		if type(dat)=="table" then
+			table.merge(lib,dat)
+		elseif type(dat)=="string" then
+			if lib.Version and dat:match("(%d-)%.(%d-)%.(%d-)") then
+				lib.Version={dat:match("(%d+)%.(%d+)%.(%d+)")}
+			elseif dat=="meta" and type(arg)=="table" then
+				local _mt=getmetatable(lib) or {}
+				local mt={}
+				table.merge(mt,arg)
+				table.merge(_mt,mt)
+				setmetatable(lib,_mt)
+			elseif dat=="compat" then
+				lib["getVersion"]=function(self) return self.Version[1].."."..self.Version[2].."."..self.Version[3] end
+				if not lib.Version then
+					lib.Version={1,0,0}
+				end
+			elseif dat=="inhert" then
+				if not(lib["!%"..arg.."%!"]) then print("Wrong Password!!") return end
+				lib["!%"..arg.."%!"].__index=lib["!!%"..arg.."%!!"]
+			end
+		elseif type(dat)=="function" then
+			for i,v in pairs(lib) do
+				dat(lib,i,v)
+			end
+		end
+	elseif type(lib)=="function" or type(lib)=="userdata" then
+		if lib==unpack then
+			print("function unpack cannot yet be injected!")
+			return unpack
+		elseif lib==pairs then
+			print("function pairs cannot yet be injected!")
+			return lib
+		elseif lib==ipairs then
+			print("function ipairs cannot yet be injected!")
+			return lib
+		elseif lib==type then
+			print("function type cannot yet be injected!")
+			return lib
+		end
+		temp={}
+		local mt={
+			__call=function(t,...)
+				local consume,MainRet,init={},{},{...}
+				local tt={}
+				for i=1,#t.__Link do
+					tt={}
+					if t.__Link[i]==t.__Main then
+						if #consume~=0 then
+							MainRet={t.__Link[i](unpack(consume))}
+						else
+							MainRet={t.__Link[i](unpack(init))}
+						end
+					else
+						if i==1 then
+							consume=(t.__Link[i](unpack(init)))
+						else
+							if type(MainRet)=="table" then
+								table.merge(tt,MainRet)
+							end
+							if type(consume)=="table" then
+								table.merge(tt,consume)
+							end
+							consume={t.__Link[i](unpack(tt))}
+						end
+						if i==#t.__Link then
+							return unpack(consume)
+						end
+						if consume then if consume[0]=="\1\7\6\3\2\99\125" then consume[0]=nil return unpack(consume) end end
+					end
+				end
+				if type(MainRet)=="table" then
+					table.merge(tt,MainRet)
+				end
+				if type(consume)=="table" then
+					table.merge(tt,consume)
+				end
+				return unpack(tt)
+			end,
+		}
+		temp.__Link={lib}
+		temp.__Main=lib
+		temp.__self=temp
+		function temp:inject(func,i)
+			if i then
+				table.insert(self.__Link,i,func)
+			else
+				table.insert(self.__Link,func)
+			end
+		end
+		function temp:consume(func)
+			for i=1,#self.__Link do
+				if self.__Link[i]==self.__Main then
+					self.__Link[i]=func
+					self.__self.__Main=func
+					return true
+				end
+			end
+			return false
+		end
+		setmetatable(temp,mt)
+		return temp
+	else
+		return "arg1 must be a table or a function"
+	end
+end
+function Library.convert(...)
+	local temp,rets={...},{}
+	for i=1,#temp do
+		if type(temp[i])=="function" then
+			table.insert(rets,Library.inject(temp[i]))
+		else
+			error("Takes only functions and returns in order from functions given. arg # "..i.." is not a function!!! It is a "..type(temp[i]))
+		end
+	end
+	return unpack(rets)
+end
+
+local link={MainLibrary=Library}
+Library.inject(Library,"meta",{
+	__Link=link,
+	__call=function(self,func) func(link) end,
+})
+local multi, thread = require("multi").init()
+os.sleep = lovr.timer.sleep
+multi.drawF = {}
+function multi:onDraw(func, i)
+	i = i or 1
+	table.insert(self.drawF, i, func)
+end
+multi.OnKeyPressed = multi:newConnection()
+multi.OnKeyReleased = multi:newConnection()
+multi.OnErrHand = multi:newConnection()
+multi.OnFocus = multi:newConnection()
+multi.OnLoad = multi:newConnection()
+multi.OnLog = multi:newConnection()
+multi.OnPermission = multi:newConnection()
+multi.OnResize = multi:newConnection()
+multi.OnRestart = multi:newConnection()
+multi.OnThreadError = multi:newConnection()
+multi.OnDraw = multi:newConnection()
+multi.OnTextInput = multi:newConnection()
+multi.OnUpdate = multi:newConnection()
+multi.OnQuit = multi:newConnection()
+multi.OnPreLoad(function()
+	local function Hook(func, conn)
+		if lovr[func] ~= nil then
+			lovr[func] = Library.convert(lovr[func])
+			lovr[func]:inject(function(...)
+				conn:Fire(...)
+				return {...}
+			end,1)
+		elseif lovr[func] == nil then
+			lovr[func] = function(...)
+				conn:Fire(...)
+			end
+		end
+	end
+	Hook("quit", multi.OnQuit)
+	Hook("keypressed", multi.OnKeyPressed)
+	Hook("keyreleased", multi.OnKeyReleased)
+	Hook("focus", multi.OnFocus)
+	Hook("log", multi.OnLog)
+	Hook("errhand", multi.OnErrHand)
+	Hook("load", multi.OnLoad)
+	Hook("draw", multi.OnDraw)
+	Hook("textinput", multi.OnTextInput)
+	Hook("update", multi.OnUpdate)
+	Hook("permission", multi.OnPermission)
+	Hook("resize", multi.OnResize)
+	Hook("restart", multi.OnRestart)
+	Hook("threaderror", multi.OnThreadError)
+	multi.OnDraw(function()
+		for i = 1, #multi.drawF do
+			lovr.graphics.setColor(255, 255, 255, 255)
+			multi.drawF[i]()
+		end
+	end)
+end)
+
+function multi:lovrloop(light)
+	local link
+	link = multi:newThread(function()
+		local mainloop = lovr.run()
+		while true do
+			thread.yield()
+			pcall(mainloop)
+		end
+	end).OnError(function(...)
+		print(...)
+	end)
+	if light==false then
+		multi:mainloop()
+	else
+		multi:lightloop()
+	end
+end
+
+multi.OnQuit(function()
+	multi.Stop()
+	lovr.event.quit()
+end)
+return multi

multi/integration/lanesManager/extensions.lua

@@ -0,0 +1,171 @@
+--[[
+MIT License
+
+Copyright (c) 2020 Ryan Ward
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sub-license, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+]]
+local multi, thread = require("multi"):init()
+local GLOBAL, THREAD = multi.integration.GLOBAL,multi.integration.THREAD
+function multi:newSystemThreadedQueue(name)
+	local c = {}
+	c.linda = lanes.linda()
+	function c:push(v)
+		self.linda:send("Q", v)
+	end
+	function c:pop()
+		return ({self.linda:receive(0, "Q")})[2]
+	end
+	function c:peek()
+		return self.linda:get("Q")
+	end
+	function c:init()
+		return self
+	end
+	GLOBAL[name or "_"] = c
+	return c
+end
+function multi:newSystemThreadedTable(name)
+    local c = {}
+    c.link = lanes.linda()
+    setmetatable(c,{
+        __index = function(t,k)
+            return c.link:get(k)
+        end,
+        __newindex = function(t,k,v)
+            c.link:set(k,v)
+        end
+    })
+    function c:init()
+        return self
+    end
+    GLOBAL[name or "_"] = c
+	return c
+end
+function multi:newSystemThreadedJobQueue(n)
+    local c = {}
+    c.cores = n or THREAD.getCores()*2
+    c.OnJobCompleted = multi:newConnection()
+    local funcs = multi:newSystemThreadedTable()
+    local queueJob = multi:newSystemThreadedQueue()
+    local queueReturn = multi:newSystemThreadedQueue()
+    local doAll = multi:newSystemThreadedQueue()
+    local ID=1
+    local jid = 1
+    function c:isEmpty()
+        return queueJob:peek()==nil
+    end
+    function c:doToAll(func)
+        for i=1,c.cores do
+            doAll:push{ID,func}
+        end
+        ID = ID + 1
+        return self
+    end
+    function c:registerFunction(name,func)
+        funcs[name]=func
+        return self
+    end
+    function c:pushJob(name,...)
+        queueJob:push{name,jid,{...}}
+        jid = jid + 1
+        return jid-1
+    end
+    local nFunc = 0
+    function c:newFunction(name,func,holup) -- This registers with the queue
+        if type(name)=="function" then
+            holup = func
+            func = name
+            name = "JQ_Function_"..nFunc
+        end
+        nFunc = nFunc + 1
+        c:registerFunction(name,func)
+        return thread:newFunction(function(...)
+            local id = c:pushJob(name,...)
+            local link
+            local rets
+            link = c.OnJobCompleted(function(jid,...)
+                if id==jid then
+                    rets = {...}
+                    link:Destroy()
+                end
+            end)
+            return thread.hold(function()
+                if rets then
+                    return unpack(rets) or multi.NIL
+                end
+            end)
+        end,holup),name
+    end
+    multi:newThread("JobQueueManager",function()
+        while true do
+            local job = thread.hold(function()
+                return queueReturn:pop()
+            end)
+            local id = table.remove(job,1)
+            c.OnJobCompleted:Fire(id,unpack(job))
+        end
+    end)
+    for i=1,c.cores do
+        multi:newSystemThread("SystemThreadedJobQueue",function(queue)
+            local multi,thread = require("multi"):init()
+            local idle = os.clock()
+            local clock = os.clock
+            local ref = 0
+            setmetatable(_G,{__index = funcs})
+            multi:newThread("JobHandler",function()
+                while true do
+                    local dat = thread.hold(function()
+                        return queueJob:pop()
+                    end)
+                    idle = clock()
+                    local name = table.remove(dat,1)
+                    local jid = table.remove(dat,1)
+                    local args = table.remove(dat,1)
+                    queueReturn:push{jid, funcs[name](unpack(args)),queue}
+                end
+            end)
+            multi:newThread("DoAllHandler",function()
+                while true do
+                    local dat = thread.hold(function()
+                        return doAll:peek()
+                    end)
+                    if dat then
+                        if dat[1]>ref then
+                            idle = clock()
+                            ref = dat[1]
+                            dat[2]()
+                            doAll:pop()
+                        end
+                    end
+                end
+            end)
+            multi:newThread("IdleHandler",function()
+                while true do
+                    thread.hold(function()
+                        return clock()-idle>3
+                    end)
+                    THREAD.sleep(.01)
+                end
+            end)
+            multi:mainloop()
+        end,i).priority = thread.Priority_Core
+    end
+    return c
+end 

multi/integration/lanesManager/init.lua

@@ -0,0 +1,157 @@
+--[[
+MIT License
+
+Copyright (c) 2020 Ryan Ward
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sub-license, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+]]
+package.path = "?/init.lua;?.lua;" .. package.path
+multi, thread = require("multi").init() -- get it all and have it on all lanes
+if multi.integration then -- This allows us to call the lanes manager from supporting modules without a hassle
+	return {
+		init = function()
+			return multi.integration.GLOBAL, multi.integration.THREAD
+		end
+	}
+end
+-- Step 1 get lanes
+lanes = require("lanes").configure()
+multi.SystemThreads = {}
+multi.isMainThread = true
+function multi:canSystemThread()
+	return true
+end
+function multi:getPlatform()
+	return "lanes"
+end
+-- Step 2 set up the Linda objects
+local __GlobalLinda = lanes.linda() -- handles global stuff
+local __SleepingLinda = lanes.linda() -- handles sleeping stuff
+local __ConsoleLinda = lanes.linda() -- handles console stuff
+multi:newLoop(function()
+	local _,data = __ConsoleLinda:receive(0, "Q")
+	if data then
+		print(unpack(data))
+	end
+end)
+local GLOBAL,THREAD = require("multi.integration.lanesManager.threads").init(__GlobalLinda,__SleepingLinda)
+local threads = {}
+local count = 1
+local started = false
+local livingThreads = {}
+function THREAD:newFunction(func,holup)
+	return function(...)
+		local t = multi:newSystemThread("SystemThreadedFunction",function(...)
+			return func(...)
+		end,...)
+		return thread:newFunction(function()
+			thread.hold(function() return t.thread end)
+			return thread.hold(function()
+				return t.thread:join(.001)
+			end)
+		end,holup)()
+	end
+end
+function multi:newSystemThread(name, func, ...)
+	multi.InitSystemThreadErrorHandler()
+	rand = math.random(1, 10000000)
+	local c = {}
+	local __self = c
+	c.name = name
+	c.Name = name
+	c.Id = count
+	c.loadString = {"base","package","os","io","math","table","string","coroutine"}
+	livingThreads[count] = {true, name}
+	c.Type = "sthread"
+	c.creationTime = os.clock()
+	c.alive = true
+	c.priority = THREAD.Priority_Normal
+	local args = {...}
+	multi:newThread(function()
+		c.thread = lanes.gen(table.concat(c.loadString,","),
+		{
+			globals={ -- Set up some globals
+				THREAD_NAME=name,
+				THREAD_ID=count,
+				THREAD = THREAD,
+				GLOBAL = GLOBAL,
+				_Console = __ConsoleLinda
+			},
+			priority=c.priority
+		},func)(unpack(args))
+		thread.kill()
+	end)
+	count = count + 1
+	function c:kill()
+		self.thread:cancel()
+		multi.print("Thread: '" .. self.name .. "' has been stopped!")
+		self.alive = false
+	end
+	table.insert(multi.SystemThreads, c)
+	c.OnError = multi:newConnection()
+	GLOBAL["__THREADS__"] = livingThreads
+	return c
+end
+multi.OnSystemThreadDied = multi:newConnection()
+function multi.InitSystemThreadErrorHandler()
+	if started == true then
+		return
+	end
+	started = true
+	multi:newThread(
+"ThreadErrorHandler",
+		function()
+			local threads = multi.SystemThreads
+			while true do
+				thread.sleep(.5) -- switching states often takes a huge hit on performance. half a second to tell me there is an error is good enough.
+				for i = #threads, 1, -1 do
+					local v, err, t = threads[i].thread:join(.001)
+					if err then
+						if err:find("Thread was killed!") then
+							print(err)
+							livingThreads[threads[i].Id] = {false, threads[i].Name}
+							threads[i].alive = false
+							multi.OnSystemThreadDied:Fire(threads[i].Id)
+							GLOBAL["__THREADS__"] = livingThreads
+							table.remove(threads, i)
+						elseif err:find("stack traceback") then
+							print(err)
+							threads[i].OnError:Fire(threads[i], err, "Error in systemThread: '" .. threads[i].name .. "' <" .. err .. ">")
+							threads[i].alive = false
+							livingThreads[threads[i].Id] = {false, threads[i].Name}
+							multi.OnSystemThreadDied:Fire(threads[i].Id)
+							GLOBAL["__THREADS__"] = livingThreads
+							table.remove(threads, i)
+						end
+					end
+				end
+			end
+		end
+	)
+end
+print("Integrated Lanes!")
+multi.integration = {} -- for module creators
+multi.integration.GLOBAL = GLOBAL
+multi.integration.THREAD = THREAD
+require("multi.integration.lanesManager.extensions")
+return {
+	init = function()
+		return GLOBAL, THREAD
+	end
+}

multi/integration/lanesManager/threads.lua

@@ -1,7 +1,7 @@
 --[[
 MIT License
 
-Copyright (c) 2022 Ryan Ward
+Copyright (c) 2020 Ryan Ward
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -28,8 +28,7 @@ local function getOS()
 		return "unix"
 	end
 end
-
-local function INIT(__GlobalLinda, __SleepingLinda, __StatusLinda, __Console)
+local function INIT(__GlobalLinda,__SleepingLinda)
     local THREAD = {}
     THREAD.Priority_Core = 3
     THREAD.Priority_High = 2
@@ -38,71 +37,64 @@ local function INIT(__GlobalLinda, __SleepingLinda, __StatusLinda, __Console)
     THREAD.Priority_Below_Normal = -1
     THREAD.Priority_Low = -2
     THREAD.Priority_Idle = -3
-
     function THREAD.set(name, val)
         __GlobalLinda:set(name, val)
     end
-
     function THREAD.get(name)
         return __GlobalLinda:get(name)
     end
-
     function THREAD.waitFor(name)
-        local multi, thread = require("multi"):init()
-        return multi.hold(function()
+        local function wait()
             math.randomseed(os.time())
             __SleepingLinda:receive(.001, "__non_existing_variable")
-            return __GlobalLinda:get(name)
-        end)
         end
-
+        repeat
+            wait()
+        until __GlobalLinda:get(name)
+        return __GlobalLinda:get(name)
+    end
+    if getOS() == "windows" then
+        THREAD.__CORES = tonumber(os.getenv("NUMBER_OF_PROCESSORS"))
+    else
+        THREAD.__CORES = tonumber(io.popen("nproc --all"):read("*n"))
+    end
     function THREAD.getCores()
         return THREAD.__CORES
     end
-
     function THREAD.getConsole()
         local c = {}
-        c.queue = __Console
+        c.queue = _Console
         function c.print(...)
-            c.queue:push("Q", table.concat(multi.pack(...), "\t"))
+            c.queue:send("Q", {...})
         end
         function c.error(err)
-            c.queue:push("Q", "Error in <"..THREAD_NAME..":" .. THREAD_ID .. ">: ".. err)
-            multi.error(err)
+            c.queue:push{"ERROR in <"..__THREADNAME__..">: "..err,__THREADID__}
+            error(err)
         end
         return c
     end
-
     function THREAD.getThreads()
         return GLOBAL.__THREADS__
     end
-
     if os.getOS() == "windows" then
         THREAD.__CORES = tonumber(os.getenv("NUMBER_OF_PROCESSORS"))
     else
         THREAD.__CORES = tonumber(io.popen("nproc --all"):read("*n"))
     end
-
     function THREAD.kill() -- trigger the lane destruction
-        error("Thread was killed!\1")
+        error("Thread was killed!")
     end
-
-    function THREAD.sync()
-        -- Maybe do something...
+    function THREAD.getName()
+        return THREAD_NAME
     end
-	
-    function THREAD.pushStatus(...)
-        local args = multi.pack(...)
-        __StatusLinda:send(nil,THREAD_ID, args)
+    function THREAD.getID()
+        return THREAD_ID
     end
-
     _G.THREAD_ID = 0
-
     function THREAD.sleep(n)
         math.randomseed(os.time())
         __SleepingLinda:receive(n, "__non_existing_variable")
     end
-
     function THREAD.hold(n)
         local function wait()
             math.randomseed(os.time())
@@ -112,7 +104,6 @@ local function INIT(__GlobalLinda, __SleepingLinda, __StatusLinda, __Console)
             wait()
         until n()
     end
-
     local GLOBAL = {}
     setmetatable(GLOBAL, {
 		__index = function(t, k)
@@ -122,30 +113,8 @@ local function INIT(__GlobalLinda, __SleepingLinda, __StatusLinda, __Console)
 			__GlobalLinda:set(k, v)
 		end
 	})
-
-    function THREAD.setENV(env, name)
-        GLOBAL[name or "__env"] = env
-    end
-
-    function THREAD.getENV(name)
-        return GLOBAL[name or "__env"]
-    end
-
-    function THREAD.exposeENV(name)
-        name = name or "__env"
-        local env = THREAD.getENV(name)
-        for i,v in pairs(env) do
-            _G[i] = v
-        end
-    end
-
-    function THREAD.defer(func)
-        table.insert(_DEFER, func)
-    end
-
     return GLOBAL, THREAD
 end
-
-return {init = function(g,s,st,c,onexit)
-    return INIT(g,s,st,c,onexit)
+return {init = function(g,s)
+    return INIT(g,s)
 end}

multi/integration/loveManager/extensions.lua

@@ -0,0 +1,205 @@
+--[[
+MIT License
+
+Copyright (c) 2020 Ryan Ward
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sub-license, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+]]
+
+-- TODO make compatible with lovr
+local multi, thread = require("multi").init()
+GLOBAL = multi.integration.GLOBAL
+THREAD = multi.integration.THREAD
+function multi:newSystemThreadedQueue(name)
+	local c = {}
+	c.Name = name
+	local fRef = {"func",nil}
+	function c:init()
+		local q = {}
+		q.chan = love.thread.getChannel(self.Name)
+		function q:push(dat)
+			if type(dat) == "function" then
+				fRef[2] = THREAD.dump(dat)
+				self.chan:push(fRef)
+				return
+			else
+				self.chan:push(dat)
+			end
+		end
+		function q:pop()
+			local dat = self.chan:pop()
+			if type(dat)=="table" and dat[1]=="func" then
+				return THREAD.loadDump(dat[2])
+			else
+				return dat
+			end
+		end
+		function q:peek()
+			local dat = self.chan:peek()
+			if type(dat)=="table" and dat[1]=="func" then
+				return THREAD.loadDump(dat[2])
+			else
+				return dat
+			end
+		end
+		return q
+	end
+	THREAD.package(name,c)
+	return c
+end
+function multi:newSystemThreadedTable(name)
+    local c = {}
+    c.name = name
+    function c:init()
+        return THREAD.createTable(self.name)
+    end
+    THREAD.package(name,c)
+	return c
+end
+local jqc = 1
+function multi:newSystemThreadedJobQueue(n)
+	local c = {}
+	c.cores = n or THREAD.getCores()
+	c.registerQueue = {}
+	c.funcs = THREAD.createStaticTable("__JobQueue_"..jqc.."_table")
+	c.queue = love.thread.getChannel("__JobQueue_"..jqc.."_queue")
+	c.queueReturn = love.thread.getChannel("__JobQueue_"..jqc.."_queueReturn")
+	c.queueAll = love.thread.getChannel("__JobQueue_"..jqc.."_queueAll")
+	c.id = 0
+	c.OnJobCompleted = multi:newConnection()
+	local allfunc = 0
+	function c:doToAll(func)
+		local f = THREAD.dump(func)
+		for i = 1, self.cores do
+			self.queueAll:push({allfunc,f})
+		end
+		allfunc = allfunc + 1
+	end
+	function c:registerFunction(name,func)
+		if self.funcs[name] then
+			error("A function by the name "..name.." has already been registered!") 
+		end
+		self.funcs[name] = func
+	end
+	function c:pushJob(name,...)
+		self.id = self.id + 1
+		self.queue:push{name,self.id,...}
+		return self.id
+	end
+	function c:isEmpty()
+        return queueJob:peek()==nil
+    end
+	local nFunc = 0
+    function c:newFunction(name,func,holup) -- This registers with the queue
+        if type(name)=="function" then
+            holup = func
+            func = name
+            name = "JQ_Function_"..nFunc
+        end
+        nFunc = nFunc + 1
+        c:registerFunction(name,func)
+        return thread:newFunction(function(...)
+            local id = c:pushJob(name,...)
+            local link
+            local rets
+            link = c.OnJobCompleted(function(jid,...)
+                if id==jid then
+                    rets = {...}
+                    link:Destroy()
+                end
+            end)
+            return thread.hold(function()
+                if rets then
+                    return unpack(rets) or multi.NIL
+                end
+            end)
+        end,holup),name
+    end
+	multi:newThread("jobManager",function()
+		while true do
+			thread.yield()
+			local dat = c.queueReturn:pop()
+			if dat then
+				c.OnJobCompleted:Fire(unpack(dat))
+			end
+		end
+	end)
+	for i=1,c.cores do
+		multi:newSystemThread("JobQueue_"..jqc.."_worker_"..i,function(jqc)
+			local multi, thread = require("multi"):init()
+			require("love.timer")
+			local function atomic(channel)
+				return channel:pop()
+			end
+			local clock = os.clock
+			local funcs = THREAD.createStaticTable("__JobQueue_"..jqc.."_table")
+			local queue = love.thread.getChannel("__JobQueue_"..jqc.."_queue")
+			local queueReturn = love.thread.getChannel("__JobQueue_"..jqc.."_queueReturn")
+			local lastProc = clock()
+			local queueAll = love.thread.getChannel("__JobQueue_"..jqc.."_queueAll")
+			local registry = {}
+			setmetatable(_G,{__index = funcs})
+			multi:newThread("startUp",function()
+				while true do
+					thread.yield()
+					local all = queueAll:peek()
+					if all and not registry[all[1]] then
+						lastProc = os.clock()
+						THREAD.loadDump(queueAll:pop()[2])()
+					end
+				end
+			end)
+			multi:newThread("runner",function()
+				thread.sleep(.1)
+				while true do
+					thread.yield()
+					local all = queueAll:peek()
+					if all and not registry[all[1]] then
+						lastProc = os.clock()
+						THREAD.loadDump(queueAll:pop()[2])()
+					end
+					local dat = queue:performAtomic(atomic)
+					if dat then
+						lastProc = os.clock()
+						local name = table.remove(dat,1)
+						local id = table.remove(dat,1)
+						local tab = {funcs[name](unpack(dat))}
+						table.insert(tab,1,id)
+						queueReturn:push(tab)
+					end
+				end
+			end):OnError(function(...)
+				error(...)
+			end)
+			multi:newThread("Idler",function()
+				while true do
+					thread.yield()
+					if clock()-lastProc> 2 then
+						THREAD.sleep(.05)
+					else
+						THREAD.sleep(.001)
+					end
+				end
+			end)
+			multi:mainloop()
+		end,jqc)
+	end
+	jqc = jqc + 1
+	return c
+end

multi/integration/loveManager/init.lua

@@ -0,0 +1,87 @@
+--[[
+MIT License
+
+Copyright (c) 2020 Ryan Ward
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sub-license, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+]]
+if ISTHREAD then
+    error("You cannot require the loveManager from within a thread!")
+end
+local ThreadFileData = [[
+ISTHREAD = true
+THREAD = require("multi.integration.loveManager.threads") -- order is important!
+sThread = THREAD
+__IMPORTS = {...}
+__FUNC__=table.remove(__IMPORTS,1)
+__THREADID__=table.remove(__IMPORTS,1)
+__THREADNAME__=table.remove(__IMPORTS,1)
+stab = THREAD.createStaticTable(__THREADNAME__)
+GLOBAL = THREAD.getGlobal()
+multi, thread = require("multi").init()
+stab["returns"] = {THREAD.loadDump(__FUNC__)(unpack(__IMPORTS))}
+]]
+local multi, thread = require("multi.compat.love2d"):init()
+local THREAD = {}
+__THREADID__ = 0
+__THREADNAME__ = "MainThread"
+multi.integration={}
+multi.integration.love2d={}
+local THREAD = require("multi.integration.loveManager.threads")
+local GLOBAL = THREAD.getGlobal()
+local THREAD_ID = 1
+local OBJECT_ID = 0
+local stf = 0
+function THREAD:newFunction(func,holup)
+    stf = stf + 1
+	return function(...)
+		local t = multi:newSystemThread("STF"..stf,func,...)
+		return thread:newFunction(function()
+            return thread.hold(function()
+                if t.stab["returns"] then
+                    local dat = t.stab.returns
+                    t.stab.returns = nil
+                    return unpack(dat)
+                end
+			end)
+		end,holup)()
+	end
+end
+function multi:newSystemThread(name,func,...)
+    local c = {}
+    c.name = name
+    c.ID=THREAD_ID
+    c.thread=love.thread.newThread(ThreadFileData)
+    c.thread:start(THREAD.dump(func),c.ID,c.name,...)
+    c.stab = THREAD.createStaticTable(name)
+    GLOBAL["__THREAD_"..c.ID] = {ID=c.ID,Name=c.name,Thread=c.thread}
+    GLOBAL["__THREAD_COUNT"] = THREAD_ID
+    THREAD_ID=THREAD_ID+1
+    return c
+end
+function love.threaderror(thread, errorstr)
+  print("Thread error!\n"..errorstr)
+end
+multi.integration.GLOBAL = GLOBAL
+multi.integration.THREAD = THREAD
+require("multi.integration.loveManager.extensions")
+print("Integrated Love Threading!")
+return {init=function()
+    return GLOBAL,THREAD
+end}

multi/integration/loveManager/threads.lua

@@ -0,0 +1,221 @@
+--[[
+MIT License
+
+Copyright (c) 2020 Ryan Ward
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sub-license, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+]]
+require("love.timer")
+require("love.system")
+require("love.data")
+local socket = require("socket")
+local multi, thread = require("multi").init()
+local threads = {}
+function threads.loadDump(d)
+    return loadstring(d:getString())
+end
+function threads.dump(func)
+    return love.data.newByteData(string.dump(func))
+end
+local fRef = {"func",nil}
+local function manage(channel, value)
+    channel:clear()
+    if type(value) == "function" then
+        fRef[2] = THREAD.dump(value)
+        channel:push(fRef)
+        return
+    else
+        channel:push(value)
+    end
+end
+local function RandomVariable(length)
+    local res = {}
+    math.randomseed(socket.gettime()*10000)
+	for i = 1, length do
+		res[#res+1] = string.char(math.random(97, 122))
+	end
+	return table.concat(res)
+end
+local GNAME = "__GLOBAL_"
+local proxy = {}
+function threads.set(name,val)
+    if not proxy[name] then proxy[name] = love.thread.getChannel(GNAME..name) end
+    proxy[name]:performAtomic(manage, val) 
+end
+function threads.get(name)
+    if not proxy[name] then proxy[name] = love.thread.getChannel(GNAME..name) end
+    local dat = proxy[name]:peek()
+    if type(dat)=="table" and dat[1]=="func" then
+        return THREAD.loadDump(dat[2])
+    else
+        return dat
+    end
+end
+function threads.waitFor(name)
+    if thread.isThread() then
+        return thread.hold(function()
+            return threads.get(name)
+        end)
+    end
+    while threads.get(name)==nil do
+        love.timer.sleep(.001)
+    end
+    local dat = threads.get(name)
+    if type(dat) == "table" and dat.init then
+        dat.init = threads.loadDump(dat.init)
+    end
+    return dat
+end
+function threads.package(name,val)
+    local init = val.init
+    val.init=threads.dump(val.init)
+    GLOBAL[name]=val
+    val.init=init
+end
+function threads.getCores()
+    return love.system.getProcessorCount()
+end
+function threads.kill()
+    error("Thread Killed!")
+end
+function threads.getThreads()
+    local t = {}
+    for i=1,GLOBAL["__THREAD_COUNT"] do
+        t[#t+1]=GLOBAL["__THREAD_"..i]
+    end
+    return t
+end
+function threads.getThread(n)
+    return GLOBAL["__THREAD_"..n]
+end
+function threads.getName()
+    return __THREADNAME__
+end
+function threads.getID()
+    return __THREADID__
+end
+function threads.sleep(n)
+    love.timer.sleep(n)
+end
+function threads.getGlobal()
+    return setmetatable({},
+        {
+            __index = function(t, k)
+                return THREAD.get(k)
+            end,
+            __newindex = function(t, k, v)
+                THREAD.set(k,v)
+            end
+        }
+    )
+end
+function threads.createTable(n)
+    local _proxy = {}
+    local function set(name,val)
+        if not _proxy[name] then _proxy[name] = love.thread.getChannel(n..name) end
+        _proxy[name]:performAtomic(manage, val) 
+    end
+    local function get(name)
+        if not _proxy[name] then _proxy[name] = love.thread.getChannel(n..name) end
+        local dat = _proxy[name]:peek()
+        if type(dat)=="table" and dat[1]=="func" then
+            return THREAD.loadDump(dat[2])
+        else
+            return dat
+        end
+    end
+    return setmetatable({},
+        {
+            __index = function(t, k)
+                return get(k)
+            end,
+            __newindex = function(t, k, v)
+                set(k,v)
+            end
+        }
+    )
+end
+function threads.getConsole()
+    local c = {}
+    c.queue = love.thread.getChannel("__CONSOLE__")
+    function c.print(...)
+        c.queue:push{...}
+    end
+    function c.error(err)
+        c.queue:push{"ERROR in <"..__THREADNAME__..">: "..err,__THREADID__}
+        error(err)
+    end
+    return c
+end
+if not ISTHREAD then
+    local clock = os.clock
+    local lastproc = clock()
+    local queue = love.thread.getChannel("__CONSOLE__")
+    multi:newThread("consoleManager",function()
+        while true do
+            thread.yield()
+            dat = queue:pop()
+            if dat then
+                lastproc = clock()
+                print(unpack(dat))
+            end
+            if clock()-lastproc>2 then
+                thread.sleep(.1)
+            end
+        end
+    end)
+end
+function threads.createStaticTable(n)
+    local __proxy = {}
+    local function set(name,val)
+        if __proxy[name] then return end
+        local chan = love.thread.getChannel(n..name)
+        if chan:getCount()>0 then return end
+        chan:performAtomic(manage, val)
+        __proxy[name] = val
+    end
+    local function get(name)
+        if __proxy[name] then return __proxy[name] end
+        local dat = love.thread.getChannel(n..name):peek()
+        if type(dat)=="table" and dat[1]=="func" then
+            __proxy[name] = THREAD.loadDump(dat[2])
+            return __proxy[name]
+        else
+            __proxy[name] = dat
+            return __proxy[name]
+        end
+    end
+    return setmetatable({},
+        {
+            __index = function(t, k)
+                return get(k)
+            end,
+            __newindex = function(t, k, v)
+                set(k,v)
+            end
+        }
+    )
+end
+function threads.hold(n)
+    local dat
+    while not(dat) do
+        dat = n()
+    end
+end
+return threads

multi/integration/lovrManager/extensions.lua

@@ -1,7 +1,7 @@
 --[[
 MIT License
 
-Copyright (c) 2022 Ryan Ward
+Copyright (c) 2020 Ryan Ward
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -118,23 +118,23 @@ function multi:newSystemThreadedJobQueue(n)
             local rets
             link = c.OnJobCompleted(function(jid,...)
                 if id==jid then
-                    rets = multi.pack(...)
+                    rets = {...}
                     link:Destroy()
                 end
             end)
             return thread.hold(function()
                 if rets then
-                    return multi.unpack(rets) or multi.NIL
+                    return unpack(rets) or multi.NIL
                 end
             end)
         end,holup),name
     end
-	thread:newThread("jobManager",function()
+	multi:newThread("jobManager",function()
 		while true do
 			thread.yield()
 			local dat = c.queueReturn:pop()
 			if dat then
-				c.OnJobCompleted:Fire(multi.unpack(dat))
+				c.OnJobCompleted:Fire(unpack(dat))
 			end
 		end
 	end)
@@ -152,9 +152,8 @@ function multi:newSystemThreadedJobQueue(n)
 			local lastProc = clock()
 			local queueAll = lovr.thread.getChannel("__JobQueue_"..jqc.."_queueAll")
 			local registry = {}
-			_G["__QR"] = queueReturn
 			setmetatable(_G,{__index = funcs})
-			thread:newThread("startUp",function()
+			multi:newThread("startUp",function()
 				while true do
 					thread.yield()
 					local all = queueAll:peek()
@@ -164,7 +163,7 @@ function multi:newSystemThreadedJobQueue(n)
 					end
 				end
 			end)
-			thread:newThread("runner",function()
+			multi:newThread("runner",function()
 				thread.sleep(.1)
 				while true do
 					thread.yield()
@@ -178,7 +177,7 @@ function multi:newSystemThreadedJobQueue(n)
 						lastProc = os.clock()
 						local name = table.remove(dat,1)
 						local id = table.remove(dat,1)
-						local tab = {funcs[name](multi.unpack(dat))}
+						local tab = {funcs[name](unpack(dat))}
 						table.insert(tab,1,id)
 						queueReturn:push(tab)
 					end
@@ -186,7 +185,7 @@ function multi:newSystemThreadedJobQueue(n)
 			end):OnError(function(...)
 				error(...)
 			end)
-			thread:newThread("Idler",function()
+			multi:newThread("Idler",function()
 				while true do
 					thread.yield()
 					if clock()-lastProc> 2 then

multi/integration/lovrManager/init.lua

@@ -1,7 +1,7 @@
 --[[
 MIT License
 
-Copyright (c) 2022 Ryan Ward
+Copyright (c) 2020 Ryan Ward
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -36,14 +36,12 @@ __THREADNAME__=table.remove(__IMPORTS,1)
 stab = THREAD.createStaticTable(__THREADNAME__)
 GLOBAL = THREAD.getGlobal()
 multi, thread = require("multi").init()
-stab["returns"] = {THREAD.loadDump(__FUNC__)(multi.unpack(__IMPORTS))}
+stab["returns"] = {THREAD.loadDump(__FUNC__)(unpack(__IMPORTS))}
 ]]
 local multi, thread = require("multi.compat.lovr2d"):init()
 local THREAD = {}
 __THREADID__ = 0
 __THREADNAME__ = "MainThread"
-_G.THREAD_NAME = "MAIN_THREAD"
-_G.THREAD_ID = 0
 multi.integration={}
 multi.integration.lovr2d={}
 local THREAD = require("multi.integration.lovrManager.threads")
@@ -60,7 +58,7 @@ function THREAD:newFunction(func,holup)
                 if t.stab["returns"] then
                     local dat = t.stab.returns
                     t.stab.returns = nil
-                    return multi.unpack(dat)
+                    return unpack(dat)
                 end
 			end)
 		end,holup)()
@@ -76,23 +74,15 @@ function multi:newSystemThread(name,func,...)
     GLOBAL["__THREAD_"..c.ID] = {ID=c.ID,Name=c.name,Thread=c.thread}
     GLOBAL["__THREAD_COUNT"] = THREAD_ID
     THREAD_ID=THREAD_ID+1
-    	
-	if self.isActor then
-		self:create(c)
-	else
-		multi.create(multi, c)
-	end
-
     return c
 end
-THREAD.newSystemThread = multi.newSystemThread
 function lovr.threaderror(thread, errorstr)
-    multi.print("Thread error!\n"..errorstr)
+  print("Thread error!\n"..errorstr)
 end
 multi.integration.GLOBAL = GLOBAL
 multi.integration.THREAD = THREAD
 require("multi.integration.lovrManager.extensions")
-multi.print("Integrated lovr Threading!")
+print("Integrated lovr Threading!")
 return {init=function()
     return GLOBAL,THREAD
 end}

multi/integration/lovrManager/threads.lua

@@ -1,7 +1,7 @@
 --[[
 MIT License
 
-Copyright (c) 2022 Ryan Ward
+Copyright (c) 2020 Ryan Ward
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -156,7 +156,7 @@ function threads.getConsole()
     local c = {}
     c.queue = lovr.thread.getChannel("__CONSOLE__")
     function c.print(...)
-        c.queue:push(multi.pack(...))
+        c.queue:push{...}
     end
     function c.error(err)
         c.queue:push{"ERROR in <"..__THREADNAME__..">: "..err,__THREADID__}
@@ -168,13 +168,13 @@ if not ISTHREAD then
     local clock = os.clock
     local lastproc = clock()
     local queue = lovr.thread.getChannel("__CONSOLE__")
-    thread:newThread("consoleManager",function()
+    multi:newThread("consoleManager",function()
         while true do
             thread.yield()
             dat = queue:pop()
             if dat then
                 lastproc = clock()
-                print(multi.unpack(dat))
+                print(unpack(dat))
             end
             if clock()-lastproc>2 then
                 thread.sleep(.1)

multi/integration/luvitManager.lua

@@ -1,7 +1,7 @@
 --[[
 MIT License
 
-Copyright (c) 2022 Ryan Ward
+Copyright (c) 2020 Ryan Ward
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -35,7 +35,7 @@ local function _INIT(luvitThread, timer)
 	end
 	-- Step 1 get setup threads on luvit... Sigh how do i even...
 	local multi, thread = require("multi").init()
-	multi.isMainThread = true
+	isMainThread = true
 	function multi:canSystemThread()
 		return true
 	end
@@ -107,7 +107,7 @@ local function _INIT(luvitThread, timer)
 		local c = {}
 		local __self = c
 		c.name = name
-		c.Type = multi.STHREAD
+		c.Type = "sthread"
 		c.thread = {}
 		c.func = string.dump(func)
 		function c:kill()
@@ -116,7 +116,6 @@ local function _INIT(luvitThread, timer)
 		luvitThread.start(entry, package.path, name, c.func, ...)
 		return c
 	end
-	THREAD.newSystemThread = multi.newSystemThread
 	multi.print("Integrated Luvit!")
 	multi.integration = {} -- for module creators
 	multi.integration.GLOBAL = GLOBAL

multi/integration/networkManager/channel.lua

@@ -1,7 +1,7 @@
 --[[
 MIT License
 
-Copyright (c) 2022 Ryan Ward
+Copyright (c) 2020 Ryan Ward
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

multi/integration/networkManager/childNode.lua

@@ -1,7 +1,7 @@
 --[[
 MIT License
 
-Copyright (c) 2022 Ryan Ward
+Copyright (c) 2020 Ryan Ward
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

multi/integration/networkManager/clientSide.lua

@@ -1,7 +1,7 @@
 --[[
 MIT License
 
-Copyright (c) 2022 Ryan Ward
+Copyright (c) 2020 Ryan Ward
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

multi/integration/networkManager/cmds.lua

@@ -1,7 +1,7 @@
 --[[
 MIT License
 
-Copyright (c) 2022 Ryan Ward
+Copyright (c) 2020 Ryan Ward
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

multi/integration/networkManager/extensions.lua

@@ -1,7 +1,7 @@
 --[[
 MIT License
 
-Copyright (c) 2022 Ryan Ward
+Copyright (c) 2020 Ryan Ward
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

multi/integration/networkManager/init.lua

@@ -1,7 +1,7 @@
 --[[
 MIT License
 
-Copyright (c) 2022 Ryan Ward
+Copyright (c) 2020 Ryan Ward
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -23,7 +23,7 @@ SOFTWARE.
 ]]
 local multi, thread = require("multi"):init()
 local net = require("net")
---local bin = require("bin")
+local bin = require("bin")
 local char = string.char
 local byte = string.byte
 bin.setBitsInterface(infinabits)

multi/integration/networkManager/masterNode.lua

@@ -1,7 +1,7 @@
 --[[
 MIT License
 
-Copyright (c) 2022 Ryan Ward
+Copyright (c) 2020 Ryan Ward
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -72,7 +72,7 @@ function master:newNetworkThread(nodeName,func,...)
     local ret
     local nID = netID
     local conn = multi:newConnection()
-    thread:newthread(function()
+    multi:newThread(function()
         dat:addBlock{
             args = args,
             func = func,
@@ -143,7 +143,7 @@ function multi:newMasterNode(cd)
     else
         c:getNodesFromBroadcast()
     end
-    thread:newthread("CMDQueueProcessor",function()
+    multi:newThread("CMDQueueProcessor",function()
         while true do
             thread.skip(128)
             local data = table.remove(c._queue,1)

multi/integration/networkManager/node.lua

@@ -1,7 +1,7 @@
 --[[
 MIT License
 
-Copyright (c) 2022 Ryan Ward
+Copyright (c) 2020 Ryan Ward
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

multi/integration/networkManager/nodeManager.lua

@@ -1,7 +1,7 @@
 --[[
 MIT License
 
-Copyright (c) 2022 Ryan Ward
+Copyright (c) 2020 Ryan Ward
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

multi/integration/networkManager/serverSide.lua

@@ -1,7 +1,7 @@
 --[[
 MIT License
 
-Copyright (c) 2022 Ryan Ward
+Copyright (c) 2020 Ryan Ward
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

multi/integration/networkManager/threads.lua

@@ -1,7 +1,7 @@
 --[[
 MIT License
 
-Copyright (c) 2022 Ryan Ward
+Copyright (c) 2020 Ryan Ward
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

multi/integration/networkManager/utils.lua

@@ -1,7 +1,7 @@
 --[[
 MIT License
 
-Copyright (c) 2022 Ryan Ward
+Copyright (c) 2020 Ryan Ward
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

multi/integration/pesudoManager/extensions.lua

@@ -0,0 +1,141 @@
+--[[
+MIT License
+
+Copyright (c) 2020 Ryan Ward
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sub-license, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+]]
+local multi, thread = require("multi"):init()
+local GLOBAL, THREAD = multi.integration.GLOBAL,multi.integration.THREAD
+
+local function stripUpValues(func)
+    local dmp = string.dump(func)
+    if setfenv then
+        return loadstring(dmp,"IsolatedThread_PesudoThreading")
+    else
+        return load(dmp,"IsolatedThread_PesudoThreading","bt")
+    end
+end
+
+function multi:newSystemThreadedQueue(name)
+	local c = {}
+	function c:push(v)
+		table.insert(self,v)
+	end
+	function c:pop()
+		return table.remove(self,1)
+	end
+	function c:peek()
+		return self[1]
+	end
+	function c:init()
+		return self
+	end
+	GLOBAL[name or "_"] = c
+	return c
+end
+function multi:newSystemThreadedTable(name)
+    local c = {}
+    function c:init()
+        return self
+    end
+    GLOBAL[name or "_"] = c
+	return c
+end
+local setfenv = setfenv
+if not setfenv then
+    if not debug then
+        multi.print("Unable to implement setfenv in lua 5.2+ the debug module is not available!")
+    else
+        setfenv = function(f, env)
+            return load(string.dump(f), nil, nil, env)
+        end
+    end
+end
+function multi:newSystemThreadedJobQueue(n)
+    local c = {}
+    c.cores = n or THREAD.getCores()*2
+    c.OnJobCompleted = multi:newConnection()
+    local jobs = {}
+    local ID=1
+    local jid = 1
+    local env = {}
+    setmetatable(env,{
+        __index = _G
+    })
+    local funcs = {}
+    function c:doToAll(func)
+        setfenv(func,env)()
+        return self
+    end
+    function c:registerFunction(name,func)
+        funcs[name] = setfenv(func,env)
+        return self
+    end
+    function c:pushJob(name,...)
+        table.insert(jobs,{name,jid,{...}})
+        jid = jid + 1
+        return jid-1
+    end
+    function c:isEmpty()
+        print(#jobs)
+        return #jobs == 0
+    end
+    local nFunc = 0
+    function c:newFunction(name,func,holup) -- This registers with the queue
+        local func = stripUpValues(func)
+        if type(name)=="function" then
+            holup = func
+            func = name
+            name = "JQ_Function_"..nFunc
+        end
+        nFunc = nFunc + 1
+        c:registerFunction(name,func)
+        return thread:newFunction(function(...)
+            local id = c:pushJob(name,...)
+            local link
+            local rets
+            link = c.OnJobCompleted(function(jid,...)
+                if id==jid then
+                    rets = {...}
+                    link:Destroy()
+                end
+            end)
+            return thread.hold(function()
+                if rets then
+                    return unpack(rets) or multi.NIL
+                end
+            end)
+        end,holup),name
+    end
+    for i=1,c.cores do
+        multi:newThread("PesudoThreadedJobQueue_"..i,function()
+            while true do
+                thread.yield()
+                if #jobs>0 then
+                    local j = table.remove(jobs,1)
+                    c.OnJobCompleted:Fire(j[2],funcs[j[1]](unpack(j[3])))
+                else
+                    thread.sleep(.05)
+                end
+            end
+        end)
+    end
+    return c
+end 

multi/integration/pesudoManager/init.lua

@@ -22,9 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ]]
 package.path = "?/init.lua;?.lua;" .. package.path
-local multi, thread = require("multi"):init()
-
-local pseudoProcessor = multi:newProcessor()
+local multi, thread = require("multi").init()
 
 if multi.integration then
 	return {
@@ -33,12 +31,8 @@ if multi.integration then
 		end
 	}
 end
-multi.isMainThread = true
-local activator = require("multi.integration.pseudoManager.threads")
-local GLOBAL, THREAD = activator.init(thread)
 
-_G.THREAD_NAME = "MAIN_THREAD"
-_G.THREAD_ID = 0
+local GLOBAL, THREAD = require("multi.integration.pesudoManager.threads"):init()
 
 function multi:canSystemThread() -- We are emulating system threading
 	return true
@@ -47,7 +41,6 @@ end
 function multi:getPlatform()
 	return "pesudo"
 end
-
 local function split(str)
 	local tab = {}
 	for word in string.gmatch(str, '([^,]+)') do
@@ -55,67 +48,41 @@ local function split(str)
 	end
 	return tab
 end
-
-local tab = [[_VERSION,io,os,require,load,debug,assert,collectgarbage,error,getfenv,getmetatable,ipairs,loadstring,module,next,pairs,pcall,print,rawequal,rawget,rawset,select,setfenv,setmetatable,tonumber,tostring,type,xpcall,math,coroutine,string,table]]
-tab = split(tab)
-
+THREAD.newFunction=thread.newFunction
 local id = 0
-
-function multi:newSystemThread(name, func, ...)
-	local env
-	env = {
+function multi:newSystemThread(name,func,...)
+	GLOBAL["$THREAD_NAME"] = name
+	GLOBAL["$__THREADNAME__"] = name
+	GLOBAL["$THREAD_ID"] = id
+	--GLOBAL["$thread"] = thread
+	local env = {
 		GLOBAL = GLOBAL,
 		THREAD = THREAD,
-		THREAD_NAME = tostring(name),
-		__THREADNAME__ = tostring(name),
+		THREAD_NAME = name,
+		__THREADNAME__ = name,
 		THREAD_ID = id,
-		thread = thread,
-		multi = multi,
+		thread = thread
 	}
 	
-	for i, v in pairs(_G) do
-		if not(env[i]) and not(i == "_G") and not(i == "local_global") then
-			env[i] = v
-		else
-			multi.warn("skipping:",i)
+	local tab = [[_VERSION,io,os,require,load,debug,assert,collectgarbage,error,getfenv,getmetatable,ipairs,loadstring,module,next,pairs,pcall,print,rawequal,rawget,rawset,select,setfenv,setmetatable,tonumber,tostring,type,unpack,xpcall,math,coroutine,string,table]]
+	tab = split(tab)
+	for i = 1,#tab do
+		env[tab[i]] = _G[tab[i]]
 	end
-	end
-
-	if GLOBAL["__env"] then
-		for i,v in pairs(GLOBAL["__env"]) do
-			env[i] = v
-		end
-	end
-	
-	env._G = env
-	
-	local GLOBAL, THREAD = activator.init(thread, env)
-
-	local th = pseudoProcessor:newISOThread(name, func, env, ...)
-	th.Type = multi.registerType("s_thread", "pseudoThreads")
-	th.OnError(multi.error)
-	
+	--setmetatable(env,{__index=env})
+	multi:newISOThread(name,func,env,...).OnError(function(self,msg)
+		print("ERROR:",msg)
+	end)
 	id = id + 1
-
-	return th
 end
-
-THREAD.newSystemThread = multi.newSystemThread
 -- System threads as implemented here cannot share memory, but use a message passing system.
 -- An isolated thread allows us to mimic that behavior so if access data from the "main" thread happens things will not work. This behavior is in line with how the system threading works
 
-function THREAD:newFunction(func,holdme)
-	return thread:newFunctionBase(function(...)
-		return multi:newSystemThread("TempSystemThread",func,...)
-	end, holdme, multi.registerType("s_function", "pseudoFunctions"))()
-end
-
-multi.print("Integrated Pesudo Threading!")
+print("Integrated Pesudo Threading!")
 multi.integration = {} -- for module creators
 multi.integration.GLOBAL = GLOBAL
 multi.integration.THREAD = THREAD
-require("multi.integration.pseudoManager.extensions")
-require("multi.integration.sharedExtensions")
+require("multi.integration.pesudoManager.extensions")
 return {
 	init = function()
 		return GLOBAL, THREAD

multi/integration/pesudoManager/threads.lua

@@ -1,7 +1,7 @@
 --[[
 MIT License
 
-Copyright (c) 2022 Ryan Ward
+Copyright (c) 2020 Ryan Ward
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -21,7 +21,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 ]]
-
 local function getOS()
 	if package.config:sub(1, 1) == "\\" then
 		return "windows"
@@ -29,11 +28,9 @@ local function getOS()
 		return "unix"
 	end
 end
-
-local function INIT(thread)
+local function INIT(env)
     local THREAD = {}
     local GLOBAL = {}
-
     THREAD.Priority_Core = 3
     THREAD.Priority_High = 2
     THREAD.Priority_Above_Normal = 1
@@ -41,29 +38,24 @@ local function INIT(thread)
     THREAD.Priority_Below_Normal = -1
     THREAD.Priority_Low = -2
     THREAD.Priority_Idle = -3
-
     function THREAD.set(name, val)
         GLOBAL[name] = val
     end
-
     function THREAD.get(name)
         return GLOBAL[name]
     end
-
     function THREAD.waitFor(name)
+        print("Waiting",thread)
         return thread.hold(function() return GLOBAL[name] end)
     end
-
     if getOS() == "windows" then
         THREAD.__CORES = tonumber(os.getenv("NUMBER_OF_PROCESSORS"))
     else
         THREAD.__CORES = tonumber(io.popen("nproc --all"):read("*n"))
     end
-
     function THREAD.getCores()
         return THREAD.__CORES
     end
-
     function THREAD.getConsole()
         local c = {}
         function c.print(...)
@@ -74,49 +66,31 @@ local function INIT(thread)
         end
         return c
     end
-
     function THREAD.getThreads()
         return {}--GLOBAL.__THREADS__
     end
-
-    THREAD.pushStatus = thread.pushStatus
-
+    if os.getOS() == "windows" then
+        THREAD.__CORES = tonumber(os.getenv("NUMBER_OF_PROCESSORS"))
+    else
+        THREAD.__CORES = tonumber(io.popen("nproc --all"):read("*n"))
+    end
     function THREAD.kill()
         error("Thread was killed!")
     end
-
-    THREAD.sleep = thread.sleep
-
-    THREAD.hold = thread.hold
-
-    THREAD.defer = thread.defer
-	
-	function THREAD.setENV(env, name)
-        name = name or "__env"
-        GLOBAL[name] = env
+    function THREAD.getName()
+        return GLOBAL["$THREAD_NAME"]
     end
-
-    function THREAD.getENV(name)
-        name = name or "__env"
-        return GLOBAL[name]
+    function THREAD.getID()
+        return GLOBAL["$THREAD_ID"]
     end
-
-    function THREAD.exposeENV(name)
-        name = name or "__env"
-        local env = THREAD.getENV(name)
-        for i,v in pairs(env) do
-            -- This may need to be reworked!
-            local_global[i] = v
+    function THREAD.sleep(n)
+        thread.sleep(n)
     end
+    function THREAD.hold(n)
+        return thread.hold(n)
     end
-
-    function THREAD.sync()
-        thread.sleep(.5)
-    end
-
     return GLOBAL, THREAD
 end
-
-return {init = function(thread, global)
-    return INIT(thread, global)
+return {init = function()
+    return INIT()
 end}

rockspecs/multi-15.2-0.rockspec

@@ -1,39 +0,0 @@
-package = "multi"
-version = "15.2-0"
-source = {
-   url = "git://github.com/rayaman/multi.git",
-   tag = "v15.2.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",
-   }
-}

rockspecs/multi-15.2-1.rockspec

@@ -1,39 +0,0 @@
-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

@@ -1,39 +0,0 @@
-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"] = "init.lua",
-      ["multi.integration.lanesManager"] = "integration/lanesManager/init.lua",
-      ["multi.integration.lanesManager.extensions"] = "integration/lanesManager/extensions.lua",
-      ["multi.integration.lanesManager.threads"] = "integration/lanesManager/threads.lua",
-      ["multi.integration.loveManager"] = "integration/loveManager/init.lua",
-      ["multi.integration.loveManager.extensions"] = "integration/loveManager/extensions.lua",
-      ["multi.integration.loveManager.threads"] = "integration/loveManager/threads.lua",
-      --["multi.integration.lovrManager"] = "integration/lovrManager/init.lua",
-      --["multi.integration.lovrManager.extensions"] = "integration/lovrManager/extensions.lua",
-      --["multi.integration.lovrManager.threads"] = "integration/lovrManager/threads.lua",
-      ["multi.integration.pesudoManager"] = "integration/pesudoManager/init.lua",
-      ["multi.integration.pesudoManager.extensions"] = "integration/pesudoManager/extensions.lua",
-      ["multi.integration.pesudoManager.threads"] = "integration/pesudoManager/threads.lua",
-      ["multi.integration.luvitManager"] = "integration/luvitManager.lua",
-      ["multi.integration.threading"] = "integration/threading.lua",
-      --["multi.integration.networkManager"] = "integration/networkManager.lua",
-   }
-}

rockspecs/multi-15.3-1.rockspec

@@ -1,39 +0,0 @@
-package = "multi"
-version = "15.3-1"
-source = {
-   url = "git://github.com/rayaman/multi.git",
-   tag = "15.3.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"] = "init.lua",
-      ["multi.integration.lanesManager"] = "integration/lanesManager/init.lua",
-      ["multi.integration.lanesManager.extensions"] = "integration/lanesManager/extensions.lua",
-      ["multi.integration.lanesManager.threads"] = "integration/lanesManager/threads.lua",
-      ["multi.integration.loveManager"] = "integration/loveManager/init.lua",
-      ["multi.integration.loveManager.extensions"] = "integration/loveManager/extensions.lua",
-      ["multi.integration.loveManager.threads"] = "integration/loveManager/threads.lua",
-      --["multi.integration.lovrManager"] = "integration/lovrManager/init.lua",
-      --["multi.integration.lovrManager.extensions"] = "integration/lovrManager/extensions.lua",
-      --["multi.integration.lovrManager.threads"] = "integration/lovrManager/threads.lua",
-      ["multi.integration.pesudoManager"] = "integration/pesudoManager/init.lua",
-      ["multi.integration.pesudoManager.extensions"] = "integration/pesudoManager/extensions.lua",
-      ["multi.integration.pesudoManager.threads"] = "integration/pesudoManager/threads.lua",
-      ["multi.integration.luvitManager"] = "integration/luvitManager.lua",
-      ["multi.integration.threading"] = "integration/threading.lua",
-      --["multi.integration.networkManager"] = "integration/networkManager.lua",
-   }
-}

rockspecs/multi-16.0-0.rockspec

@@ -1,42 +0,0 @@
-package = "multi"
-version = "16.0-0"
-source = {
-   url = "git://github.com/rayaman/multi.git",
-   tag = "v16.0.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"] = "init.lua",
-      ["multi.integration.lanesManager"] = "integration/lanesManager/init.lua",
-      ["multi.integration.lanesManager.extensions"] = "integration/lanesManager/extensions.lua",
-      ["multi.integration.lanesManager.threads"] = "integration/lanesManager/threads.lua",
-      ["multi.integration.loveManager"] = "integration/loveManager/init.lua",
-      ["multi.integration.loveManager.extensions"] = "integration/loveManager/extensions.lua",
-      ["multi.integration.loveManager.threads"] = "integration/loveManager/threads.lua",
-      ["multi.integration.loveManager.utils"] = "integration/loveManager/threads.lua",
-      --["multi.integration.lovrManager"] = "integration/lovrManager/init.lua",
-      --["multi.integration.lovrManager.extensions"] = "integration/lovrManager/extensions.lua",
-      --["multi.integration.lovrManager.threads"] = "integration/lovrManager/threads.lua",
-      ["multi.integration.pseudoManager"] = "integration/pseudoManager/init.lua",
-      ["multi.integration.pseudoManager.extensions"] = "integration/pseudoManager/extensions.lua",
-      ["multi.integration.pseudoManager.threads"] = "integration/pseudoManager/threads.lua",
-      ["multi.integration.luvitManager"] = "integration/luvitManager.lua",
-      ["multi.integration.threading"] = "integration/threading.lua",
-      ["multi.integration.sharedExtensions"] = "integration/sharedExtensions/init.lua",
-      ["multi.integration.priorityManager"] = "integration/priorityManager/init.lua",
-      --["multi.integration.networkManager"] = "integration/networkManager.lua",
-   }
-}

rockspecs/multi-16.0-1.rockspec

@@ -1,42 +0,0 @@
-package = "multi"
-version = "16.0-1"
-source = {
-   url = "git://github.com/rayaman/multi.git",
-   tag = "v16.0.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"] = "init.lua",
-      ["multi.integration.lanesManager"] = "integration/lanesManager/init.lua",
-      ["multi.integration.lanesManager.extensions"] = "integration/lanesManager/extensions.lua",
-      ["multi.integration.lanesManager.threads"] = "integration/lanesManager/threads.lua",
-      ["multi.integration.loveManager"] = "integration/loveManager/init.lua",
-      ["multi.integration.loveManager.extensions"] = "integration/loveManager/extensions.lua",
-      ["multi.integration.loveManager.threads"] = "integration/loveManager/threads.lua",
-      ["multi.integration.loveManager.utils"] = "integration/loveManager/threads.lua",
-      --["multi.integration.lovrManager"] = "integration/lovrManager/init.lua",
-      --["multi.integration.lovrManager.extensions"] = "integration/lovrManager/extensions.lua",
-      --["multi.integration.lovrManager.threads"] = "integration/lovrManager/threads.lua",
-      ["multi.integration.pseudoManager"] = "integration/pseudoManager/init.lua",
-      ["multi.integration.pseudoManager.extensions"] = "integration/pseudoManager/extensions.lua",
-      ["multi.integration.pseudoManager.threads"] = "integration/pseudoManager/threads.lua",
-      ["multi.integration.luvitManager"] = "integration/luvitManager.lua",
-      ["multi.integration.threading"] = "integration/threading.lua",
-      ["multi.integration.sharedExtensions"] = "integration/sharedExtensions/init.lua",
-      ["multi.integration.priorityManager"] = "integration/priorityManager/init.lua",
-      --["multi.integration.networkManager"] = "integration/networkManager.lua",
-   }
-}

test.lua

@@ -0,0 +1,113 @@
+--package.path = "./?/init.lua;"..package.path
+multi,thread = require("multi"):init()
+
+func = thread:newFunction(function(count)
+    local a = 0
+    while true do
+        a = a + 1
+        thread.sleep(.5)
+        thread.pushStatus(a,count)
+        if a == count then break end
+    end
+    return "Done"
+end)
+
+multi:newThread("test",function()
+    local ret = func(10)
+    local ret2 = func(15)
+    local ret3 = func(20)
+    ret.OnStatus(function(part,whole)
+        print("Ret1: ",math.ceil((part/whole)*1000)/10 .."%")
+    end)
+    ret2.OnStatus(function(part,whole)
+        print("Ret2: ",math.ceil((part/whole)*1000)/10 .."%")
+    end)
+    ret3.OnStatus(function(part,whole)
+        print("Ret3: ",math.ceil((part/whole)*1000)/10 .."%")
+    end)
+    thread.hold(ret2.OnReturn + ret.OnReturn + ret3.OnReturn)
+    print("Function Done!")
+    os.exit()
+end)
+
+--GLOBAL,THREAD = require("multi.integration.threading"):init() -- Auto detects your environment and uses what's available
+
+func2 = thread:newFunction(function()
+    thread.sleep(3)
+    print("Hello World!")
+    return true
+end,true) -- set holdme to true
+
+func2:holdMe(false) -- reset holdme to false
+print("Calling func...")
+print(func2())
+
+test = thread:newFunction(function(a,b)
+    thread.sleep(1)
+    return a,b
+end)
+print(test(1,2).connect(function(...)
+    print(...)
+end))
+test:Pause()
+print(test(1,2).connect(function(...)
+    print(...)
+end))
+test:Resume()
+print(test(1,2).connect(function(...)
+    print(...)
+end))
+
+test = thread:newFunction(function()
+    return 1,2,nil,3,4,5,6,7,8,9
+end,true)
+print(test())
+multi:newThread("testing",function()
+    print("#Test = ",test())
+    print(thread.hold(function()
+        print("Hello!")
+        return false
+    end,{
+        interval = 2,
+        cycles = 3
+    })) -- End result, 3 attempts within 6 seconds. If still false then timeout
+    print("held")
+end).OnError(function(...)
+    print(...)
+end)
+
+sandbox = multi:newProcessor("Test Processor")
+sandbox:newTLoop(function()
+    print("testing...")
+end,1)
+
+test2 = multi:newTLoop(function()
+    print("testing2...")
+end,1)
+
+sandbox:newThread("Test Thread",function()
+    local a = 0
+    while true do
+        thread.sleep(1)
+        a = a + 1
+        print("Thread Test: ".. multi.getCurrentProcess().Name)
+        if a == 10 then
+            sandbox.Stop()
+        end
+    end
+end).OnError(function(...)
+    print(...)
+end)
+
+multi:newThread("Test Thread",function()
+    while true do
+        thread.sleep(1)
+        print("Thread Test: ".. multi.getCurrentProcess().Name)
+    end
+end).OnError(function(...)
+    print(...)
+end)
+
+sandbox.Start()
+
+multi:mainloop()

tests/conf.lua

@@ -1,39 +0,0 @@
-function love.conf(t)
-	t.identity = nil -- The name of the save directory (string)
-	t.version = "12.0" -- The LOVE version this game was made for (string)
-	t.console = true -- Attach a console (boolean, Windows only)
-
-	t.window.title = "MultiThreadTest" -- The window title (string)
-	t.window.icon = nil -- Filepath to an image to use as the window's icon (string)
-	t.window.width = 1280 -- The window width (number)
-	t.window.height = 720 -- The window height (number)
-
-	t.window.borderless = false -- Remove all border visuals from the window (boolean)
-	t.window.resizable = true -- Let the window be user-resizable (boolean)
-	t.window.minwidth = 1 -- Minimum window width if the window is resizable (number)
-	t.window.minheight = 1 -- Minimum window height if the window is resizable (number)
-	t.window.fullscreen = false -- Enable fullscreen (boolean)
-	t.window.fullscreentype = "desktop" -- Standard fullscreen or desktop fullscreen mode (string)
-	t.window.vsync = false -- Enable vertical sync (boolean)
-	t.window.fsaa = 2 -- The number of samples to use with multi-sampled antialiasing (number)
-	t.window.display = 1 -- Index of the monitor to show the window in (number)
-	t.window.highdpi = false -- Enable high-dpi mode for the window on a Retina display (boolean)
-	t.window.srgb = false -- Enable sRGB gamma correction when drawing to the screen (boolean)
-	t.window.x = nil -- The x-coordinate of the window's position in the specified display (number)
-	t.window.y = nil -- The y-coordinate of the window's position in the specified display (number)
-
-	t.modules.audio = false -- Enable the audio module (boolean)
-	t.modules.event = false -- Enable the event module (boolean)
-	t.modules.graphics = false -- Enable the graphics module (boolean)
-	t.modules.image = false -- Enable the image module (boolean)
-	t.modules.joystick = false -- Enable the joystick module (boolean)
-	t.modules.keyboard = false -- Enable the keyboard module (boolean)
-	t.modules.math = false -- Enable the math module (boolean)
-	t.modules.mouse = false -- Enable the mouse module (boolean)
-	t.modules.physics = false -- Enable the physics module (boolean)
-	t.modules.sound = false -- Enable the sound module (boolean)
-	t.modules.system = false -- Enable the system module (boolean)
-	t.modules.timer = false -- Enable the timer module (boolean)
-	t.modules.window = false -- Enable the window module (boolean)
-	t.modules.thread = true -- Enable the thread module (boolean)
-end

tests/main.lua

@@ -1,10 +0,0 @@
-package.path = "../?/init.lua;../?.lua;"..package.path
-
-if os.getenv("LOCAL_LUA_DEBUGGER_VSCODE") == "1" then
-    require("lldebugger").start()
-end
-
-GLOBAL, THREAD = require("multi.integration.loveManager"):init()
-
-require("runtests")
-require("threadtests")

tests/multi

@@ -1 +0,0 @@
-../

tests/objectTests.lua

@@ -0,0 +1,3 @@
+return function objectTests(multi,thread)
+    print("Testing Alarms!")
+end

tests/runtests.lua

@@ -1,193 +1,21 @@
-package.path = "../?/init.lua;../?.lua;./init.lua;./?.lua;"..package.path
+package.path="../?.lua;../?/init.lua;../?.lua;../?/?/init.lua;"..package.path
+--[[
+    This file runs all tests.
+    Format:
+        Expected:
+            ...
+            ...
+            ...
+        Actual:
+            ...
+            ...
+            ...
     
-local multi, thread = require("multi"):init{print=true,warn=true,error=true}--{priority=true}
-local good = false
-local proc = multi:newProcessor("Test")
+    Each test that is ran should have a 5 second pause after the test is complete
+    The expected and actual should "match" (Might be impossible when playing with threads)
+    This will be pushed directly to the master as tests start existing.
+]]
+local multi, thread = require("multi"):init()
+function runTest(path)
     
-proc.Start()
-
-proc:newAlarm(3):OnRing(function()
-	good = true
-end)
-
-runTest = thread:newFunction(function()
-    local alarms,tsteps,steps,loops,tloops,updaters,events=false,0,0,0,0,0,false
-    multi.print("Testing Basic Features. If this fails most other features will probably not work!")
-    proc:newAlarm(2):OnRing(function(a)
-        alarms = true
-        a:Destroy()
-    end)
-    proc:newTStep(1,10,1,.1):OnStep(function(t)
-        tsteps = tsteps + 1
-    end):OnEnd(function(step)
-        step:Destroy()
-    end)
-    proc:newStep(1,10):OnStep(function(s)
-        steps = steps + 1
-    end):OnEnd(function(step)
-        step:Destroy()
-    end)
-    local loop = proc:newLoop(function(l)
-        loops = loops + 1
-    end)
-    proc:newTLoop(function(t)
-        tloops = tloops + 1
-    end,.1)
-    local updater = proc:newUpdater(1):OnUpdate(function()
-        updaters = updaters + 1
-    end)
-    local event = proc:newEvent(function()
-        return alarms
-    end)
-    event.OnEvent(function(evnt)
-		evnt:Destroy()
-        events = true
-        multi.success("Alarms: Ok")
-        multi.success("Events: Ok")
-        if tsteps == 10 then multi.success("TSteps: Ok") else multi.error("TSteps: Bad!") end
-        if steps == 10 then multi.success("Steps: Ok") else multi.error("Steps: Bad!") end
-        if loops > 100 then multi.success("Loops: Ok") else multi.error("Loops: Bad!") end
-        if tloops > 10 then multi.success("TLoops: Ok") else multi.error("TLoops: Bad!") end
-        if updaters > 100 then multi.success("Updaters: Ok") else multi.error("Updaters: Bad!") end
-    end)
-	thread.hold(event.OnEvent)
-    multi.print("Starting Connection and Thread tests!")
-	func = thread:newFunction(function(count)
-		multi.print("Starting Status test: ",count)
-		local a = 0
-		while true do
-			a = a + 1
-			thread.sleep(.1)
-			thread.pushStatus(a,count)
-			if a == count then break end
-		end
-		return "Done", true, math.random(1,10000)
-	end)
-    local ret = func(10)
-    local ret2 = func(15)
-    local ret3 = func(20)
-	local s1,s2,s3 = 0,0,0
-	ret.OnError(function(...)
-		multi.error("Func 1:",...)
-	end)
-	ret2.OnError(function(...)
-		multi.error("Func 2:",...)
-	end)
-	ret3.OnError(function(...)
-		multi.error("Func 3:",...)
-	end)
-    ret.OnStatus(function(part,whole)
-		s1 = math.ceil((part/whole)*1000)/10
-    end)
-    ret2.OnStatus(function(part,whole)
-        s2 = math.ceil((part/whole)*1000)/10
-    end)
-    ret3.OnStatus(function(part,whole)
-        s3 = math.ceil((part/whole)*1000)/10
-    end)
-
-	ret.OnReturn(function(...)
-		multi.success("Done 1",...)
-	end)
-	ret2.OnReturn(function(...)
-		multi.success("Done 2",...)
-	end)
-	ret3.OnReturn(function(...)
-		multi.success("Done 3",...)
-	end)
-	
-	local err, timeout = thread.hold(ret.OnReturn * ret2.OnReturn * ret3.OnReturn)
-
-	if s1 == 100 and s2 == 100 and s3 == 100 then
-		multi.success("Threads: All tests Ok")
-	else
-		if s1>0 and s2>0 and s3 > 0 then
-			multi.success("Thread OnStatus: Ok")
-		else
-			multi.error("Threads OnStatus or thread.hold(conn) Error!")
-		end
-		if timeout then
-			multi.error("Connection Error!")
-		else
-			multi.success("Connection Test 1: Ok")
-		end
-		multi.error("Connection holding Error!")
-	end
-	
-	conn1 = proc:newConnection()
-	conn2 = proc:newConnection()
-	conn3 = proc:newConnection()
-	local c1,c2,c3,c4 = false,false,false,false
-
-	local a = conn1(function()
-		c1 = true
-	end)
-
-	local b = conn2(function()
-		c2 = true
-	end)
-
-	local c = conn3(function()
-		c3 = true
-	end)
-
-	local d = conn3(function()
-		c4 = true
-	end)
-
-	conn1:Fire()
-	conn2:Fire()
-	conn3:Fire()
-
-	if c1 and c2 and c3 and c4 then
-		multi.success("Connection Test 2: Ok")
-	else
-		multi.error("Connection Test 2: Error")
-	end
-	c3 = false
-	c4 = false
-	conn3:Unconnect(d)
-	conn3:Fire()
-	if c3 and not(c4) then
-		multi.success("Connection Test 3: Ok")
-	else
-		multi.error("Connection Test 3: Error removing connection")
-	end
-	if not love then
-		local ec = 0
-		multi.print("Testing pseudo threading")
-		capture = io.popen("lua tests/threadtests.lua p"):read("*a")
-		if capture:lower():match("error") then
-			ec = ec + 1
-			os.exit(1)
-		else
-			io.write(capture)
-		end
-		multi.print("Testing lanes threading")
-		capture = io.popen("lua tests/threadtests.lua l"):read("*a")
-		if capture:lower():match("error") then
-			ec = ec + 1
-			os.exit(1)
-		else
-			io.write(capture)
-		end
-		os.exit(0)
-	end
-end)
-
-local handle = runTest()
-
-handle.OnError(function(...)
-	multi.error("Something went wrong with the test!")
-	print(...)
-end)
-
-if not love then
-	multi:mainloop()
-else
-	local hold = thread:newFunction(function()
-		thread.hold(handle.OnError + handle.OnReturn)
-	end, true)
-	hold()
-	multi.print("Starting Threading tests!")
 end

tests/test.lua

@@ -1,298 +0,0 @@
-package.path = "../?/init.lua;../?.lua;"..package.path
-multi, thread = require("multi"):init{print=true,warn=true,debugging=true}
--- for i,v in pairs(thread) do
---     print(i,v)
--- end
-
--- require("multi.integration.priorityManager")
-
--- multi.debugging.OnObjectCreated(function(obj, process)
--- 	multi.print("Created:", obj.Type, "in", process.Type, process:getFullName())
--- end)
-
--- multi.debugging.OnObjectDestroyed(function(obj, process)
--- 	multi.print("Destroyed:", obj.Type, "in", process.Type, process:getFullName())
--- end)
-
-
--- test = multi:newProcessor("Test")
--- test:setPriorityScheme(multi.priorityScheme.TimeBased)
-
--- test:newUpdater(10000000):OnUpdate(function()
--- 	print("Print is slowish")
--- end)
-
--- print("Running...")
-
--- local conn1, conn2 = multi:newConnection(), multi:newConnection()
--- conn3 = conn1 + conn2
-
--- conn1(function()
--- 	print("Hi 1")
--- end)
-
--- conn2(function()
--- 	print("Hi 2")
--- end)
-
--- conn3(function()
--- 	print("Hi 3")
--- end)
-
--- function test(a,b,c)
--- 	print("I run before all and control if execution should continue!")
--- 	return a>b
--- end
-
--- conn4 = test .. conn1
-
--- conn5 = conn2 .. function() print("I run after it all!") end
-
--- conn4:Fire(3,2,3)
--- -- This second one won't trigger the Hi's
--- conn4:Fire(1,2,3)
-
--- conn5(function()
--- 	print("Test 1")
--- end)
-
--- conn5(function()
--- 	print("Test 2")
--- end)
-
--- conn5(function()
--- 	print("Test 3")
--- end)
-
--- conn5:Fire()
-
-
-
-
--- multi.print("Testing thread:newProcessor()")
-
--- proc = thread:newProcessor("Test")
-
--- proc:newLoop(function()
--- 	multi.print("Running...")
--- 	thread.sleep(1)
--- end)
-
--- proc:newThread(function()
--- 	while true do
--- 		multi.warn("Everything is a thread in this proc!")
--- 		thread.sleep(1)
--- 	end
--- end)
-
--- proc:newAlarm(5):OnRing(function(a)
--- 	multi.print(";) Goodbye")
--- 	a:Destroy()
--- end)
-
--- local func = thread:newFunction(function()
--- 	thread.sleep(4)
--- 	print("Hello!")
--- end)
-
--- multi:newTLoop(func, 1)
-
--- multi:mainloop()
-
--- multi:setTaskDelay(.05)
--- multi:newTask(function()
---     for i = 1, 10 do
---         multi:newTask(function()
---             print("Task "..i)
---         end)
---     end
--- end)
-
--- local conn = multi:newConnection()
--- conn(function() print("Test 1") end)
--- conn(function() print("Test 2") end)
--- conn(function() print("Test 3") end)
--- conn(function() print("Test 4") end)
-
--- print("Fire 1")
--- conn:Fire()
--- conn = -conn
--- print("Fire 2")
--- conn:Fire()
-
--- print(#conn)
-
--- thread:newThread("Test thread", function()
---     print("Starting thread!")
---     thread.defer(function() -- Runs when the thread finishes execution
---         print("Clean up time!")
---     end)
---     --[[
---         Do lot's of stuff
---     ]]
---     thread.sleep(3)
--- end)
-
-multi:mainloop()
-
--- local conn1, conn2, conn3 = multi:newConnection(nil,nil,true), multi:newConnection(), multi:newConnection()
-
--- local link = conn1(function()
--- 	print("Conn1, first")
--- end)
-
--- local link2 = conn1(function()
--- 	print("Conn1, second")
--- end)
-
--- local link3 = conn1(function()
--- 	print("Conn1, third")
--- end)
-
--- local link4 = conn2(function()
--- 	print("Conn2, first")
--- end)
-
--- local link5 = conn2(function()
--- 	print("Conn2, second")
--- end)
-
--- local link6 = conn2(function()
--- 	print("Conn2, third")
--- end)
-
--- print("Links 1-6",link,link2,link3,link4,link5,link6)
--- conn1:Lock(link)
--- print("All conns\n-------------")
--- conn1:Fire()
--- conn2:Fire()
-
--- conn1:Unlock(link)
-
--- conn1:Unconnect(link3)
--- conn2:Unconnect(link6)
--- print("All conns Edit\n---------------------")
--- conn1:Fire()
--- conn2:Fire()
-
--- thread:newThread(function()
--- 	print("Awaiting status")
--- 	thread.hold(conn1 + (conn2 * conn3))
--- 	print("Conn or Conn2 and Conn3")
--- end)
-
--- multi:newAlarm(1):OnRing(function()
--- 	print("Conn")
--- 	conn1:Fire()
--- end)
--- multi:newAlarm(2):OnRing(function()
--- 	print("Conn2")
--- 	conn2:Fire()
--- end)
--- multi:newAlarm(3):OnRing(function()
--- 	print("Conn3")
--- 	conn3:Fire()
--- 	os.exit()
--- end)
-
-
--- local conn = multi:newSystemThreadedConnection("conn"):init()
-
--- multi:newSystemThread("Thread_Test_1", function()
--- 	local multi, thread = require("multi"):init()
--- 	local conn = GLOBAL["conn"]:init()
--- 	local console = THREAD.getConsole()
--- 	conn(function(a,b,c)
--- 		console.print(THREAD:getName().." was triggered!",a,b,c)
--- 	end)
--- 	multi:mainloop()
--- end)
-
--- multi:newSystemThread("Thread_Test_2", function()
--- 	local multi, thread = require("multi"):init()
--- 	local conn = GLOBAL["conn"]:init()
--- 	local console = THREAD.getConsole()
--- 	conn(function(a,b,c)
--- 		console.print(THREAD:getName().." was triggered!",a,b,c)
--- 	end)
--- 	multi:newAlarm(2):OnRing(function()
--- 		console.print("Fire 2!!!")
--- 		conn:Fire(4,5,6)
--- 		THREAD.kill()
--- 	end)
-
--- 	multi:mainloop()
--- end)
--- local console = THREAD.getConsole()
--- conn(function(a,b,c)
--- 	console.print("Mainloop conn got triggered!",a,b,c)
--- end)
-
--- alarm = multi:newAlarm(1)
--- alarm:OnRing(function()
--- 	console.print("Fire 1!!!")
--- 	conn:Fire(1,2,3) 
--- end)
-
--- alarm = multi:newAlarm(3):OnRing(function()
--- 	multi:newSystemThread("Thread_Test_3",function()
--- 		local multi, thread = require("multi"):init()
--- 		local conn = GLOBAL["conn"]:init()
--- 		local console = THREAD.getConsole()
--- 		conn(function(a,b,c)
--- 			console.print(THREAD:getName().." was triggered!",a,b,c)
--- 		end)
--- 		multi:newAlarm(4):OnRing(function()
--- 			console.print("Fire 3!!!")
--- 			conn:Fire(7,8,9)
--- 		end)
--- 		multi:mainloop()
--- 	end)
--- end)
-
--- multi:newSystemThread("Thread_Test_4",function()
--- 	local multi, thread = require("multi"):init()
--- 	local conn = GLOBAL["conn"]:init()
--- 	local conn2 = multi:newConnection()
--- 	local console = THREAD.getConsole()
--- 	multi:newAlarm(2):OnRing(function()
--- 		conn2:Fire()
--- 	end)
--- 	multi:newThread(function()
--- 		console.print("Conn Test!")
--- 		thread.hold(conn + conn2)
--- 		console.print("It held!")
--- 	end)
--- 	multi:mainloop()
--- end)
-
--- multi:mainloop()
---[[
-    newFunction     function: 0x00fad170
-    waitFor function: 0x00fad0c8        
-    request function: 0x00fa4f10        
-    newThread       function: 0x00fad1b8
-    --__threads       table: 0x00fa4dc8   
-    defer   function: 0x00fa4f98        
-    isThread        function: 0x00facd40
-    holdFor function: 0x00fa5058
-    yield   function: 0x00faccf8
-    hold    function: 0x00fa51a0
-    chain   function: 0x00fa5180
-    __CORES 32
-    newISOThread    function: 0x00fad250
-    newFunctionBase function: 0x00fad128
-    requests        table: 0x00fa4e68
-    newProcessor    function: 0x00fad190
-    exec    function: 0x00fa50e8
-    pushStatus      function: 0x00fad108
-    kill    function: 0x00faccd8
-    get     function: 0x00fad0a8
-    set     function: 0x00fad088
-    getCores        function: 0x00facd60
-    skip    function: 0x00faccb0
-    --_Requests       function: 0x00fa50a0
-    getRunningThread        function: 0x00fa4fb8
-    holdWithin      function: 0x00facc80
-    sleep   function: 0x00fa4df0
-]]

tests/threadtests.lua

@@ -1,246 +0,0 @@
-package.path = "D:/VSCWorkspace/?/init.lua;D:/VSCWorkspace/?.lua;"..package.path
-package.cpath = "C:/luaInstalls/lua5.4/lib/lua/5.4/?/core.dll;" .. package.cpath
-multi, thread = require("multi"):init{error=true,warning=true,print=true, priority=true}
-proc = multi:newProcessor("Thread Test",true)
-local LANES, LOVE, PSEUDO = 1, 2, 3
-local env, we_good
-
-if love then
-    GLOBAL, THREAD = require("multi.integration.loveManager"):init()
-    env = LOVE
-elseif arg[1] == "l" then
-    GLOBAL, THREAD = require("multi.integration.lanesManager"):init()
-    env = LANES
-elseif arg[1] == "p" then
-    GLOBAL, THREAD = require("multi.integration.pseudoManager"):init()
-    env = PSEUDO
-else
-    io.write("Test Pseudo(p), Lanes(l), or love(Run in love environment) Threading: ")
-    choice = io.read()
-    if choice == "p" then
-        GLOBAL, THREAD = require("multi.integration.pseudoManager"):init()
-        env = PSEUDO
-    elseif choice == "l" then
-        GLOBAL, THREAD = require("multi.integration.lanesManager"):init()
-        env = LANES
-    else
-        error("Invalid threading choice")
-    end
-end
-
-multi.print("Testing THREAD.setENV() if the multi_assert is not found then there is a problem")
-THREAD.setENV({
-    multi_assert = function(expected, actual, s)
-        if expected ~= actual then
-            multi.error(s .. " Expected: '".. tostring(expected) .."' Actual: '".. tostring(actual) .."'")
-        end
-    end
-})
-
-multi:newThread("Scheduler Thread",function()
-    multi:newThread(function()
-        thread.sleep(30)
-        print("Timeout tests took longer than 30 seconds")
-        multi:Stop()
-        os.exit(1)
-    end)
-
-    queue = multi:newSystemThreadedQueue("Test_Queue")
-    defer_queue = multi:newSystemThreadedQueue("Defer_Queue")
-
-    multi:newSystemThread("Test_Thread_0", function()
-        defer_queue = THREAD.waitFor("Defer_Queue"):init()
-        
-        THREAD.defer(function()
-            defer_queue:push("done")
-            multi.print("This function was defered until the end of the threads life")
-        end)
-
-        multi.print("Testing defer, should print below this")
-
-        if THREAD_NAME~="Test_Thread_0" then
-            multi.error("The name should be Test_Thread_0",THREAD_NAME,THREAD_NAME,_G.THREAD_NAME)
-        end
-    end)
-
-    if thread.hold(function()
-        return defer_queue:pop() == "done"
-    end,{sleep=3}) == nil then
-        multi.error("Thread.defer didn't work!")
-    end
-    
-    th1 = multi:newSystemThread("Test_Thread_1", function(a,b,c,d,e,f)
-        queue = THREAD.waitFor("Test_Queue"):init()
-        multi_assert("Test_Thread_1", THREAD_NAME, "Thread name does not match!")
-        multi_assert("Passing some args", a, "First argument is not as expected 'Passing some args'")
-        multi_assert(true, e, "Argument e is not true!")
-        multi_assert("table", type(f), "Argument f is not a table!")
-        queue:push("done")
-    end,"Passing some args", 1, 2, 3, true, {"Table"}).OnError(function(self,err)
-        multi.error(err)
-        os.exit(1)
-    end)
-
-    if thread.hold(function()
-        return queue:pop() == "done"
-    end,{sleep=1}) == nil then
-        thread.kill()
-    end
-
-    multi.success("Thread Spawning, THREAD namaspace in threads, global's working, and queues for passing data: Ok")
-
-    func = THREAD:newFunction(function(a,b,c)
-        assert(a == 3, "First argument expected '3' got '".. a .."'!")
-        assert(b == 2, "Second argument expected '2' got '".. b .."'!")
-        assert(c == 1, "Third argument expected '1' got '".. c .."'!")
-        return 1, 2, 3, {"a table"}
-    end, true) -- Hold this
-
-    a, b, c, d = func(3,2,1)
-    assert(a == 1, "First return was not '1'!")
-    assert(b == 2, "Second return was not '2'!")
-    assert(c == 3, "Third return was not '3'!")
-    assert(d[1] == "a table", "Fourth return is not table, or doesn't contain 'a table'!")
-
-    multi.success("Threaded Functions, arg passing, return passing, holding: Ok")
-
-    test=multi:newSystemThreadedTable("YO"):init()
-    test["test1"]="tabletest"
-    local worked = false
-
-    multi:newSystemThread("testing tables",function()
-        tab=THREAD.waitFor("YO")
-        THREAD.hold(function() return tab["test1"] end)
-        THREAD.sleep(.1)
-        tab["test2"] = "Whats so funny?"
-    end).OnError(multi.error)
-
-    multi:newThread("test2",function()
-        thread.hold(function() return test["test2"] end)
-        worked = true
-    end)
-
-    t, val = thread.hold(function()
-        return worked
-    end,{sleep=2})
-
-    if val == multi.TIMEOUT then
-        multi.error("SystemThreadedTables: Failed")
-        os.exit(1)
-    end
-
-    multi.success("SystemThreadedTables: Ok")
-
-    local ready = false
-
-    jq = multi:newSystemThreadedJobQueue(4) -- Job queue with 4 worker threads
-    func2 = jq:newFunction("sleep",function(a,b)
-        THREAD.sleep(.2)
-    end)
-    func = jq:newFunction("test-thread",function(a,b)
-        sleep()
-        return a+b
-    end)
-    local count = 0
-    for i = 1,10 do
-        func(i, i*3).OnReturn(function(data)
-            count = count + 1
-        end)
-    end
-
-    t, val = thread.hold(function()
-        return count == 10
-    end,{sleep=3})
-
-    if val == multi.TIMEOUT then
-        multi.error("SystemThreadedJobQueues: Failed")
-        os.exit(1)
-    end
-
-    multi.success("SystemThreadedJobQueues: Ok")
-
-    local proxy_test = false
-    local stp = multi:newSystemThreadedProcessor(5)
-
-    local tloop = stp:newTLoop(function()
-        --print("Test")
-    end, 1)
-
-    multi:newSystemThread("PROX_THREAD",function(tloop)
-        local multi, thread = require("multi"):init()
-        tloop = tloop:init()
-        multi.print("tloop type:",tloop.Type)
-        multi.print("Testing proxies on other threads")
-        thread:newThread(function()
-            while true do
-                thread.hold(tloop.OnLoop)
-                print(THREAD_NAME,"Loopy")
-            end
-        end)
-        tloop.OnLoop(function(a)
-            print(THREAD_NAME, "Got loop...")
-        end)
-        multi:mainloop()
-    end, tloop:getTransferable())
-
-    local test = tloop:getTransferable()
-
-    multi.print("tloop", tloop.Type)
-    multi.print("tloop.OnLoop", tloop.OnLoop.Type)
-
-    thread:newThread("Proxy Test Thread",function()
-        multi.print("Testing holding on a proxy connection!")
-        thread.hold(tloop.OnLoop)
-        multi.print("Held on proxy connection... once")
-        thread.hold(tloop.OnLoop)
-        multi.print("Held on proxy connection... twice")
-        thread.hold(tloop.OnLoop)
-        multi.print("Held on proxy connection... finally")
-        proxy_test = true
-    end).OnError(print)
-
-    thread:newThread(function()
-        thread.defer(function()
-            multi.print("Something happened!")
-        end)
-        while true do
-            thread.hold(tloop.OnLoop)
-            multi.print(THREAD_NAME,"Local Loopy")
-        end
-    end).OnError(function(...)
-        print("Error",...)
-    end)
-
-    tloop.OnLoop(function()
-        print("OnLoop", THREAD_NAME)
-    end)
-
-    t, val = thread.hold(function()
-        return proxy_test
-    end,{sleep=10})
-
-    if val == multi.TIMEOUT then
-        multi.error("SystemThreadedProcessor/Proxies: Failed")
-        os.exit(1)
-    else
-        multi.success("SystemThreadedProcessor: OK")
-    end
-
-    thread.sleep(2)
-
-    we_good = true
-    multi:Stop() -- Needed in love2d tests to stop the main runner
-    os.exit(0)
-end)
-
-multi.OnExit(function(err_or_errorcode)
-    multi.print("EC: ", err_or_errorcode)
-    if not we_good then
-        multi.print("There was an error running some tests!")
-        return
-    else
-        multi.success("Tests complete!")
-    end
-end)
-
-multi:mainloop()