discomfitor pushed a commit to branch master. http://git.enlightenment.org/core/efl.git/commit/?id=b3b104a1e72d022e5bb7cfa87e6f01b7142ec505
commit b3b104a1e72d022e5bb7cfa87e6f01b7142ec505 Author: Mike Blumenkrantz <[email protected]> Date: Mon Jun 25 15:16:39 2018 -0400 eina/debug_cpu: rework thread usage Summary: this changes the explicit pthread usage (and reimplementation of eina_thread_create) to just use eina function calls. it also causes the thread to start and stop when profiling is enabled and resolves some possible errors which could occur after a fork or when trying to compile under windows pthread usage: this code appears to have been 100% copied from eina_thread.c, and it isn't clear to me why existing eina_thread api was not used. this has no functional benefit, but it makes the code more readable thread lifetime: there is no need to have a thread running at all times for a feature which will be rarely used and which must be explicitly enabled by the user windows: this file previously generated a lot of compiler warnings from unused functions and variables since nothing here is available under windows. the entire file is now a giant #ifndef _WIN32 to avoid any compile warnings or unexpected runtime behavior fix T7055 Depends on D6371 Reviewers: ManMower, vtorri, devilhorns Reviewed By: ManMower Subscribers: cedric, #committers Tags: #efl Maniphest Tasks: T7055 Differential Revision: https://phab.enlightenment.org/D6372 --- src/lib/eina/eina_debug_cpu.c | 110 +++++++++++++++++------------------------- 1 file changed, 44 insertions(+), 66 deletions(-) diff --git a/src/lib/eina/eina_debug_cpu.c b/src/lib/eina/eina_debug_cpu.c index 2cc382d84b..b4c3cf49c4 100644 --- a/src/lib/eina/eina_debug_cpu.c +++ b/src/lib/eina/eina_debug_cpu.c @@ -25,21 +25,15 @@ #include "eina_evlog.h" #include "eina_debug_private.h" -#ifdef EINA_HAVE_PTHREAD_SETNAME -# ifndef __linux__ -# include <pthread_np.h> -# endif -#endif - +#ifndef _WIN32 volatile int _eina_debug_sysmon_reset = 0; volatile int _eina_debug_sysmon_active = 0; volatile int _eina_debug_evlog_active = 0; volatile int _eina_debug_cpu_active = 0; Eina_Lock _sysmon_lock; -static Eina_Condition _exit_cond; -static pthread_t _sysmon_thread; +static Eina_Thread _sysmon_thread; // this is a DEDICATED thread tojust collect system info and to have the // least impact it can on a cpu core or system. all this does right now @@ -47,7 +41,7 @@ static pthread_t _sysmon_thread; // right now that means iterating through cpu's and getting their cpu // frequency to match up with event logs. static void * -_sysmon(void *_data EINA_UNUSED) +_sysmon(void *data EINA_UNUSED, Eina_Thread thr EINA_UNUSED) { static int cpufreqs[64] = { 0 }; int i, fd, freq; @@ -65,14 +59,7 @@ _sysmon(void *_data EINA_UNUSED) #endif // set a name for this thread for system debugging -#ifdef EINA_HAVE_PTHREAD_SETNAME -# ifndef __linux__ - pthread_set_name_np -# else - pthread_setname_np -# endif - (pthread_self(), "Edbg-sys"); -#endif + eina_thread_name_set(eina_thread_self(), "Edbg-sys"); for (;;) { // wait on a mutex that will be locked for as long as this @@ -137,7 +124,7 @@ _sysmon(void *_data EINA_UNUSED) } for (i = 0; i < _eina_debug_thread_active_num; i++) { - pthread_t thread = _eina_debug_thread_active[i].thread; + Eina_Thread thread = _eina_debug_thread_active[i].thread; // get the clock for the thread and its cpu time usage pthread_getcpuclockid(thread, &cid); clock_gettime(cid, &t); @@ -249,7 +236,7 @@ _sysmon(void *_data EINA_UNUSED) } usleep(1000); // 1ms sleep } - eina_condition_signal(&_exit_cond); + _eina_debug_cpu_active = -1; eina_lock_release(&_sysmon_lock); return NULL; } @@ -257,30 +244,55 @@ _sysmon(void *_data EINA_UNUSED) static Eina_Bool _cpufreq_on_cb(Eina_Debug_Session *session EINA_UNUSED, int cid EINA_UNUSED, void *buffer EINA_UNUSED, int size EINA_UNUSED) { + Eina_Bool err; if (!_eina_debug_evlog_active) { _eina_debug_evlog_active = 1; eina_evlog_start(); } - if (!_eina_debug_sysmon_active) + if (_eina_debug_sysmon_active) return EINA_TRUE; + + eina_lock_take(&_sysmon_lock); + + err = eina_thread_create(&_sysmon_thread, EINA_THREAD_NORMAL, -1, _sysmon, NULL); + + if (!err) { - _eina_debug_sysmon_reset = 1; - _eina_debug_sysmon_active = 1; - // this is intended. taking this lock allows sysmon to run + e_debug("EINA DEBUG ERROR: Can't create debug sysmon thread!"); eina_lock_release(&_sysmon_lock); + return EINA_FALSE; } + _eina_debug_cpu_active = 1; + _eina_debug_sysmon_reset = 1; + _eina_debug_sysmon_active = 1; + eina_lock_release(&_sysmon_lock); return EINA_TRUE; } -static Eina_Bool -_cpufreq_off_cb(Eina_Debug_Session *session EINA_UNUSED, int cid EINA_UNUSED, void *buffer EINA_UNUSED, int size EINA_UNUSED) +static void +_stop_cpu_thread(void) { - if (_eina_debug_sysmon_active) + extern Eina_Bool fork_resetting; + eina_lock_take(&_sysmon_lock); + _eina_debug_cpu_active = 0; + eina_lock_release(&_sysmon_lock); + /* wait for thread to exit */ + while (!fork_resetting) { - // this is intended. taking this lock blocks sysmod from running + usleep(1000); eina_lock_take(&_sysmon_lock); - _eina_debug_sysmon_active = 0; + if (_eina_debug_cpu_active == -1) break; + eina_lock_release(&_sysmon_lock); } + _eina_debug_cpu_active = 0; + eina_lock_release(&_sysmon_lock); +} + +static Eina_Bool +_cpufreq_off_cb(Eina_Debug_Session *session EINA_UNUSED, int cid EINA_UNUSED, void *buffer EINA_UNUSED, int size EINA_UNUSED) +{ + if (!_eina_debug_sysmon_active) return EINA_TRUE; + _stop_cpu_thread(); if (_eina_debug_evlog_active) { eina_evlog_stop(); @@ -294,41 +306,13 @@ EINA_DEBUG_OPCODES_ARRAY_DEFINE(_OPS, {"CPU/Freq/off", NULL, &_cpufreq_off_cb}, {NULL, NULL, NULL} ); +#endif Eina_Bool _eina_debug_cpu_init(void) { #ifndef _WIN32 - int err; - sigset_t oldset, newset; - eina_lock_new(&_sysmon_lock); - eina_lock_take(&_sysmon_lock); - sigemptyset(&newset); - sigaddset(&newset, SIGPIPE); - sigaddset(&newset, SIGALRM); - sigaddset(&newset, SIGCHLD); - sigaddset(&newset, SIGUSR1); - sigaddset(&newset, SIGUSR2); - sigaddset(&newset, SIGHUP); - sigaddset(&newset, SIGQUIT); - sigaddset(&newset, SIGINT); - sigaddset(&newset, SIGTERM); -#ifdef SIGPWR - sigaddset(&newset, SIGPWR); -#endif - pthread_sigmask(SIG_BLOCK, &newset, &oldset); - _eina_debug_cpu_active = 1; - eina_condition_new(&_exit_cond, &_sysmon_lock); - - err = pthread_create(&_sysmon_thread, NULL, _sysmon, NULL); - - pthread_sigmask(SIG_SETMASK, &oldset, NULL); - if (err != 0) - { - e_debug("EINA DEBUG ERROR: Can't create debug sysmon thread!"); - abort(); - } eina_debug_opcodes_register(NULL, _OPS(), NULL, NULL); #endif return EINA_TRUE; @@ -337,17 +321,11 @@ _eina_debug_cpu_init(void) Eina_Bool _eina_debug_cpu_shutdown(void) { - extern Eina_Bool fork_resetting; - +#ifndef _WIN32 if (_eina_debug_sysmon_active) - eina_lock_take(&_sysmon_lock); - _eina_debug_cpu_active = 0; - if (!fork_resetting) - eina_condition_wait(&_exit_cond); - eina_condition_free(&_exit_cond); - eina_lock_release(&_sysmon_lock); + _stop_cpu_thread(); eina_lock_free(&_sysmon_lock); _eina_debug_sysmon_reset = _eina_debug_sysmon_active = _eina_debug_evlog_active = 0; +#endif return EINA_TRUE; } - --
