changes.md

@@ -78,6 +78,8 @@ Changed:
 
 Removed:
 ---
+- `multi:lightloop()` Cleaned up the mainloop/uManager method, actually faster than lightloop (Which should have been called liteloop)
+- `multi:threadloop()` See above for reasons
 - `multi setting: protect` This added extra complexity to the mainloop and not much benefit. If you feel a function will error use pcall yourself. This saves a decent amount of cycles, about 6.25% increase in performance.
 - `multi:GetParentProcess()` use `multi.getCurrentProcess()` instead
 - priority scheme 2, 3 and auto-priority have been removed! Only priority scheme 1 actually performed in a reasonable fashion so that one remained.

multi/init.lua

@@ -51,6 +51,7 @@ multi.LinkedPath = multi
 multi.lastTime = clock()
 multi.TIMEOUT = "TIMEOUT"
 multi.TID = 0
+multi.defaultSettings = {}
 
 multi.Priority_Core = 1
 multi.Priority_Very_High = 4
@@ -80,10 +81,6 @@ multi.Priority=multi.Priority_High
 multi.threshold=256
 multi.threstimed=.001
 
-function multi.init()
-	return _G["$multi"].multi,_G["$multi"].thread
-end
-
 -- System
 function multi.Stop()
 	mainloopActive=false
@@ -152,16 +149,16 @@ function multi:getTasksDetails(t)
 			end
 			dat = multi.AlignTable(proc_tab).. "\n"
 			dat = dat .. "\n" .. multi.AlignTable(th_tab)
-			return "Load on "..ProcessName[(self.Type=="process" and 1 or 2)].."<"..(self.Name or "Unnamed")..">"..": "..multi.Round(load,2).."%\nCycles Per Second Per Task: "..steps.."\nMemory Usage: "..math.ceil(collectgarbage("count")).." KB\nProcesses Running: "..process_count.."\nThreads Running: "..thread_count.."\nSystemThreads Running: "..#(multi.SystemThreads or {}).."\nPriority Scheme: "..priorityTable[multi.defaultSettings.priority or 0].."\n\n"..dat..dat2.."\n\n"..s
+			return "Load on "..ProcessName[(self.Type=="process" and 1 or 2)].."<"..(self.Name or "Unnamed")..">"..": "..multi.Round(load,2).."%\nCycles Per Second Per Task: "..steps.."\nMemory Usage: "..math.ceil(collectgarbage("count")).." KB\nProcesses Running: "..process_count.."\nThreads Running: "..thread_count.."\nSystemThreads Running: "..#(multi.SystemThreads or {}).."\nPriority Scheme: "..priorityTable[multi.settings.priority or 0].."\n\n"..dat..dat2.."\n\n"..s
 		else
-			return "Load on "..ProcessName[(self.Type=="process" and 1 or 2)].."<"..(self.Name or "Unnamed")..">"..": "..multi.Round(load,2).."%\nCycles Per Second Per Task: "..steps.."\n\nMemory Usage: "..math.ceil(collectgarbage("count")).." KB\nProcesses Running: "..process_count.."\nThreads Running: 0\nPriority Scheme: "..priorityTable[multi.defaultSettings.priority or 0].."\n\n"..dat2.."\n\n"..s
+			return "Load on "..ProcessName[(self.Type=="process" and 1 or 2)].."<"..(self.Name or "Unnamed")..">"..": "..multi.Round(load,2).."%\nCycles Per Second Per Task: "..steps.."\n\nMemory Usage: "..math.ceil(collectgarbage("count")).." KB\nProcesses Running: "..process_count.."\nThreads Running: 0\nPriority Scheme: "..priorityTable[multi.settings.priority or 0].."\n\n"..dat2.."\n\n"..s
 		end
 	else
 		local load,steps = self:getLoad()
 		str = {
 			ProcessName = (self.Name or "Unnamed"),
 			MemoryUsage = math.ceil(collectgarbage("count")),
-			PriorityScheme = priorityTable[multi.defaultSettings.priority or 0],
+			PriorityScheme = priorityTable[multi.settings.priority or 0],
 			SystemLoad = multi.Round(load,2),
 			CyclesPerSecondPerTask = steps,
 			SystemThreadCount = multi.SystemThreads and #multi.SystemThreads or 0
@@ -261,7 +258,7 @@ function multi:newConnection(protect,func,kill)
 			end
 		end)
 		repeat
-			self.Parent:uManager(multi.defaultSettings)
+			self.Parent:uManager(multi.settings)
 		until self.waiting==false
 		id:Destroy()
 		return self
@@ -1621,79 +1618,46 @@ function multi:newService(func) -- Priority managed threads
 	return c
 end
 -- Multi runners
