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);
}
}
+ if (opt_create_session != NULL) {
+ ret = process_opt_create_session();
+ if (ret < 0) {
+ goto end;
+ }
+ }
+
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;
+ char *session_id;
+
+ ret = lttng_create_session(opt_create_session, &session_id);
+ if (ret < 0) {
+ goto error;
+ }
+
+ MSG("Session created:");
+ MSG(" %s (%s)", opt_create_session, session_id);
+
+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];
- 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++) {
+ for (i=0; i < count; i++) {
snprintf(path, sizeof(path), "/proc/%d/cmdline", pids[i]);
fp = fopen(path, "r");
if (fp == NULL) {
+ MSG("\t(not running) (%d)", pids[i]);
continue;
}
ret = fread(cmdline, 1, sizeof(cmdline), fp);
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 */