X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=libust%2Ftracectl.c;h=bb03447d6fabdad5cea31cde8ec5e3bc888a35ac;hb=a4a71875833fd9cbae660c0d36997331710862dd;hp=882f81ab75f7a5a7fc00e2b5e5a072b783725483;hpb=dff06a58d6f9b7b6bf9cbebe455b7403096eb78d;p=ust.git

diff --git a/libust/tracectl.c b/libust/tracectl.c
index 882f81a..bb03447 100644
--- a/libust/tracectl.c
+++ b/libust/tracectl.c
@@ -43,8 +43,6 @@
 #define MSG_NOTIF 1
 #define MSG_REGISTER_NOTIF 2
 
-char consumer_stack[10000];
-
 /* This should only be accessed by the constructor, before the creation
  * of the listener, and then only by the listener.
  */
@@ -123,28 +121,6 @@ static void print_markers(FILE *fp)
 
 static int init_socket(void);
 
-int fd_notif = -1;
-void notif_cb(void)
-{
-	int result;
-	struct trctl_msg msg;
-
-	/* FIXME: fd_notif should probably be protected by a spinlock */
-
-	if(fd_notif == -1)
-		return;
-
-	msg.type = MSG_NOTIF;
-	msg.size = sizeof(msg.type);
-
-	/* FIXME: don't block here */
-	result = write(fd_notif, &msg, msg.size+sizeof(msg.size));
-	if(result == -1) {
-		PERROR("write");
-		return;
-	}
-}
-
 /* Ask the daemon to collect a trace called trace_name and being
  * produced by this pid.
  *
@@ -707,14 +683,14 @@ static int do_cmd_put_subbuffer(const char *recvbuf, struct ustcomm_source *src)
 
 	DBG("put_subbuf");
 
-	channel_and_cpu = strdup_malloc(nth_token(recvbuf, 1));
+	channel_and_cpu = strdup(nth_token(recvbuf, 1));
 	if(channel_and_cpu == NULL) {
 		ERR("cannot parse channel");
 		retval = -1;
 		goto end;
 	}
 
-	consumed_old_str = strdup_malloc(nth_token(recvbuf, 2));
+	consumed_old_str = strdup(nth_token(recvbuf, 2));
 	if(consumed_old_str == NULL) {
 		ERR("cannot parse consumed_old");
 		retval = -1;
@@ -1325,12 +1301,12 @@ static void stop_listener()
 	int result;
 
 	result = pthread_cancel(listener_thread);
-	if(result == -1) {
-		PERROR("pthread_cancel");
+	if(result != 0) {
+		ERR("pthread_cancel: %s", strerror(result));
 	}
 	result = pthread_join(listener_thread, NULL);
-	if(result == -1) {
-		PERROR("pthread_join");
+	if(result != 0) {
+		ERR("pthread_join: %s", strerror(result));
 	}
 }