#include <urcu/list.h> /* URCU list library (-lurcu) */
#include <ust/ustctl.h> /* UST control lib (-lust) */
-#include <lttng/liblttngctl.h>
+#include <lttng/lttng.h>
#include "liblttsessiondcomm.h"
#include "ltt-sessiond.h"
#include "lttngerr.h"
#include "session.h"
+#include "trace.h"
#include "traceable-app.h"
/* Const values */
const char default_global_apps_pipe[] = DEFAULT_GLOBAL_APPS_PIPE;
/* Static functions */
-static int set_signal_handler(void);
-static int set_socket_perms(void);
-static void sighandler(int sig);
-static void cleanup(void);
-static void copy_common_data(struct lttcomm_lttng_msg *llm, struct lttcomm_session_msg *lsm);
static int check_existing_daemon(void);
-static int notify_apps(const char* name);
static int connect_app(pid_t pid);
static int init_daemon_socket(void);
+static int notify_apps(const char* name);
static int process_client_msg(int sock, struct lttcomm_session_msg*);
static int send_unix_sock(int sock, void *buf, size_t len);
+static int set_signal_handler(void);
+static int set_socket_perms(void);
static int setup_data_buffer(char **buf, size_t size, struct lttcomm_lttng_msg *llm);
-
-/* Command function */
+static void cleanup(void);
+static void copy_common_data(struct lttcomm_lttng_msg *llm, struct lttcomm_session_msg *lsm);
+static void sighandler(int sig);
static void *thread_manage_clients(void *data);
static void *thread_manage_apps(void *data);
/* Variables */
+int opt_verbose;
+int opt_quiet;
const char *progname;
const char *opt_tracing_group;
static int opt_sig_parent;
static int opt_daemon;
-int opt_verbose;
-int opt_quiet;
static int is_root; /* Set to 1 if the daemon is running as root */
static pid_t ppid;
uid_t uid;
} reg_msg;
+ DBG("[thread] Manage apps started");
+
/* Notify all applications to register */
notify_apps(default_global_apps_pipe);
int sock, ret;
struct lttcomm_session_msg lsm;
+ DBG("[thread] Manage client started");
+
ret = lttcomm_listen_unix_sock(client_socket);
if (ret < 0) {
goto error;
int sock;
struct ltt_traceable_app *lta;
+ DBG("Connect to application pid %d", pid);
+
lta = find_app_by_pid(pid);
if (lta == NULL) {
/* App not found */
int fd;
int ret = -1;
+ DBG("Notify the global application pipe");
+
/* Try opening the global pipe */
fd = open(name, O_WRONLY);
if (fd < 0) {
int sock, ret;
struct ltt_ust_trace *trace;
+ DBG("Creating trace for pid %d", pid);
+
trace = malloc(sizeof(struct ltt_ust_trace));
if (trace == NULL) {
perror("malloc");
/* Init */
trace->pid = pid;
trace->shmid = 0;
+ /* NOTE: to be removed. Trace name will no longer be
+ * required for LTTng userspace tracer. For now, we set it
+ * to 'auto' for API compliance.
+ */
+ snprintf(trace->name, 5, "auto");
/* Connect to app using ustctl API */
sock = connect_app(pid);
goto error;
}
- ret = ustctl_create_trace(sock, "auto");
+ ret = ustctl_create_trace(sock, trace->name);
if (ret < 0) {
ret = LTTCOMM_CREATE_FAIL;
goto error;
/* Check if current session is valid */
if (current_session) {
cds_list_add(&trace->list, ¤t_session->ust_traces);
+ current_session->ust_trace_count++;
+ }
+
+error:
+ return ret;
+}
+
+/*
+ * ust_start_trace
+ *
+ * Start a trace. This trace, identified by the pid, must be
+ * in the current session ust_traces list.
+ */
+static int ust_start_trace(pid_t pid)
+{
+ int sock, ret;
+ struct ltt_ust_trace *trace;
+
+ DBG("Starting trace for pid %d", pid);
+
+ trace = find_session_ust_trace_by_pid(current_session, pid);
+ if (trace == NULL) {
+ ret = LTTCOMM_NO_TRACE;
+ goto error;
+ }
+
+ /* Connect to app using ustctl API */
+ sock = connect_app(pid);
+ if (sock < 0) {
+ ret = LTTCOMM_NO_TRACEABLE;
+ goto error;
+ }
+
+ ret = ustctl_start_trace(sock, "auto");
+ if (ret < 0) {
+ ret = LTTCOMM_START_FAIL;
+ goto error;
+ }
+
+error:
+ return ret;
+}
+
+/*
+ * ust_stop_trace
+ *
+ * Stop a trace. This trace, identified by the pid, must be
+ * in the current session ust_traces list.
+ */
+static int ust_stop_trace(pid_t pid)
+{
+ int sock, ret;
+ struct ltt_ust_trace *trace;
+
+ DBG("Stopping trace for pid %d", pid);
+
+ trace = find_session_ust_trace_by_pid(current_session, pid);
+ if (trace == NULL) {
+ ret = LTTCOMM_NO_TRACE;
+ goto error;
+ }
+
+ /* Connect to app using ustctl API */
+ sock = connect_app(pid);
+ if (sock < 0) {
+ ret = LTTCOMM_NO_TRACEABLE;
+ goto error;
+ }
+
+ ret = ustctl_stop_trace(sock, trace->name);
+ if (ret < 0) {
+ ret = LTTCOMM_STOP_FAIL;
+ goto error;
}
error:
char *send_buf = NULL;
struct lttcomm_lttng_msg llm;
+ DBG("Processing client message");
+
/* Copy common data to identify the response
* on the lttng client side.
*/
/* No auxiliary data so only send the llm struct. */
goto end;
}
+ case LTTNG_LIST_TRACES:
+ {
+ unsigned int trace_count = get_trace_count_per_session(current_session);
+
+ if (trace_count == 0) {
+ ret = LTTCOMM_NO_TRACE;
+ goto end;
+ }
+
+ buf_size = setup_data_buffer(&send_buf,
+ sizeof(struct lttng_trace) * trace_count, &llm);
+ if (buf_size < 0) {
+ ret = LTTCOMM_FATAL;
+ goto end;
+ }
+
+ get_traces_per_session(current_session, (struct lttng_trace *)(send_buf + header_size));
+ break;
+ }
case UST_CREATE_TRACE:
{
ret = ust_create_trace(lsm->pid);
if (ret < 0) {
- ret = LTTCOMM_CREATE_FAIL;
+ /* If -1 is returned from ust_create_trace, malloc
+ * failed so it's pretty much a fatal error.
+ */
+ ret = LTTCOMM_FATAL;
goto end;
}
break;
}
+ case UST_START_TRACE:
+ {
+ ret = ust_start_trace(lsm->pid);
+
+ /* No auxiliary data so only send the llm struct. */
+ goto end;
+ }
+ case UST_STOP_TRACE:
+ {
+ ret = ust_stop_trace(lsm->pid);
+
+ /* No auxiliary data so only send the llm struct. */
+ goto end;
+ }
case LTTNG_LIST_SESSIONS:
{
unsigned int session_count = get_session_count();
fprintf(stderr, " -V, --version Show version number.\n");
fprintf(stderr, " -S, --sig-parent Send SIGCHLD to parent pid to notify readiness.\n");
fprintf(stderr, " -q, --quiet No output at all.\n");
+ fprintf(stderr, " -v, --verbose Verbose mode. Activate DBG() macro.\n");
}
/*
{ "group", 1, 0, 'g' },
{ "version", 0, 0, 'V' },
{ "quiet", 0, 0, 'q' },
+ { "verbose", 0, 0, 'v' },
{ NULL, 0, 0, 0 }
};
while (1) {
int option_index = 0;
- c = getopt_long(argc, argv, "dhqVS" "a:c:g:s:", long_options, &option_index);
+ c = getopt_long(argc, argv, "dhqvVS" "a:c:g:s:", long_options, &option_index);
if (c == -1) {
break;
}
case 'q':
opt_quiet = 1;
break;
+ case 'v':
+ opt_verbose = 1;
+ break;
default:
/* Unknown option or other error.
* Error is printed by getopt, just return */
* init_daemon_socket
*
* Creates the two needed socket by the daemon.
- * apps_socket - The communication socket for all UST apps.
- * client_socket - The communication of the cli tool (lttng).
+ * apps_socket - The communication socket for all UST apps.
+ * client_socket - The communication of the cli tool (lttng).
*/
static int init_daemon_socket()
{
* check_existing_daemon
*
* Check if the global socket is available.
- * If yes, error is returned.
+ * If yes, error is returned.
*/
static int check_existing_daemon()
{
}
/*
- * get_home_dir
+ * get_home_dir
*
- * Return pointer to home directory path using
- * the env variable HOME.
+ * Return pointer to home directory path using
+ * the env variable HOME.
*
- * Default : /tmp
+ * Default : /tmp
*/
static const char *get_home_dir(void)
{
perror("chown");
}
+ DBG("Sockets permissions set");
+
end:
return ret;
}
/*
- * set_signal_handler
+ * set_signal_handler
*
- * Setup signal handler for :
+ * Setup signal handler for :
* SIGINT, SIGTERM, SIGPIPE
*/
static int set_signal_handler(void)
return ret;
}
+ DBG("Signal handler set for SIGTERM, SIGPIPE and SIGINT");
+
return ret;
}
/**
- * sighandler
+ * sighandler
*
- * Signal handler for the daemon
+ * Signal handler for the daemon
*/
static void sighandler(int sig)
{
switch (sig) {
case SIGPIPE:
+ DBG("SIGPIPE catched");
return;
case SIGINT:
+ DBG("SIGINT catched");
+ cleanup();
+ break;
case SIGTERM:
+ DBG("SIGTERM catched");
cleanup();
break;
default:
}
/*
- * cleanup
+ * cleanup
*
- * Cleanup the daemon on exit
+ * Cleanup the daemon on exit
*/
static void cleanup()
{
+ DBG("Cleaning up");
+
/* <fun> */
MSG("\n%c[%d;%dm*** assert failed *** ==> %c[%dm", 27,1,31,27,0);
MSG("%c[%d;%dmMatthew, BEET driven development works!%c[%dm",27,1,33,27,0);
projects / lttng-tools.git / blobdiff