X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ustd%2Fustd.c;h=470401649cdb8c55099a07e98a2946e80653a6ab;hb=cd226f25dcef5ab527f79ec0ad536a7e6a99d839;hp=39ad7be3122bb19f67a8ba304570e0f8e01c7cf7;hpb=a3cdd4a7fac4691fc61fcd3c9e6ad4a783fa6113;p=lttng-ust.git

diff --git a/ustd/ustd.c b/ustd/ustd.c
index 39ad7be3..47040164 100644
--- a/ustd/ustd.c
+++ b/ustd/ustd.c
@@ -1,23 +1,24 @@
-/*
- * Copyright (C) 2009  Pierre-Marc Fournier
+/* Copyright (C) 2009  Pierre-Marc Fournier
  *
- * 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 3 of the License, or
- * (at your option) any later version.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
  *
- * This program is distributed in the hope that it will be useful,
+ * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
 #define _GNU_SOURCE
 
 #include <sys/types.h>
+#include <sys/stat.h>
 #include <sys/shm.h>
 #include <fcntl.h>
 #include <unistd.h>
@@ -29,6 +30,7 @@
 #include <string.h>
 #include <errno.h>
 #include <assert.h>
+#include <getopt.h>
 
 #include "ustd.h"
 #include "localerr.h"
@@ -47,6 +49,9 @@
 #define PUT_SUBBUF_DIED 0
 #define PUT_SUBBUF_PUSHED 2
 
+char *sock_path=NULL;
+char *trace_path=NULL;
+
 int test_sigpipe(void)
 {
 	sigset_t sigset;
@@ -245,6 +250,38 @@ void *consumer_thread(void *arg)
 	return NULL;
 }
 
+int create_dir_if_needed(char *dir)
+{
+	int result;
+	result = mkdir(dir, 0777);
+	if(result == -1) {
+		if(errno != EEXIST) {
+			perror("mkdir");
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
+int is_directory(const char *dir)
+{
+	int result;
+	struct stat st;
+
+	result = stat(dir, &st);
+	if(result == -1) {
+		PERROR("stat");
+		return 0;
+	}
+
+	if(!S_ISDIR(st.st_mode)) {
+		return 0;
+	}
+
+	return 1;
+}
+
 int add_buffer(pid_t pid, char *bufname)
 {
 	struct buffer_info *buf;
@@ -343,7 +380,30 @@ int add_buffer(pid_t pid, char *bufname)
 	buf->memlen = shmds.shm_segsz;
 
 	/* open file for output */
-	asprintf(&tmp, "/tmp/trace/%s_0", buf->name);
+	if(!trace_path) {
+		/* Only create the directory if using the default path, because
+		 * of the risk of typo when using trace path override. We don't
+		 * want to risk creating plenty of useless directories in that case.
+		 */
+		result = create_dir_if_needed(USTD_DEFAULT_TRACE_PATH);
+		if(result == -1) {
+			ERR("could not create directory %s", USTD_DEFAULT_TRACE_PATH);
+			return -1;
+		}
+
+		trace_path = USTD_DEFAULT_TRACE_PATH;
+	}
+
+	asprintf(&tmp, "%s/%u", trace_path, buf->pid);
+	result = create_dir_if_needed(tmp);
+	if(result == -1) {
+		ERR("could not create directory %s", tmp);
+		free(tmp);
+		return -1;
+	}
+	free(tmp);
+
+	asprintf(&tmp, "%s/%u/%s_0", trace_path, buf->pid, buf->name);
 	result = fd = open(tmp, O_WRONLY | O_CREAT | O_TRUNC, 00600);
 	if(result == -1) {
 		PERROR("open");
@@ -358,13 +418,76 @@ int add_buffer(pid_t pid, char *bufname)
 	return 0;
 }
 
+void usage(void)
+{
+	fprintf(stderr, "Usage:\nustd OPTIONS\n\nOptions:\n"
+			"\t-h\t\tDisplay this usage.\n"
+			"\t-o DIR\t\tSpecify the directory where to output the traces.\n"
+			"\t-s PATH\t\tSpecify the path to use for the daemon socket.\n");
+}
+
+int parse_args(int argc, char **argv)
+{
+	int c;
+
+	while (1) {
+		int option_index = 0;
+		static struct option long_options[] = {
+			{"help", 0, 0, 'h'},
+			{"version", 0, 0, 'V'},
+			{0, 0, 0, 0}
+		};
+
+		c = getopt_long(argc, argv, "hs:o:", long_options, &option_index);
+		if (c == -1)
+			break;
+
+		switch (c) {
+		case 0:
+			printf("option %s", long_options[option_index].name);
+			if (optarg)
+				printf(" with arg %s", optarg);
+			printf("\n");
+			break;
+		case 's':
+			sock_path = optarg;
+			break;
+		case 'o':
+			trace_path = optarg;
+			if(!is_directory(trace_path)) {
+				ERR("Not a valid directory. (%s)", trace_path);
+				return -1;
+			}
+			break;
+		case 'h':
+			usage();
+			exit(0);
+		case 'V':
+			printf("Version 0.0\n");
+			break;
+
+		default:
+			/* unknown option or other error; error is
+			printed by getopt, just return */
+			return -1;
+		}
+	}
+
+	return 0;
+}
+
 int main(int argc, char **argv)
 {
 	struct ustcomm_ustd ustd;
 	int result;
 	sigset_t sigset;
 
-	result = ustcomm_init_ustd(&ustd);
+	result = parse_args(argc, argv);
+	if(result == -1) {
+		exit(1);
+	}
+
+	result = ustcomm_init_ustd(&ustd, sock_path);
 	if(result == -1) {
 		ERR("failed to initialize socket");
 		return 1;