-function multi:threadloop()
+local function mainloop(self)
-	multi.initThreads(true)
-end
-
-function multi:lightloop(settings)
-	multi.defaultSettings = settings or multi.defaultSettings
-	multi.OnPreLoad:Fire()
-	if not isRunning then
-		local Loop=self.Mainloop
-		local ctask
-		while true do
-			__CurrentProcess = self
-			for _D=#Loop,1,-1 do
-				__CurrentTask = Loop[_D]
-				ctask = __CurrentTask
-				if ctask.Active then
-					ctask:Act()
-					__CurrentProcess = self
-				end
-			end
-		end
-	end
-end
-
-function multi:mainloop(settings)
 	__CurrentProcess = self
 	multi.OnPreLoad:Fire()
-	multi.defaultSettings = settings or multi.defaultSettings
+	self.uManager = self.uManagerRef
-	self.uManager=self.uManagerRef
-	local p_c,p_vh,p_h,p_an,p_n,p_bn,p_l,p_vl,p_i = self.Priority_Core,self.Priority_Very_High,self.Priority_High,self.Priority_Above_Normal,self.Priority_Normal,self.Priority_Below_Normal,self.Priority_Low,self.Priority_Very_Low,self.Priority_Idle
-	local P_LB = p_i
 	if not isRunning then
-		local priority = false
-		local stopOnError = true
-		self.uManager = self.uManagerRef
-		if settings then
-			priority = settings.priority
-			if priority then
-				self.uManager = self.uManagerRefP1
-			end
-			if type(settings.preLoop)=="function" then
-				settings.preLoop(self)
-			end
-			if settings.stopOnError then
-				stopOnError = settings.stopOnError
-			end
-		end
 		isRunning=true
-		local lastTime = clock()
-		rawset(self,'Start',clock())
 		mainloopActive = true
 		local Loop=self.Mainloop
 		local ctask
 		multi.OnLoad:Fire()
 		while mainloopActive do
-			if priority then
+			for _D=#Loop,1,-1 do
-				for task=#Loop,1,-1 do
+				__CurrentTask = Loop[_D]
-					__CurrentTask = Loop[task]
+				ctask = __CurrentTask
-					ctask = __CurrentTask
+				ctask:Act()
-					if ctask and ctask.Active then
+				__CurrentProcess = self
-						for i=1,9 do
+			end
-							if PList[i]%ctask.Priority == 0 then
+		end
-								ctask:Act()
+	else
-								__CurrentProcess = self
+		return nil, "Already Running!"
-							end
+	end
-						end
+end
-					end
+multi.mainloop = mainloop
-				end
+
-			else
+local function p_mainloop(self)
-				for _D=#Loop,1,-1 do
+	__CurrentProcess = self
-					__CurrentTask = Loop[_D]
+	multi.OnPreLoad:Fire()
-					ctask = __CurrentTask
+	self.uManager = self.uManagerRefP1
-					if ctask and ctask.Active then
+	if not isRunning then
+		isRunning=true
+		mainloopActive = true
+		local Loop = self.Mainloop
+		local ctask
+		multi.OnLoad:Fire()
+		while mainloopActive do
+			for task=#Loop,1,-1 do
+				__CurrentTask = Loop[task]
+				ctask = __CurrentTask
+				for i=1,9 do
+					if PList[i]%ctask.Priority == 0 then
 						ctask:Act()
 						__CurrentProcess = self
 					end
@@ -1704,51 +1668,41 @@ function multi:mainloop(settings)
 		return nil, "Already Running!"
 	end
 end
-
+local init = false
-function multi:uManager(settings)
+function multi.init(settings, realsettings)
-	__CurrentProcess = self
+	if settings == multi then settings = realsettings end
-	multi.OnPreLoad:Fire()
+	if init then return _G["$multi"].multi,_G["$multi"].thread end
-	multi.defaultSettings = settings or multi.defaultSettings
+	init = true
-	self.uManager=self.uManagerRef
+	if type(settings)=="table" then
-	if settings then
+		multi.defaultSettings = settings
-		local priority = settings.priority
+		if settings.priority then
-		if priority == 1 then
+			multi.mainloop = p_mainloop
-			self.uManager = self.uManagerRefP1
+		else
-		elseif self.priority == 2 then
+			multi.mainloop = mainloop
-			self.uManager = self.uManagerRefP2
-		elseif self.priority == 3 then
-			self.uManager = self.uManagerRefP3
-		elseif auto_priority then
-			self.uManager = self.uManagerRefP0
-		end
-		if settings.preLoop then
-			settings.preLoop(self)
-		end
-		if settings.stopOnError then
-			stopOnError = settings.stopOnError
 		end
 	end
-	multi.OnLoad:Fire()
+	return _G["$multi"].multi,_G["$multi"].thread
 end
 
