static int process_client_opt(void);
static int process_opt_list_apps(void);
static int process_opt_list_sessions(void);
+static int process_opt_create_session(void);
static void sighandler(int sig);
static int set_signal_handler(void);
+static int get_cmdline_by_pid(pid_t pid, char **cmdline);
+static int validate_options(void);
/*
* start_client
static int process_client_opt(void)
{
int ret;
+ uuid_t uuid;
/* Connect to the session daemon */
ret = lttng_connect_sessiond();
}
}
+ if (opt_create_session != NULL) {
+ ret = process_opt_create_session();
+ if (ret < 0) {
+ goto end;
+ }
+ }
+
+ if (opt_destroy_session != NULL) {
+ uuid_parse(opt_destroy_session, uuid);
+ ret = lttng_destroy_session(&uuid);
+ if (ret < 0) {
+ goto end;
+ }
+ }
+
+ if (opt_session_uuid != NULL) {
+ DBG("Set session uuid to %s", opt_session_uuid);
+ lttng_set_current_session_uuid(opt_session_uuid);
+ }
+
+ if (opt_create_trace) {
+ DBG("Create trace for pid %d", opt_create_trace);
+ ret = lttng_ust_create_trace(opt_create_trace);
+ if (ret < 0) {
+ goto end;
+ }
+ MSG("Trace created successfully!\nUse --start PID to start tracing.");
+ }
+
+ if (opt_start_trace) {
+ DBG("Start trace for pid %d", opt_start_trace);
+ ret = lttng_ust_start_trace(opt_start_trace);
+ if (ret < 0) {
+ goto end;
+ }
+ MSG("Trace started successfully!");
+ }
+
return 0;
end:
return ret;
}
+/*
+ * process_opt_create_session
+ *
+ * Create a new session using the name pass
+ * to the command line.
+ */
+static int process_opt_create_session(void)
+{
+ int ret;
+ uuid_t session_id;
+ char str_uuid[37];
+
+ ret = lttng_create_session(opt_create_session, &session_id);
+ if (ret < 0) {
+ goto error;
+ }
+
+ uuid_unparse(session_id, str_uuid);
+
+ MSG("Session created:");
+ MSG(" %s (%s)", opt_create_session, str_uuid);
+
+error:
+ return ret;
+}
+
/*
* process_opt_list_sessions
*
*/
static int process_opt_list_apps(void)
{
- int i, ret;
+ int i, ret, count;
pid_t *pids;
- FILE *fp;
- char path[24]; /* Can't go bigger than /proc/65535/cmdline */
- char cmdline[PATH_MAX];
+ char *cmdline;
- ret = lttng_ust_list_apps(&pids);
- if (ret < 0) {
+ count = lttng_ust_list_apps(&pids);
+ if (count < 0) {
+ ret = count;
goto error;
}
MSG("LTTng UST traceable application [name (pid)]:");
- for (i=0; i < ret; i++) {
- snprintf(path, sizeof(path), "/proc/%d/cmdline", pids[i]);
- fp = fopen(path, "r");
- if (fp == NULL) {
+ for (i=0; i < count; i++) {
+ ret = get_cmdline_by_pid(pids[i], &cmdline);
+ if (!ret) {
+ MSG("\t(not running) (%d)", pids[i]);
continue;
}
- ret = fread(cmdline, 1, sizeof(cmdline), fp);
MSG("\t%s (%d)", cmdline, pids[i]);
- fclose(fp);
+ free(cmdline);
}
/* Allocated by lttng_ust_list_apps() */
return ret;
}
+/*
+ * get_cmdline_by_pid
+ *
+ * Get command line from /proc for a
+ * specific pid. Allocate cmdline so the
+ * user must free() that pointer.
+ *
+ * On success, return 1
+ * On error (not found), return 0
+ */
+static int get_cmdline_by_pid(pid_t pid, char **cmdline)
+{
+ int ret;
+ FILE *fp;
+ char path[24]; /* Can't go bigger than /proc/65535/cmdline */
+
+ snprintf(path, sizeof(path), "/proc/%d/cmdline", pid);
+ fp = fopen(path, "r");
+ if (fp == NULL) {
+ goto not_running;
+ }
+
+ /* Caller must free() *cmdline */
+ *cmdline = malloc(PATH_MAX);
+ ret = fread(*cmdline, 1, PATH_MAX, fp);
+ fclose(fp);
+
+ return 1;
+
+not_running:
+ return 0;
+}
+
+/*
+ * validate_options
+ *
+ * Make sure that all options passed to the command line
+ * are compatible with each others.
+ *
+ * On error, return -1
+ * On success, return 0
+ */
+static int validate_options(void)
+{
+ if ((opt_session_uuid == NULL) &&
+ (opt_create_trace || opt_start_trace)) {
+ ERR("Can't act on trace without a session ID.\nPlease specify using --session UUID");
+ goto error;
+ }
+
+ return 0;
+
+error:
+ return -1;
+}
+
/*
* spawn_sessiond
*
/* Spawn session daemon and tell
* it to signal us when ready.
*/
- ret = execlp(pathname, "ltt-sessiond", "--sig-parent", NULL);
+ ret = execlp(pathname, "ltt-sessiond", "--sig-parent", "--quiet", NULL);
if (ret < 0) {
if (errno == ENOENT) {
ERR("No session daemon found. Use --sessiond-path.");
pathname = opt_sessiond_path;
} else {
/* Try LTTNG_SESSIOND_PATH env variable */
- pathname = strdup(getenv(LTTNG_SESSIOND_PATH_ENV));
+ pathname = getenv(LTTNG_SESSIOND_PATH_ENV);
+ if (pathname != NULL) {
+ /* strdup here in order to make the free()
+ * not fail later on.
+ */
+ pathname = strdup(pathname);
+ }
}
/* Let's rock and roll */
*/
static void sighandler(int sig)
{
- DBG("%d received", sig);
switch (sig) {
case SIGTERM:
+ DBG("SIGTERM catched");
clean_exit(EXIT_FAILURE);
break;
case SIGCHLD:
/* Notify is done */
+ DBG("SIGCHLD catched");
break;
default:
+ DBG("Unknown signal %d catched", sig);
break;
}
void clean_exit(int code)
{
DBG("Clean exit");
+ if (lttng_disconnect_sessiond() < 0) {
+ ERR("Session daemon disconnect failed.");
+ }
exit(code);
}
}
ret = parse_args(argc, (const char **) argv);
+ if (ret < 0) {
+ clean_exit(EXIT_FAILURE);
+ }
+
+ ret = validate_options();
if (ret < 0) {
return EXIT_FAILURE;
}
ret = set_signal_handler();
if (ret < 0) {
- return ret;
+ clean_exit(ret);
}
if (opt_tracing_group != NULL) {
DBG("Kernel tracing activated");
if (getuid() != 0) {
ERR("%s must be setuid root", progname);
- return -EPERM;
+ clean_exit(-EPERM);
}
}
* If no, a daemon will be spawned.
*/
if (opt_no_sessiond == 0 && (check_ltt_sessiond() < 0)) {
- return EXIT_FAILURE;
+ clean_exit(EXIT_FAILURE);
}
ret = process_client_opt();
if (ret < 0) {
- return ret;
+ clean_exit(ret);
}
+ clean_exit(0);
+
return 0;
}
projects / lttng-tools.git / blobdiff