diff --git a/.editorconfig b/.editorconfig index 88d9686..07d946b 100644 --- a/.editorconfig +++ b/.editorconfig @@ -2,4 +2,4 @@ indent_size = 4 indent_style = space charset = utf-8 -end_of_line = lf +end_of_line = lf \ No newline at end of file diff --git a/.gitignore b/.gitignore index 75441a5..a176f65 100644 --- a/.gitignore +++ b/.gitignore @@ -7,3 +7,4 @@ crashsave* *.lsvs config.lua *.sfc +watchexec* \ No newline at end of file diff --git a/LICENSE.watchexec.md b/LICENSE.watchexec.md new file mode 100644 index 0000000..7f86ddf --- /dev/null +++ b/LICENSE.watchexec.md @@ -0,0 +1,201 @@ +Apache License +Version 2.0, January 2004 +http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "{}" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright {yyyy} {name of copyright owner} + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/README.md b/README.md index 7139d92..30d5e4a 100644 --- a/README.md +++ b/README.md @@ -45,6 +45,7 @@ If you want a better idea of what's going on with the tile and sprite calculatio * [Basic tilemap info from p4plus2/DKC2-disassembly](https://github.com/p4plus2/DKC2-disassembly) * [Serpent](https://github.com/pkulchenko/serpent) * [LibDeflate](https://github.com/SafeteeWoW/LibDeflate) +* [watchexec](https://github.com/watchexec/watchexec/blob/main/LICENSE) ## TODO diff --git a/config.lua b/config.lua index f2ee11c..b5209f1 100644 --- a/config.lua +++ b/config.lua @@ -35,9 +35,10 @@ _M.Filename = _M.PoolDir .. _M.State[1] _M.StartPowerup = 0 _M.NeatConfig = { -Threads = 7, +Threads = 2, --Filename = "DP1.state", SaveFile = _M.Filename .. ".pool", + Filename = _M.Filename, Population = 300, DeltaDisjoint = 2.0, diff --git a/pool.lua b/pool.lua index 0c8de75..5aa4c9c 100644 --- a/pool.lua +++ b/pool.lua @@ -6,7 +6,7 @@ local serpent = dofile(base.."/serpent.lua") local libDeflate = dofile(base.."/LibDeflate.lua") local hasThreads = - not util.isWin and + --not util.isWin and config.NeatConfig.Threads > 1 local Runner = nil if hasThreads then diff --git a/pool/PiratePanic.lsmv b/pool/PiratePanic.lsmv index a181c40..c5226f7 100644 Binary files a/pool/PiratePanic.lsmv and b/pool/PiratePanic.lsmv differ diff --git a/runner-process.lua b/runner-process.lua index f8c2d3b..0b23827 100644 --- a/runner-process.lua +++ b/runner-process.lua @@ -76,7 +76,7 @@ runner.onLoad(function(filename) ) end) -local waiter = util.waitForChange(inputFilePath) +local waiter = util.startWaiting(inputFilePath) local function waitLoop() if not first then @@ -89,15 +89,13 @@ local function waitLoop() print(string.format('Wrote init to output at %d', ts)) + first = true end print('Waiting for input from master process') - waiter:read("*a") - util.closeCmd(waiter) - - print('Received input from master process') + util.finishWaiting(waiter) local inputData = nil local ok = false @@ -111,6 +109,8 @@ local function waitLoop() end end + print('Received input from master process') + species = inputData[1] speciesId = species.id @@ -149,7 +149,7 @@ local function waitLoop() local inputFile = io.open(inputFilePath, "w") inputFile:close() - waiter = util.waitForChange(inputFilePath) + waiter = util.startWaiting(inputFilePath) -- Write the result local outFile = io.open(outputFilePath, "w") diff --git a/runner-wrapper.lua b/runner-wrapper.lua index ffc5c77..ea0451c 100644 --- a/runner-wrapper.lua +++ b/runner-wrapper.lua @@ -58,6 +58,10 @@ local function onMessage(_M, handler) end return function() + util.downloadFile('https://github.com/watchexec/watchexec/releases/download/1.13.1/watchexec-1.13.1-x86_64-pc-windows-gnu.zip', base..'/watchexec.zip') + util.unzip(base..'/watchexec.zip', base) + os.rename(base..'watchexec-1.13.1-x86_64-pc-windows-gnu', base..'/watchexec') + local _M = { onMessageHandler = {}, onSaveHandler = {}, @@ -128,14 +132,13 @@ return function() APPDATA = settingsDir, } - local waiter = util.waitForChange(outputFileName) + local waiter = util.startWaiting(outputFileName) local cmd = '"'..hostProcess..'" "--rom='..config.ROM..'" --unpause "--lua='..base..'/runner-process.lua"' local poppet = util.popenCmd(cmd, nil, envs) table.insert(_M.poppets, poppet) - waiter:read("*a") - util.closeCmd(waiter) + util.finishWaiting(waiter) end local waiters = {} @@ -143,7 +146,7 @@ return function() table.insert(waiters, outputPrefix..i) end - local waiter = util.waitForChange(waiters, nil, tmpFileName.."_output_*") + local waiter = util.startWaiting(waiters, nil, tmpFileName.."_output_*") message(_M, 'Setting up child processes') @@ -157,8 +160,7 @@ return function() message(_M, 'Waiting for child processes to finish') - waiter:read("*a") - util.closeCmd(waiter) + util.finishWaiting(waiter, #waiters) message(_M, 'Child processes finished') diff --git a/util.lua b/util.lua index 2f8935f..7783009 100644 --- a/util.lua +++ b/util.lua @@ -1,3 +1,5 @@ +local base = string.gsub(@@LUA_SCRIPT_FILENAME@@, "(.*[/\\])(.*)", "%1") + local _M = {} _M.isWin = package.config:sub(1, 1) == '\\' @@ -42,6 +44,22 @@ function _M.doCmd(...) return _M.scrapeCmd('*a', ...) end +--- Download a url +--- @param url string URI of resource to download +--- @param dest string File to save resource to +function _M.downloadFile (url, dest) + return _M.doCmd('curl -sL "'..url..'" > "'..dest..'" || wget -qO- "'..url..'" > "'..dest..'"') +end + +--- Unzip a ZIP file with unzip or tar +--- @param zipfile string The ZIP file path +--- @param dest string Where to unzip the ZIP file. Beware ZIP bombs. +function _M.unzip (zipfile, dest) + return _M.doCmd('unzip "'..zipfile..'" -d "'..dest.. + '" 2>&1 || tar -C "'..dest..'" -xvf "'..zipfile.. + '" 2>&1', nil) +end + --- Create a directory --- @return string dir The directory to create function _M.mkdir(dir) @@ -82,7 +100,27 @@ function _M.closeCmd(handle) end end -function _M.waitForChange(filenames, count, wild) +function _M.finishWaiting(waiter, count) + if count == nil then + count = 1 + end + + if _M.isWin then + local i = 1 + while i <= count do + local line = waiter:read("*l") + for chr in line:gmatch(";") do + i = i + 1 + end + i = i + 1 + end + else + waiter:read("*a") + _M.closeCmd(waiter) + end +end + +function _M.startWaiting(filenames, count, wild) if type(filenames) == 'string' then if wild == nil then wild = filenames @@ -99,11 +137,10 @@ function _M.waitForChange(filenames, count, wild) local sec, usec = utime() print(string.format('Starting watching file at %d', sec * 1000000 + usec)) - local poppet = _M.popenCmd([[powershell "$filename = ']]..wild.. - [[' ; $targetCount = ]]..count..[[ ; $count = 0 ; $action = { $count += 1 ; if ( $count -ge $targetCount ) { [Environment]::Exit(0) } } ; (Register-ObjectEvent (New-Object IO.FileSystemWatcher (Split-Path $filename), (Split-Path -Leaf $filename) -Property @{ IncludeSubdirectories = $false ; NotifyFilter = [IO.NotifyFilters]'FileName, LastWrite'}) -EventName Changed -SourceIdentifier RunnerDataChanged -Action $action).Name ; while($true) { Start-Sleep -Seconds 5 }"]]) + local cmd = '"'..base..'/watchexec/watchexec.exe" "-w" "'..table.concat(filenames, '" "-w" "')..'" "echo" "%WATCHEXEC_WRITTEN_PATH%"' + local poppet = _M.popenCmd(cmd, base) - while poppet:read('*l'):sub(1, 17) ~= 'RunnerDataChanged' do - end + poppet:read("*l") return poppet else