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

Merge branch 'development' of https://github.com/mjbudd77/fceux into development

This commit is contained in:
Matthew Budd 2020-11-27 19:56:31 -05:00
parent 3982d1b897 a7b031ee81
commit 8d0de7793a
2 changed files with 102 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
src/drivers/Qt/ConsoleWindow.cpp
View File

@ -1783,8 +1783,7 @@ void consoleWin_t::aboutQt(void)
void consoleWin_t::setPriority( QThread::Priority priority_req ) void consoleWin_t::setPriority( QThread::Priority priority_req )
{ {
#if defined(__linux__)
#ifdef __linux__
struct sched_param p; struct sched_param p;
int minPrio, maxPrio; int minPrio, maxPrio;
@ -1809,6 +1808,45 @@ void consoleWin_t::setPriority( QThread::Priority priority_req )
} }
printf("sched_getscheduler(): %i \n", sched_getscheduler( getpid() ) ); printf("sched_getscheduler(): %i \n", sched_getscheduler( getpid() ) );
#elif defined(__APPLE__)
struct sched_param p;
int oldPolicy, newPolicy, minPrio, maxPrio;
QThread *qself;
pthread_t self;
qself = QThread::currentThread();
self = pthread_self();
newPolicy = SCHED_FIFO;
printf("QThreadID: %p \n", QThread::currentThreadId() );
printf("PThreadID: %p \n", self );
minPrio = sched_get_priority_min( SCHED_FIFO );
maxPrio = sched_get_priority_max( SCHED_FIFO );
pthread_getschedparam( self, &oldPolicy, &p );
printf("GUI pthread_getschedparam(): %i, %i \n", oldPolicy, p.sched_priority );
qself->setPriority( priority_req );
p.sched_priority = maxPrio;
//if ( ::pthread_setschedparam( self, newPolicy, &p ) != 0 )
//{
//perror("GUI thread pthread_setschedparam error: ");
//}
pthread_getschedparam( self, &oldPolicy, &p );
printf("GUI pthread_getschedparam(): %i, %i \n", oldPolicy, p.sched_priority );
if ( ::setpriority( PRIO_PROCESS, getpid(), -20 ) )
{
perror("GUI thread setpriority error: ");
}
printf("GUI Thread setpriority(): %i \n", ::getpriority( PRIO_PROCESS, getpid() ) );
#else #else
QThread *mainThread; QThread *mainThread;
@ -1871,6 +1909,9 @@ void consoleWin_t::updatePeriodic(void)
emulatorThread_t::emulatorThread_t(void) emulatorThread_t::emulatorThread_t(void)
{ {
#if defined(__linux__) || defined(__APPLE__)
pself = 0;
#endif
} }
@ -1888,28 +1929,26 @@ void emulatorThread_t::setPriority( QThread::Priority priority_req )
printf("New Priority: %i \n", priority_req ); printf("New Priority: %i \n", priority_req );
printf("Old Priority: %i \n", priority() ); printf("Old Priority: %i \n", priority() );
QThread::setPriority( priority_req ); //QThread::setPriority( priority_req );
printf("Set Priority: %i \n", priority() ); printf("Set Priority: %i \n", priority() );
#ifdef __linux__ #if defined(__linux__)
struct sched_param p; struct sched_param p;
int oldPolicy, newPolicy, minPrio, maxPrio; int oldPolicy, newPolicy, minPrio, maxPrio;
pthread_t self;
self = pthread_self();
newPolicy = SCHED_FIFO; newPolicy = SCHED_FIFO;
minPrio = sched_get_priority_min( SCHED_FIFO ); minPrio = sched_get_priority_min( SCHED_FIFO );
maxPrio = sched_get_priority_max( SCHED_FIFO ); maxPrio = sched_get_priority_max( SCHED_FIFO );
pthread_getschedparam( self, &oldPolicy, &p ); pthread_getschedparam( pself, &oldPolicy, &p );
printf("pthread_getschedparam(): %i, %i \n", oldPolicy, p.sched_priority ); printf("pthread_getschedparam(): %i, %i \n", oldPolicy, p.sched_priority );
p.sched_priority = maxPrio; p.sched_priority = maxPrio;
if ( ::pthread_setschedparam( self, newPolicy, &p ) != 0 ) if ( ::pthread_setschedparam( pself, newPolicy, &p ) != 0 )
{ {
perror("Emulator thread pthread_setschedparam error: "); perror("Emulator thread pthread_setschedparam error: ");
} }
@ -1930,9 +1969,52 @@ void emulatorThread_t::setPriority( QThread::Priority priority_req )
//} //}
printf("sched_getscheduler(): %i \n", sched_getscheduler( getpid() ) ); printf("sched_getscheduler(): %i \n", sched_getscheduler( getpid() ) );
pthread_getschedparam( self, &oldPolicy, &p ); pthread_getschedparam( pself, &oldPolicy, &p );
printf("pthread_getschedparam(): %i, %i \n", oldPolicy, p.sched_priority ); printf("pthread_getschedparam(): %i, %i \n", oldPolicy, p.sched_priority );
#elif defined(__APPLE__)
struct sched_param p;
int oldPolicy, newPolicy, minPrio, maxPrio;
newPolicy = SCHED_FIFO;
if ( ::setpriority( PRIO_PROCESS, getpid(), -20 ) )
{
perror("Emulator thread setpriority error: ");
}
printf("EMU setpriority(): %i \n", ::getpriority( PRIO_PROCESS, getpid() ) );
minPrio = sched_get_priority_min( SCHED_FIFO );
maxPrio = sched_get_priority_max( SCHED_FIFO );
printf("sched_get_priority_min(SCHED_FIFO): %i \n", minPrio );
printf("sched_get_priority_max(SCHED_FIFO): %i \n", maxPrio );
pthread_getschedparam( pself, &oldPolicy, &p );
printf("EMU pthread_getschedparam(): %i, %i \n", oldPolicy, p.sched_priority );
//for (int i=0; i<7; i++)
//{
// QThread::setPriority( (QThread::Priority)i);
// pthread_getschedparam( pself, &oldPolicy, &p );
// printf("%i: EMU pthread_getschedparam(): %i, %i \n", i, oldPolicy, p.sched_priority );
//}
p.sched_priority = maxPrio;
if ( ::pthread_setschedparam( pself, newPolicy, &p ) != 0 )
{
perror("Emulator thread pthread_setschedparam error: ");
}
pthread_getschedparam( pself, &oldPolicy, &p );
printf("EMU pthread_getschedparam(): %i, %i \n", oldPolicy, p.sched_priority );
#endif #endif
} }
@ -1941,6 +2023,14 @@ void emulatorThread_t::run(void)
printf("Emulator Start\n"); printf("Emulator Start\n");
nes_shm->runEmulator = 1; nes_shm->runEmulator = 1;
#if defined(__linux__) || defined(__APPLE__)
if ( pthread_self() == (pthread_t)QThread::currentThreadId() )
{
pself = pthread_self();
printf("EMU is using PThread: %p\n", (void*)pself);
}
#endif
setPriority( QThread::TimeCriticalPriority ); setPriority( QThread::TimeCriticalPriority );
while ( nes_shm->runEmulator ) while ( nes_shm->runEmulator )

3
src/drivers/Qt/ConsoleWindow.h
View File

@ -37,6 +37,9 @@ class emulatorThread_t : public QThread
void setPriority( QThread::Priority priority ); void setPriority( QThread::Priority priority );
private: private:
#if defined(__linux__) || defined(__APPLE__)
pthread_t pself;
#endif
signals: signals:
void finished(); void finished();