summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcarlos <caiosignor@gmail.com>2020-04-20 09:58:15 -0300
committerJoão Paulo Taylor Ienczak Zanette <jpaulotiz@gmail.com>2020-04-29 12:13:38 -0300
commit0c7d90a12cd4fefc02c39104e38ea21485afc364 (patch)
tree75b16c95392dbabab07f66a8aab24d432bb44e41
parent5c89d47bdc626abc6c7a2d15eadfad35bcb257d6 (diff)
EINA_THREAD_JOIN_CANCELED in eina_thread.h
-rw-r--r--src/lib/eina/eina_debug.c3
-rw-r--r--src/lib/eina/eina_debug_timer.c6
-rw-r--r--src/lib/eina/eina_thread.c2
-rw-r--r--src/lib/eina/eina_thread.h1
4 files changed, 6 insertions, 6 deletions
diff --git a/src/lib/eina/eina_debug.c b/src/lib/eina/eina_debug.c
index eab73388b0..78808656a2 100644
--- a/src/lib/eina/eina_debug.c
+++ b/src/lib/eina/eina_debug.c
@@ -35,7 +35,6 @@
35#include <sys/time.h> 35#include <sys/time.h>
36#include <sys/types.h> 36#include <sys/types.h>
37#include <sys/stat.h> 37#include <sys/stat.h>
38#include <pthread.h>
39#include <signal.h> 38#include <signal.h>
40#include <time.h> 39#include <time.h>
41#include <sys/types.h> 40#include <sys/types.h>
@@ -72,7 +71,7 @@
72#include "eina_debug_private.h" 71#include "eina_debug_private.h"
73#include "eina_vpath.h" 72#include "eina_vpath.h"
74#include "eina_internal.h" 73#include "eina_internal.h"
75 74// #include "eina_thread.h"
76#ifdef EINA_HAVE_THREAD_SETNAME 75#ifdef EINA_HAVE_THREAD_SETNAME
77# ifndef __linux__ 76# ifndef __linux__
78# include <pthread_np.h> 77# include <pthread_np.h>
diff --git a/src/lib/eina/eina_debug_timer.c b/src/lib/eina/eina_debug_timer.c
index 2e7e5ce13e..6521ef5281 100644
--- a/src/lib/eina/eina_debug_timer.c
+++ b/src/lib/eina/eina_debug_timer.c
@@ -35,11 +35,11 @@
35#include <sys/time.h> 35#include <sys/time.h>
36#include <sys/types.h> 36#include <sys/types.h>
37#include <sys/stat.h> 37#include <sys/stat.h>
38#include <pthread.h>
39#include <signal.h> 38#include <signal.h>
40#include <time.h> 39#include <time.h>
41#include <fcntl.h> 40#include <fcntl.h>
42 41
42#include "eina_thread.h"
43#include "eina_debug.h" 43#include "eina_debug.h"
44#include "eina_debug_private.h" 44#include "eina_debug_private.h"
45 45
@@ -176,8 +176,8 @@ eina_debug_timer_add(unsigned int timeout_ms, Eina_Debug_Timer_Cb cb, void *data
176 sigaddset(&newset, SIGPWR); 176 sigaddset(&newset, SIGPWR);
177 # endif 177 # endif
178 pthread_sigmask(SIG_BLOCK, &newset, &oldset); 178 pthread_sigmask(SIG_BLOCK, &newset, &oldset);
179 #endif 179 #endif
180 int err = eina_thread_create(&_thread, NULL, _monitor, NULL); 180 int err = eina_thread_create(&_thread, EINA_THREAD_BACKGROUND, NULL, _monitor, NULL);
181 #ifndef _WIN32 181 #ifndef _WIN32
182 pthread_sigmask(SIG_SETMASK, &oldset, NULL); 182 pthread_sigmask(SIG_SETMASK, &oldset, NULL);
183 #endif 183 #endif
diff --git a/src/lib/eina/eina_thread.c b/src/lib/eina/eina_thread.c
index 2d9199ed08..c8fb773418 100644
--- a/src/lib/eina/eina_thread.c
+++ b/src/lib/eina/eina_thread.c
@@ -45,6 +45,8 @@
45# define cpu_set_t cpuset_t 45# define cpu_set_t cpuset_t
46#endif 46#endif
47 47
48EAPI const void *EINA_THREAD_JOIN_CANCELED = EINA_THREAD_CANCELED;
49
48EAPI Eina_Thread 50EAPI Eina_Thread
49eina_thread_self(void) 51eina_thread_self(void)
50{ 52{
diff --git a/src/lib/eina/eina_thread.h b/src/lib/eina/eina_thread.h
index 22fb218d7a..bea52685e0 100644
--- a/src/lib/eina/eina_thread.h
+++ b/src/lib/eina/eina_thread.h
@@ -351,7 +351,6 @@ struct _Eina_Thread_Call
351 int affinity; 351 int affinity;
352}; 352};
353 353
354EAPI const void *EINA_THREAD_JOIN_CANCELED = EINA_THREAD_CANCELED;
355/** 354/**
356 * @} 355 * @}
357 */ 356 */