* Fixed spelling, started ideaing for 16.0.0 * Updated files * Updated readme * Updated version * Concat conns now properly transfer events * Testing types * Connections can be % with functions * Updated connections * Fixed issue with double thread activations (Looking for another solution) * Working on issue with love threaded functions not waiting when in a thread * Working on issue where threads created in threads don't work * Fixed broken threads for love * Fixed some issues with threads * removed test * Updated changes.md * Plan on testing parity between the threading modules * Writing tests for system threading * Added test cases for threading, fixed issues. Todo test love2d * Fixed love2d to succeed with tests * All tests working * Updated files for testing * Modified tests to make it more seamless * removed extra __cores in lanes/pseudo * Working on new priority scheme * Working on priority management * Working on custom prioritySchemes * Fixed issues with missing code * Threaded processors * THREAD.exposeENV(), thread:newProcessor() * Typo in changes.md * Fixed typo in pseudoManager * fixing * Trying to fix exposeENV with pseudoThreading * Changes to threads * updated changes.md * Working on systemthreadedprocess, and experimental newProxy for threading * newProxy and STP work * newProxy implemented * Proxies work with connections now :D * Added tstep to STP, updated changes.md * thread.hold(proxy.conn) * Clean up connection events when holding, working on scheduling tasks/threads to system threaded processors * Getting loads of processors implemented * Finished getLoad(type) * Fixed some bugs * Added an easy way to share a table, found some limitations with lanes threading. * THREAD_NAME set for main thread, connections break the rules for proxies * Testing * Really close to portable proxies, currently extreamly unstable! * Debugging what is going on... * Fixed critical issue with coroutine based threads * Removed extra bloat, proxies are portable now! * Started work on the debugManager * Testing actions, fixing bugs with lanes * Testing... * fixing actions * typo fixed * Throw an error when things break * fixing stuff * Fixed issue with errors not going through * Removed system threaded connections, soon to be replaced by proxies * Testing love2d tests * Test love2d * Use later love-build * Use ubuntu for build * Fixed path * Use appimage * use sudo * No window for love2d * Fixed love2d tests * Testing love2d * Use workspace * Moved other tests while testing * actually pull the repo * packagepath set * Fixed pull * Update multi * Removed link * Edited symlink * Added timeout to build * Rewriting loveManager, too much outdated code * Still implementing new love2d threading code * Rewriting love2d threading binding * Working on adding a Hold method to all objects. Will document how they all work when done. * jobqueues having isues with stp * new pack/unpack for tables, current issue is things being turned into strings * Fixed packing of values into threads, need to fix system proxies and system threaded processors * testing... * Not hard crashing when error is encountered * Should now push non 0 exit codes * Push error when an error happens * Closer to getting things working... * Working on new type system, planning out debugmanager * Fixed error code issue * Test for 5.1 * Planning out debugManager * Some work on the debug manager, proxies working on lanes, todo get pseudo manager and love2d working * Working on getting pseudoThreading tests to work * Added function / connection * Added boost method * Document new features to conns, todo fix newTask * Fixed newTask() * Updated changes.md and fixed some bugs * Added thread.defer(func) * Fixed tests on lanes and pseudo threading, todo fix love2d threading * Fixed paths * Working on paths * Testing paths * Add test for rockspec * Fixed issues * Fixed typo * Added test for defer * Threading working in love2d * Fixed, conf * lanes uses a threaded function like waitfor function * Cleaned up changes.md * added priorityManager to rockspec
139 lines
4.5 KiB
Lua
139 lines
4.5 KiB
Lua
--[[
|
|
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.
|
|
]]
|
|
|
|
-- This module probably will not be maintained any longer!
|
|
package.path = "?/init.lua;?.lua;" .. package.path
|
|
local function _INIT(luvitThread, timer)
|
|
-- lots of this stuff should be able to stay the same
|
|
function os.getOS()
|
|
if package.config:sub(1, 1) == "\\" then
|
|
return "windows"
|
|
else
|
|
return "unix"
|
|
end
|
|
end
|
|
-- Step 1 get setup threads on luvit... Sigh how do i even...
|
|
local multi, thread = require("multi").init()
|
|
multi.isMainThread = true
|
|
function multi:canSystemThread()
|
|
return true
|
|
end
|
|
function multi:getPlatform()
|
|
return "luvit"
|
|
end
|
|
local multi = multi
|
|
-- Step 2 set up the Global table... is this possible?
|
|
local GLOBAL = {}
|
|
setmetatable(
|
|
GLOBAL,
|
|
{
|
|
__index = function(t, k)
|
|
--print("No Global table when using luvit integration!")
|
|
return nil
|
|
end,
|
|
__newindex = function(t, k, v)
|
|
--print("No Global table when using luvit integration!")
|
|
end
|
|
}
|
|
)
|
|
local THREAD = {}
|
|
function THREAD.set(name, val)
|
|
--print("No Global table when using luvit integration!")
|
|
end
|
|
function THREAD.get(name)
|
|
--print("No Global table when using luvit integration!")
|
|
end
|
|
local function randomString(n)
|
|
local str = ""
|
|
local strings = {"a","b","c","d","e","f","g","h","i","j","k","l","m","n","o","p","q","r","s","t","u","v","w","x","y","z","1","2","3","4","5","6","7","8","9","0","A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"}
|
|
for i = 1, n do
|
|
str = str .. "" .. strings[math.random(1, #strings)]
|
|
end
|
|
return str
|
|
end
|
|
function THREAD.waitFor(name)
|
|
--print("No Global table when using luvit integration!")
|
|
end
|
|
function THREAD.testFor(name, val, sym)
|
|
--print("No Global table when using luvit integration!")
|
|
end
|
|
function THREAD.getCores()
|
|
return THREAD.__CORES
|
|
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 thread destruction
|
|
error("Thread was Killed!")
|
|
end
|
|
-- hmmm if im cleaver I can get this to work... but since data passing isn't going to be a thing its probably not important
|
|
function THREAD.sleep(n)
|
|
--print("No Global table when using luvit integration!")
|
|
end
|
|
function THREAD.hold(n)
|
|
--print("No Global table when using luvit integration!")
|
|
end
|
|
-- Step 5 Basic Threads!
|
|
local function entry(path, name, func, ...)
|
|
local timer = require "timer"
|
|
local luvitThread = require "thread"
|
|
package.path = path
|
|
loadstring(func)(...)
|
|
end
|
|
function multi:newSystemThread(name, func, ...)
|
|
local c = {}
|
|
local __self = c
|
|
c.name = name
|
|
c.Type = multi.STHREAD
|
|
c.thread = {}
|
|
c.func = string.dump(func)
|
|
function c:kill()
|
|
-- print("No Global table when using luvit integration!")
|
|
end
|
|
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.THREAD = THREAD
|
|
require("multi.integration.shared")
|
|
-- Start the main mainloop... This allows you to process your multi objects, but the engine on the main thread will be limited to .001 or 1 millisecond sigh...
|
|
local interval =
|
|
timer.setInterval(
|
|
1,
|
|
function()
|
|
multi:uManager()
|
|
end
|
|
)
|
|
return multi
|
|
end
|
|
return {init = function(threadHandle, timerHandle)
|
|
local multi = _INIT(threadHandle, timerHandle)
|
|
return GLOBAL, THREAD
|
|
end}
|