X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=ltt-kconsumerd%2Fltt-kconsumerd.c;h=1e2841c015ac8e163e177404c758efd5505a1121;hp=60134e831491e631f15766edfc51985c4c7d943f;hb=50ecdf72034d220d3b0300d0caa13e6946be555b;hpb=2b1173d8cb43cb5d7c9ce3772dbdbef3436c407e

diff --git a/ltt-kconsumerd/ltt-kconsumerd.c b/ltt-kconsumerd/ltt-kconsumerd.c
index 60134e831..1e2841c01 100644
--- a/ltt-kconsumerd/ltt-kconsumerd.c
+++ b/ltt-kconsumerd/ltt-kconsumerd.c
@@ -4,8 +4,8 @@
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
+ * as published by the Free Software Foundation; only version 2
+ * of the License.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -38,8 +38,8 @@
 #include <sys/mman.h>
 
 #include "lttngerr.h"
-#include "libkernelctl.h"
-#include "liblttkconsumerd.h"
+#include "kernelctl.h"
+#include "lttkconsumerd.h"
 
 /* the two threads (receive fd and poll) */
 pthread_t threads[2];
@@ -67,7 +67,7 @@ static void sighandler(int sig)
 		return;
 	}
 
-	kconsumerd_cleanup();
+	kconsumerd_should_exit();
 }
 
 /*
@@ -227,10 +227,9 @@ int main(int argc, char **argv)
 		goto error;
 	}
 
-	/* create the pipe to wake to polling thread when needed */
-	ret = kconsumerd_create_poll_pipe();
+	/* create the pipe to wake to receiving thread when needed */
+	ret = kconsumerd_init();
 	if (ret < 0) {
-		perror("Error creating poll pipe");
 		goto end;
 	}