From: Pierre-Marc Fournier <pierre-marc.fournier@polymtl.ca>
Date: Tue, 9 Mar 2010 05:04:09 +0000 (-0500)
Subject: remove USE_CLONE
X-Git-Tag: v1.9.1~662
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=cd03ff7fc37d27519d174974c8867d39da44feae;p=lttng-ust.git

remove USE_CLONE

It was unused, and the code is starting to depend a lot on pthreads.
---

diff --git a/libust/tracectl.c b/libust/tracectl.c
index 2e905238..874a1b4d 100644
--- a/libust/tracectl.c
+++ b/libust/tracectl.c
@@ -23,7 +23,6 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
-#include <sched.h>
 #include <fcntl.h>
 #include <poll.h>
 #include <regex.h>
@@ -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;
 }