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

Changed Qt trace logger to use native windows file access functions to make disk access more efficient.

This commit is contained in:
mjbudd77 2021-04-26 21:10:55 -04:00
parent 84b900b73b
commit f386dfb428
1 changed files with 63 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

90
src/drivers/Qt/TraceLogger.cpp
View File

@ -103,10 +103,16 @@ static traceRecord_t *logBuf = NULL;
static int logBufMax = 3000000; static int logBufMax = 3000000;
static int logBufHead = 0; static int logBufHead = 0;
static int logBufTail = 0; static int logBufTail = 0;
static FILE *logFile = NULL;
static bool overrunWarningArmed = true; static bool overrunWarningArmed = true;
static TraceLoggerDialog_t *traceLogWindow = NULL; static TraceLoggerDialog_t *traceLogWindow = NULL;
static void pushMsgToLogBuffer(const char *msg); static void pushMsgToLogBuffer(const char *msg);
#ifdef WIN32
#include <windows.h>
static HANDLE logFile = INVALID_HANDLE_VALUE;
#else
static int logFile = -1;
#endif
static char logFilePath[512];
//---------------------------------------------------- //----------------------------------------------------
TraceLoggerDialog_t::TraceLoggerDialog_t(QWidget *parent) TraceLoggerDialog_t::TraceLoggerDialog_t(QWidget *parent)
: QDialog(parent, Qt::Window) : QDialog(parent, Qt::Window)
@ -370,24 +376,24 @@ void TraceLoggerDialog_t::updatePeriodic(void)
traceViewDrawEnable = 0; traceViewDrawEnable = 0;
} }
if (logFile && logFileCbox->isChecked()) //if (logFileCbox->isChecked())
{
//char line[256];
//while (recBufHead != recBufTail)
//{ //{
// recBuf[recBufTail].convToText(line); // //char line[256];
// fprintf(logFile, "%s\n", line); // //while (recBufHead != recBufTail)
// //{
// // recBuf[recBufTail].convToText(line);
// recBufTail = (recBufTail + 1) % recBufMax; // // fprintf(logFile, "%s\n", line);
// // recBufTail = (recBufTail + 1) % recBufMax;
// //}
//}
//else
//{
// recBufTail = recBufHead;
// overrunWarningArmed = true;
//} //}
}
else
{
recBufTail = recBufHead;
overrunWarningArmed = true;
}
if (traceViewCounter > 5) if (traceViewCounter > 5)
{ {
@ -517,12 +523,7 @@ void TraceLoggerDialog_t::openLogFile(void)
} }
//qDebug() << "selected file path : " << filename.toUtf8(); //qDebug() << "selected file path : " << filename.toUtf8();
if (logFile) strcpy( logFilePath, filename.toStdString().c_str() );
{
fclose(logFile);
logFile = NULL;
}
logFile = fopen(filename.toStdString().c_str(), "wb");
return; return;
} }
@ -2189,11 +2190,18 @@ TraceLogDiskThread_t::TraceLogDiskThread_t( QObject *parent )
TraceLogDiskThread_t::~TraceLogDiskThread_t(void) TraceLogDiskThread_t::~TraceLogDiskThread_t(void)
{ {
printf("Disk Thread Cleanup\n"); printf("Disk Thread Cleanup\n");
if (logFile) #ifdef WIN32
if (logFile != INVALID_HANDLE_VALUE)
{ {
fclose(logFile); CloseHandle( logFile );
logFile = NULL; logFile = INVALID_HANDLE_VALUE;
} }
#else
if ( logFile != -1 )
{
close(logFile); logFile = -1;
}
#endif
if ( logBuf ) if ( logBuf )
{ {
@ -2211,11 +2219,21 @@ void TraceLogDiskThread_t::run(void)
printf("Trace Log Disk Start\n"); printf("Trace Log Disk Start\n");
if ( logFile == NULL ) #ifdef WIN32
logFile = CreateFileA( logFilePath, GENERIC_WRITE,
0, NULL, OPEN_ALWAYS, FILE_FLAG_WRITE_THROUGH | FILE_FLAG_NO_BUFFERING, NULL );
if ( logFile == INVALID_HANDLE_VALUE )
{ {
return; return;
} }
#else
if ( logFile == -1 )
{
return;
}
#endif
if ( logBuf == NULL ) if ( logBuf == NULL )
{ {
size_t size; size_t size;
@ -2245,8 +2263,13 @@ void TraceLogDiskThread_t::run(void)
if ( idx >= blockSize ) if ( idx >= blockSize )
{ {
#ifdef WIN32
DWORD bytesWritten;
WriteFile( logFile, buf, idx, &bytesWritten, NULL ); idx = 0;
#else
fwrite( buf, idx, 1, logFile ); idx = 0; fwrite( buf, idx, 1, logFile ); idx = 0;
//fflush(logFile); //fflush(logFile);
#endif
} }
} }
SDL_Delay(1); SDL_Delay(1);
@ -2254,14 +2277,25 @@ void TraceLogDiskThread_t::run(void)
if ( idx > 0 ) if ( idx > 0 )
{ {
#ifdef WIN32
DWORD bytesWritten;
WriteFile( logFile, buf, idx, &bytesWritten, NULL ); idx = 0;
#else
fwrite( buf, idx, 1, logFile ); idx = 0; fwrite( buf, idx, 1, logFile ); idx = 0;
#endif
} }
if (logFile) #ifdef WIN32
if ( logFile != INVALID_HANDLE_VALUE )
{ {
fclose(logFile); CloseHandle( logFile ); logFile = INVALID_HANDLE_VALUE;
logFile = NULL;
} }
#else
if ( logFile != -1 )
{
close(logFile); logFile = -1;
}
#endif
printf("Trace Log Disk Exit\n"); printf("Trace Log Disk Exit\n");
emit finished(); emit finished();