static int process_client_opt(void)
{
int ret;
+ uuid_t uuid;
/* Connect to the session daemon */
ret = lttng_connect_sessiond();
}
}
+ 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) {
+ lttng_set_current_session_uuid(opt_session_uuid);
+ }
+
return 0;
end:
static int process_opt_create_session(void)
{
int ret;
- char *session_id;
+ 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, session_id);
+ MSG(" %s (%s)", opt_create_session, str_uuid);
error:
return ret;
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) {
- return EXIT_FAILURE;
+ clean_exit(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;
}