ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

unified camelCase for Lua functions, changed Lua test script

This commit is contained in:
Ashafix 2017-12-24 11:42:51 +01:00
parent 4d063f6061
commit 07da0170fa
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Assets/Lua/UnitTests/TestCommunication_All.lua
View File

@ -9,8 +9,8 @@ function get_baseline()
t = os.clock()
while i > 0 do
emu.frameadvance();
i = i - 1;
emu.frameadvance()
i = i - 1
end
baseline = os.clock() - t
print('Baseline: ' .. round(baseline, 3) .. " secs")
@ -22,9 +22,9 @@ function test_mmf()
client.reboot_core()
t = os.clock()
while i > 0 do
emu.frameadvance();
emu.frameadvance()
comm.mmfScreenshot()
i = i - 1;
i = i - 1
end
print('Memory mapped files: ' .. round((os.clock() - t - baseline), 3) .. " secs")
end
@ -38,7 +38,7 @@ function test_http()
while i > 0 do
emu.frameadvance()
comm.httpTestGet()
i = i - 1;
i = i - 1
end
print('HTTP get: ' .. round((os.clock() - t - baseline), 3) .. " secs")
@ -49,7 +49,7 @@ function test_http()
while i > 0 do
emu.frameadvance()
comm.httpPostScreenshot()
i = i - 1;
i = i - 1
end
print('HTTP post: ' .. round((os.clock() - t - baseline), 3) .. " secs")
@ -62,8 +62,8 @@ function test_socket()
t = os.clock()
while i > 0 do
emu.frameadvance()
comm.SocketServerScreenShot()
i = i - 1;
comm.socketServerScreenShot()
i = i - 1
end
print('Socket server: ' .. round((os.clock() - t - baseline), 3) .. " secs")
end
@ -71,23 +71,23 @@ end
function test_socketresponse()
best_time = -100
timeouts = {1, 2, 3, 4, 5, 10, 20, 25, 50, 100, 250, 500, 1000}
comm.SocketServerSetTimeout(1000);
resp = comm.SocketServerScreenShotResponse()
comm.socketServerSetTimeout(1000)
resp = comm.socketServerScreenShotResponse()
for t, timeout in ipairs(timeouts) do
comm.SocketServerSetTimeout(timeout);
comm.socketServerSetTimeout(timeout)
client.reboot_core()
print("Trying to find minimal timeout for Socket server")
i = 100
t = os.clock()
while i > 0 do
emu.frameadvance()
resp = comm.SocketServerScreenShotResponse()
resp = comm.socketServerScreenShotResponse()
if resp ~= 'ack' then
i = -100
print(resp)
print("Failed to a get a proper response")
end
i = i - 1;
i = i - 1
end
if i > -100 then
print("Best timeout: " .. timeout .. " msecs")
@ -113,7 +113,7 @@ function test_http_response()
i = 0
err = true
end
i = i - 1;
i = i - 1
end
if not err then
print("HTTP GET looks fine: No errors occurred")
@ -121,7 +121,7 @@ function test_http_response()
client.reboot_core()
i = 100
err = false;
err = false
while i > 0 do
emu.frameadvance()
resp = comm.httpPostScreenshot()
@ -131,7 +131,7 @@ function test_http_response()
i = 0
err = true
end
i = i - 1;
i = i - 1
end
if not err then
print("HTTP POST looks fine: No errors occurred")

12
BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Communication.cs
View File

@ -41,34 +41,34 @@ namespace BizHawk.Client.EmuHawk
return list.ToString();
}
[LuaMethod("SocketServerScreenShot", "sends a screenshot to the Socket server")]
[LuaMethod("socketServerScreenShot", "sends a screenshot to the Socket server")]
public string SocketServerScreenShot()
{
return GlobalWin.socketServer.SendScreenshot();
}
[LuaMethod("SocketServerScreenShotResponse", "sends a screenshot to the Socket server and retrieves the response")]
[LuaMethod("socketServerScreenShotResponse", "sends a screenshot to the Socket server and retrieves the response")]
public string SocketServerScreenShotResponse()
{
return GlobalWin.socketServer.SendScreenshot(1000).ToString();
}
[LuaMethod("SocketServerSend", "sends a string to the Socket server")]
[LuaMethod("socketServerSend", "sends a string to the Socket server")]
public string SocketServerSend(string SendString)
{
return "Sent : " + GlobalWin.socketServer.SendString(SendString).ToString() + " bytes";
}
[LuaMethod("SocketServerResponse", "receives a message from the Socket server")]
[LuaMethod("socketServerResponse", "receives a message from the Socket server")]
public string SocketServerResponse()
{
return GlobalWin.socketServer.ReceiveMessage();
}
[LuaMethod("SocketServerSuccessful", "returns the status of the last Socket server action")]
[LuaMethod("socketServerSuccessful", "returns the status of the last Socket server action")]
public bool SocketServerSuccessful()
{
return GlobalWin.socketServer.Successful();
}
[LuaMethod("SocketServerSetTimeout", "sets the timeout in milliseconds for receiving messages")]
[LuaMethod("socketServerSetTimeout", "sets the timeout in milliseconds for receiving messages")]
public void SocketServerSetTimeout(int timeout)
{
GlobalWin.socketServer.SetTimeout(timeout);