X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=ustd%2Fustd.c;h=26f87a2ba3f991f0e7a5acba10aa8a6d3b539b17;hb=b5b073e22d34bec71259d39b8946354f170f01a9;hp=001977660a6ec0c86d809ce4a0ccb298a638427b;hpb=bce2937acead6988b0f0b84b2b339f1fd8d54122;p=ust.git

diff --git a/ustd/ustd.c b/ustd/ustd.c
index 0019776..26f87a2 100644
--- a/ustd/ustd.c
+++ b/ustd/ustd.c
@@ -33,9 +33,8 @@
 #include <getopt.h>
 
 #include "ustd.h"
-#include "localerr.h"
+#include "usterr.h"
 #include "ustcomm.h"
-#include "share.h"
 
 /* return value: 0 = subbuffer is finished, it won't produce data anymore
  *               1 = got subbuffer successfully
@@ -53,6 +52,7 @@
 char *sock_path=NULL;
 char *trace_path=NULL;
 int daemon_mode = 0;
+char *pidfile = NULL;
 
 /* Number of active buffers and the mutex to protect it. */
 int active_buffers = 0;
@@ -516,6 +516,9 @@ int parse_args(int argc, char **argv)
 		case 'd':
 			daemon_mode = 1;
 			break;
+		case 'p':
+			pidfile = strdup(optarg);
+			break;
 		case 'h':
 			usage();
 			exit(0);
@@ -538,6 +541,24 @@ void sigterm_handler(int sig)
 	terminate_req = 1;
 }
 
+static int write_pidfile(const char *file_name, pid_t pid)
+{
+	FILE *pidfp;
+
+	pidfp = fopen(file_name, "w");
+	if(!pidfp) {
+		PERROR("fopen (%s)", pidfile);
+		WARN("killing child process");
+		return -1;
+	}
+
+	fprintf(pidfp, "%d\n", pid);
+
+	fclose(pidfp);
+
+	return 0;
+}
+
 int start_ustd(int fd)
 {
 	struct ustcomm_ustd ustd;
@@ -582,6 +603,15 @@ int start_ustd(int fd)
 		return 1;
 	}
 
+	/* Write pidfile */
+	if(pidfile) {
+		result = write_pidfile(pidfile, getpid());
+		if(result == -1) {
+			ERR("failed to write pidfile");
+			return 1;
+		}
+	}
+
 	/* Notify parent that we are successfully started. */
 	if(fd != -1) {
 		/* write any one character */
@@ -654,10 +684,11 @@ int start_ustd_daemon()
 {
 	int result;
 	int fd[2];
+	pid_t child_pid;
 
 	result = pipe(fd);
 
-	result = fork();
+	result = child_pid = fork();
 	if(result == -1) {
 		PERROR("fork");
 		return -1;