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

diff --git a/ustd/ustd.c b/ustd/ustd.c
index 6d8680c..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
@@ -542,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;
@@ -586,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 */
@@ -672,27 +698,6 @@ int start_ustd_daemon()
 	}
 	else {
 		char buf;
-		FILE *pidfp;
-
-		/* It's important to write the file *before*
-		 * the parent ends, because the file may be
-		 * read as soon as the parent ends.
-		 */
-		if(pidfile) {
-			pidfp = fopen(pidfile, "w+");
-			if(!pidfp) {
-				PERROR("fopen (%s)", pidfile);
-				WARN("killing child process");
-				result = kill(child_pid, SIGTERM);
-				if(result == -1) {
-					PERROR("kill");
-				}
-				return -1;
-			}
-
-			fprintf(pidfp, "%d\n", child_pid);
-			fclose(pidfp);
-		}
 
 		result = read(fd[0], &buf, 1);
 		if(result == -1) {