diff --git a/changes.md b/changes.md index 5a07567..c77cc59 100644 --- a/changes.md +++ b/changes.md @@ -77,7 +77,7 @@ Changed: Removed: --- - `multi:newFunction(func)` - - `thread:newFunction(func)` Has many more features and replaces multi:newFunction did + - `thread:newFunction(func)` Has many more features and replaces what multi:newFunction did - Calling Fire on a connection no longer returns anything! Now that internal features use connections, I noticed how slow connections are and have increased their speed quite a bit. From 50,000 Steps per seconds to almost 7 Million. All other features should work just fine. Only returning values has been removed diff --git a/multi/init.lua b/multi/init.lua index 11753d0..5a099bc 100644 --- a/multi/init.lua +++ b/multi/init.lua @@ -92,7 +92,7 @@ end --Processor local priorityTable = {[0]="Round-Robin",[1]="Balanced",[2]="Top-Down",[3]="Timed-Based-Balancer"} -local ProcessName = {[true]="SubProcessor",[false]="MainProcessor"} +local ProcessName = {"SubProcessor","MainProcessor"} local globalThreads = {} function multi:getTasksDetails(t) if not(t) then @@ -153,9 +153,9 @@ 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"].."<"..(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.defaultSettings.priority or 0].."\n\n"..dat..dat2.."\n\n"..s else - return "Load on "..ProcessName[self.Type=="process"].."<"..(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.defaultSettings.priority or 0].."\n\n"..dat2.."\n\n"..s end else local load,steps = self:getLoad() diff --git a/tests/runtests.lua b/tests/runtests.lua index d9f4d0c..4249110 100644 --- a/tests/runtests.lua +++ b/tests/runtests.lua @@ -1,4 +1,4 @@ -package.path="../?.lua;../?/init.lua;../?.lua;../?/?/init.lua;"..package.path +package.path="./?.lua;../?.lua;../?/init.lua;../?.lua;../?/?/init.lua;"..package.path --[[ This file runs all tests. Format: