From cd03ff7fc37d27519d174974c8867d39da44feae Mon Sep 17 00:00:00 2001 From: Pierre-Marc Fournier Date: Tue, 9 Mar 2010 00:04:09 -0500 Subject: [PATCH] remove USE_CLONE It was unused, and the code is starting to depend a lot on pthreads. --- libust/tracectl.c | 21 +++++---------------- 1 file changed, 5 insertions(+), 16 deletions(-) diff --git a/libust/tracectl.c b/libust/tracectl.c index 2e90523..874a1b4 100644 --- a/libust/tracectl.c +++ b/libust/tracectl.c @@ -23,7 +23,6 @@ #include #include #include -#include #include #include #include @@ -37,8 +36,6 @@ #include "buffers.h" #include "marker-control.h" -//#define USE_CLONE - #define USTSIGNAL SIGIO #define MAX_MSG_SIZE (100) @@ -1111,32 +1108,24 @@ void *listener_main(void *p) } volatile sig_atomic_t have_listener = 0; -#ifndef USE_CLONE +/* These should only be accessed in the parent thread, + * not the listener. + */ static pthread_t listener_thread; -#endif void create_listener(void) { -#ifdef USE_CLONE - static char listener_stack[16384]; int result; -#endif if(have_listener) { WARN("not creating listener because we already had one"); return; } -#ifdef USE_CLONE - result = clone((int (*)(void *)) listener_main, listener_stack+sizeof(listener_stack)-1, CLONE_FS | CLONE_FILES | CLONE_VM | CLONE_SIGHAND | CLONE_THREAD, NULL); + result = pthread_create(&listener_thread, NULL, listener_main, NULL); if(result == -1) { - perror("clone"); - return; + PERROR("pthread_create"); } -#else - - pthread_create(&listener_thread, NULL, listener_main, NULL); -#endif have_listener = 1; } -- 2.34.1