-local ctask
+function multi:uManager(settings)
-local Loop
+	if self.Active then
+		__CurrentProcess = self
+		multi.OnPreLoad:Fire()
+		self.uManager=self.uManagerRef
+		multi.OnLoad:Fire()
+	end
+end
 
 function multi:uManagerRefP1()
 	if self.Active then
 		__CurrentProcess = self
-		Loop=self.Mainloop
+		local Loop=self.Mainloop
 		for _D=#Loop,1,-1 do
 			__CurrentTask = Loop[_D]
-			ctask = __CurrentTask
 			for P=1,9 do
-				if ctask then
+				if PList[P]%__CurrentTask.Priority==0 then
-					if PList[P]%ctask.Priority==0 then
+					__CurrentTask:Act()
-						if ctask.Active then
+					__CurrentProcess = self
-							ctask:Act()
-							__CurrentProcess = self
-						end
-					end
 				end
 			end
 		end
@@ -1758,16 +1712,11 @@ end
 function multi:uManagerRef()
 	if self.Active then
 		__CurrentProcess = self
-		Loop=self.Mainloop
+		local Loop=self.Mainloop
 		for _D=#Loop,1,-1 do
 			__CurrentTask = Loop[_D]
-			ctask = __CurrentTask
+			__CurrentTask:Act()
-			if ctask then
+			__CurrentProcess = self
-				if ctask.Active then
-					__CurrentProcess = self
-					ctask:Act()
-				end
-			end
 		end
 	end
 end
@@ -1820,15 +1769,11 @@ setmetatable(multi.DestroyedObj, {
 	end,__newindex = uni,__call = uni,__metatable = multi.DestroyedObj,__tostring = function() return "destroyed" end,__unm = uni,__add = uni,__sub = uni,__mul = uni,__div = uni,__mod = uni,__pow = uni,__concat = uni
 })
 math.randomseed(os.time())
-multi.defaultSettings = {
-	priority = 0
-}
 
 function multi:enableLoadDetection()
 	if multi.maxSpd then return end
 	-- here we are going to run a quick benchMark solo
 	local temp = self:newProcessor()
-	temp:Start()
 	local t = os.clock()
 	local stop = false
 	temp:benchMark(.01):OnBench(function(time,steps)

test3.lua

@@ -1,5 +1,5 @@
 package.path = "./?.lua;?/init.lua;"..package.path
-local multi,thread = require("multi"):init()
+local multi,thread = require("multi"):init{print=true,priority=true}
 --local GLOBAL,THREAD = require("multi.integration.lanesManager"):init()
 
 -- func = THREAD:newFunction(function(a,b,c)
@@ -27,28 +27,28 @@ local multi,thread = require("multi"):init()
 -- 	os.exit()
 -- end)
 print("Running benchmarks! ",_VERSION)
-local sleep_for = 3
+local sleep_for = 1
 local a = 0
 local c = 1
 local function bench(t,step)
 	a = a + step
 	c = c + 1
-	if c == 9 then
+	if c == 5 then
-		print("Total: "..a)
+		--print("Total: "..a)
 		os.exit()
 	end
 end--p_c,p_vh,p_h,p_an,p_n,p_bn,p_l,p_vl,p_i
 multi:benchMark(sleep_for,multi.Priority_Idle,"Idle:"):OnBench(bench)
-multi:benchMark(sleep_for,multi.Priority_Very_Low,"Very Low:"):OnBench(bench)
+--multi:benchMark(sleep_for,multi.Priority_Very_Low,"Very Low:"):OnBench(bench)
 multi:benchMark(sleep_for,multi.Priority_Low,"Low:"):OnBench()
-multi:benchMark(sleep_for,multi.Priority_Below_Normal,"Below Normal:"):OnBench(bench)
+--multi:benchMark(sleep_for,multi.Priority_Below_Normal,"Below Normal:"):OnBench(bench)
 multi:benchMark(sleep_for,multi.Priority_Normal,"Normal:"):OnBench(bench)
-multi:benchMark(sleep_for,multi.Priority_Above_Normal,"Above Normal:"):OnBench(bench)
+--multi:benchMark(sleep_for,multi.Priority_Above_Normal,"Above Normal:"):OnBench(bench)
 multi:benchMark(sleep_for,multi.Priority_High,"High:"):OnBench(bench)
-multi:benchMark(sleep_for,multi.Priority_Very_High,"Very High:"):OnBench(bench)
+--multi:benchMark(sleep_for,multi.Priority_Very_High,"Very High:"):OnBench(bench)
 multi:benchMark(sleep_for,multi.Priority_Core,"Core:"):OnBench(bench)
 multi.OnExit(function()
 	print("Total: ".. a)
 end)
 
-multi:mainloop{print=true,priority=1}
+multi:mainloop()