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

Tools: Clean up unused argument in mgba-perf

This commit is contained in:
Vicki Pfau 2020-01-09 18:28:16 -08:00
parent a566c9ab66
commit bf595be5c3
3 changed files with 19 additions and 11 deletions
CHANGES
src/platform/test
perf-main.c
tools
perf.py

1
CHANGES
View File

@ -119,6 +119,7 @@ Misc:
- SDL: Use controller GUID instead of name - SDL: Use controller GUID instead of name
- SM83: Rename LR35902 to SM83 - SM83: Rename LR35902 to SM83
- Tools: Allow using threaded renderer in perf.py - Tools: Allow using threaded renderer in perf.py
- Tools: Clean up unused argument in mgba-perf
0.8 beta 1: (2019-10-20) 0.8 beta 1: (2019-10-20)
- Initial beta for 0.8 - Initial beta for 0.8

27
src/platform/test/perf-main.c
View File

@ -63,12 +63,13 @@ static void _mPerfShutdown(int signal);
static bool _parsePerfOpts(struct mSubParser* parser, int option, const char* arg); static bool _parsePerfOpts(struct mSubParser* parser, int option, const char* arg);
static void _log(struct mLogger*, int, enum mLogLevel, const char*, va_list); static void _log(struct mLogger*, int, enum mLogLevel, const char*, va_list);
static bool _mPerfRunCore(const char* fname, const struct mArguments*, const struct PerfOpts*); static bool _mPerfRunCore(const char* fname, const struct mArguments*, const struct PerfOpts*);
static bool _mPerfRunServer(const char* listen, const struct mArguments*, const struct PerfOpts*); static bool _mPerfRunServer(const struct mArguments*, const struct PerfOpts*);
static bool _dispatchExiting = false; static bool _dispatchExiting = false;
static struct VFile* _savestate = 0; static struct VFile* _savestate = 0;
static void* _outputBuffer = NULL; static void* _outputBuffer = NULL;
static Socket _socket = INVALID_SOCKET; static Socket _socket = INVALID_SOCKET;
static Socket _server = INVALID_SOCKET;
int main(int argc, char** argv) { int main(int argc, char** argv) {
#ifdef _3DS #ifdef _3DS
@ -100,7 +101,7 @@ int main(int argc, char** argv) {
struct mArguments args = {}; struct mArguments args = {};
bool parsed = parseArguments(&args, argc, argv, &subparser); bool parsed = parseArguments(&args, argc, argv, &subparser);
if (!args.fname) { if (!args.fname && !perfOpts.server) {
parsed = false; parsed = false;
} }
if (!parsed || args.showHelp) { if (!parsed || args.showHelp) {
@ -127,7 +128,7 @@ int main(int argc, char** argv) {
#endif #endif
} }
if (perfOpts.server) { if (perfOpts.server) {
didFail = !_mPerfRunServer(args.fname, &args, &perfOpts); didFail = !_mPerfRunServer(&args, &perfOpts);
} else { } else {
didFail = !_mPerfRunCore(args.fname, &args, &perfOpts); didFail = !_mPerfRunCore(args.fname, &args, &perfOpts);
} }
@ -266,19 +267,24 @@ static void _mPerfRunloop(struct mCore* core, int* frames, bool quiet) {
} }
} }
static bool _mPerfRunServer(const char* listen, const struct mArguments* args, const struct PerfOpts* perfOpts) { static bool _mPerfRunServer(const struct mArguments* args, const struct PerfOpts* perfOpts) {
SocketSubsystemInit(); SocketSubsystemInit();
Socket server = SocketOpenTCP(7216, NULL); _server = SocketOpenTCP(7216, NULL);
if (SOCKET_FAILED(server)) { if (SOCKET_FAILED(_server)) {
SocketSubsystemDeinit(); SocketSubsystemDeinit();
return false; return false;
} }
if (SOCKET_FAILED(SocketListen(server, 0))) { if (SOCKET_FAILED(SocketListen(_server, 0))) {
SocketClose(server); SocketClose(_server);
SocketSubsystemDeinit();
return false;
}
_socket = SocketAccept(_server, NULL);
if (SOCKET_FAILED(_socket)) {
SocketClose(_server);
SocketSubsystemDeinit(); SocketSubsystemDeinit();
return false; return false;
} }
_socket = SocketAccept(server, NULL);
if (perfOpts->csv) { if (perfOpts->csv) {
const char* header = "game_code,frames,duration,renderer\n"; const char* header = "game_code,frames,duration,renderer\n";
SocketSend(_socket, header, strlen(header)); SocketSend(_socket, header, strlen(header));
@ -301,7 +307,7 @@ static bool _mPerfRunServer(const char* listen, const struct mArguments* args, c
memset(path, 0, sizeof(path)); memset(path, 0, sizeof(path));
} }
SocketClose(_socket); SocketClose(_socket);
SocketClose(server); SocketClose(_server);
SocketSubsystemDeinit(); SocketSubsystemDeinit();
return true; return true;
} }
@ -310,6 +316,7 @@ static void _mPerfShutdown(int signal) {
UNUSED(signal); UNUSED(signal);
_dispatchExiting = true; _dispatchExiting = true;
SocketClose(_socket); SocketClose(_socket);
SocketClose(_server);
} }
static bool _parsePerfOpts(struct mSubParser* parser, int option, const char* arg) { static bool _parsePerfOpts(struct mSubParser* parser, int option, const char* arg) {

2
tools/perf.py
View File

@ -90,7 +90,7 @@ class PerfServer(object):
server_command = list(self.command) server_command = list(self.command)
else: else:
server_command = [os.path.join(os.getcwd(), PerfTest.EXECUTABLE)] server_command = [os.path.join(os.getcwd(), PerfTest.EXECUTABLE)]
server_command.extend(['--', '-PD', '0']) server_command.extend(['--', '-PD'])
if hasattr(test, "frames"): if hasattr(test, "frames"):
server_command.extend(['-F', str(test.frames)]) server_command.extend(['-F', str(test.frames)])
if not test.renderer: if not test.renderer: