#include <lttng/lttng.h>
-#include "liblttsessiondcomm.h"
+#include <lttng/lttng-sessiond-comm.h>
#include "lttngerr.h"
#include "lttng-share.h"
static char *tracing_group;
static int connected;
+/*
+ * Copy string from src to dst and enforce null terminated byte.
+ */
+static void copy_string(char *dst, const char *src, size_t len)
+{
+ if (src && dst) {
+ strncpy(dst, src, len);
+ /* Enforce the NULL terminated byte */
+ dst[len - 1] = '\0';
+ }
+}
+
/*
* send_data_sessiond
*
/* Are we in the tracing group ? */
ret = check_tracing_group(tracing_group);
if (ret < 0 && getuid() != 0) {
- if (sprintf(sessiond_sock_path, DEFAULT_HOME_CLIENT_UNIX_SOCK,
- getenv("HOME")) < 0) {
+ if (snprintf(sessiond_sock_path, PATH_MAX,
+ DEFAULT_HOME_CLIENT_UNIX_SOCK,
+ getenv("HOME")) < 0) {
return -ENOMEM;
}
} else {
- strncpy(sessiond_sock_path, DEFAULT_GLOBAL_CLIENT_UNIX_SOCK,
- sizeof(DEFAULT_GLOBAL_CLIENT_UNIX_SOCK));
+ copy_string(sessiond_sock_path, DEFAULT_GLOBAL_CLIENT_UNIX_SOCK,
+ PATH_MAX);
}
return 0;
}
}
-/*
- * Copy string from src to dst and enforce null terminated byte.
- */
-static void copy_string(char *dst, const char *src, size_t len)
-{
- if (src && dst) {
- strncpy(dst, src, len);
- /* Enforce the NULL terminated byte */
- dst[len - 1] = '\0';
- }
-}
-
/*
* Start tracing for all trace of the session.
*/
int lttng_start_tracing(const char *session_name)
{
- copy_string(lsm.session_name, session_name, NAME_MAX);
+ copy_string(lsm.session.name, session_name, NAME_MAX);
return ask_sessiond(LTTNG_START_TRACE, NULL);
}
*/
int lttng_stop_tracing(const char *session_name)
{
- copy_string(lsm.session_name, session_name, NAME_MAX);
+ copy_string(lsm.session.name, session_name, NAME_MAX);
return ask_sessiond(LTTNG_STOP_TRACE, NULL);
}
int lttng_enable_event(struct lttng_domain *domain,
struct lttng_event *ev, const char *channel_name)
{
- int ret = -1;
+ int ret;
if (channel_name == NULL) {
copy_string(lsm.u.enable.channel_name, DEFAULT_CHANNEL_NAME, NAME_MAX);
copy_string(lsm.u.enable.channel_name, channel_name, NAME_MAX);
}
- if (domain) {
- switch (domain->type) {
- case LTTNG_DOMAIN_KERNEL:
- if (ev == NULL) {
- ret = ask_sessiond(LTTNG_KERNEL_ENABLE_ALL_EVENT, NULL);
- } else {
- memcpy(&lsm.u.enable.event, ev, sizeof(struct lttng_event));
- ret = ask_sessiond(LTTNG_KERNEL_ENABLE_EVENT, NULL);
- }
- break;
- case LTTNG_DOMAIN_UST:
- ret = LTTCOMM_NOT_IMPLEMENTED;
- break;
- default:
- ret = LTTCOMM_UNKNOWN_DOMAIN;
- break;
- };
+ copy_lttng_domain(domain);
+
+ if (ev == NULL) {
+ ret = ask_sessiond(LTTNG_ENABLE_ALL_EVENT, NULL);
+ } else {
+ memcpy(&lsm.u.enable.event, ev, sizeof(struct lttng_event));
+ ret = ask_sessiond(LTTNG_ENABLE_EVENT, NULL);
}
return ret;
}
/*
- * Disable an event in the kernel tracer.
+ * Disable event of a channel and domain.
*/
int lttng_disable_event(struct lttng_domain *domain, const char *name,
const char *channel_name)
copy_string(lsm.u.disable.channel_name, channel_name, NAME_MAX);
}
- if (domain) {
- switch (domain->type) {
- case LTTNG_DOMAIN_KERNEL:
- if (name == NULL) {
- ret = ask_sessiond(LTTNG_KERNEL_DISABLE_ALL_EVENT, NULL);
- } else {
- copy_string(lsm.u.disable.name, name, NAME_MAX);
- ret = ask_sessiond(LTTNG_KERNEL_DISABLE_EVENT, NULL);
- }
- break;
- case LTTNG_DOMAIN_UST:
- ret = LTTCOMM_NOT_IMPLEMENTED;
- break;
- default:
- ret = LTTCOMM_UNKNOWN_DOMAIN;
- break;
- };
+ copy_lttng_domain(domain);
+
+ if (name == NULL) {
+ ret = ask_sessiond(LTTNG_DISABLE_ALL_EVENT, NULL);
+ } else {
+ copy_string(lsm.u.disable.name, name, NAME_MAX);
+ ret = ask_sessiond(LTTNG_DISABLE_EVENT, NULL);
}
return ret;
}
/*
- * Enable recording for a channel for the kernel tracer.
+ * Enable channel per domain
*/
int lttng_enable_channel(struct lttng_domain *domain,
struct lttng_channel *chan)
{
- int ret = -1;
-
if (chan) {
memcpy(&lsm.u.channel.chan, chan, sizeof(struct lttng_channel));
}
- if (domain) {
- switch (domain->type) {
- case LTTNG_DOMAIN_KERNEL:
- ret = ask_sessiond(LTTNG_KERNEL_ENABLE_CHANNEL, NULL);
- break;
- case LTTNG_DOMAIN_UST:
- ret = LTTCOMM_NOT_IMPLEMENTED;
- break;
- default:
- ret = LTTCOMM_UNKNOWN_DOMAIN;
- break;
- };
- }
+ copy_lttng_domain(domain);
- return ret;
+ return ask_sessiond(LTTNG_ENABLE_CHANNEL, NULL);
}
/*
- * Disable recording for the channel for the kernel tracer.
+ * All tracing will be stopped for registered events of the channel.
*/
int lttng_disable_channel(struct lttng_domain *domain, const char *name)
{
- int ret = -1;
-
copy_string(lsm.u.disable.channel_name, name, NAME_MAX);
+ copy_lttng_domain(domain);
- if (domain) {
- switch (domain->type) {
- case LTTNG_DOMAIN_KERNEL:
- ret = ask_sessiond(LTTNG_KERNEL_DISABLE_CHANNEL, NULL);
- break;
- case LTTNG_DOMAIN_UST:
- ret = LTTCOMM_NOT_IMPLEMENTED;
- break;
- default:
- ret = LTTCOMM_UNKNOWN_DOMAIN;
- break;
- };
- }
-
- return ret;
+ return ask_sessiond(LTTNG_DISABLE_CHANNEL, NULL);
}
/*
*/
int lttng_create_session(const char *name, const char *path)
{
- copy_string(lsm.session_name, name, NAME_MAX);
- copy_string(lsm.path, path, PATH_MAX);
+ copy_string(lsm.session.name, name, NAME_MAX);
+ copy_string(lsm.session.path, path, PATH_MAX);
return ask_sessiond(LTTNG_CREATE_SESSION, NULL);
}
*/
int lttng_destroy_session(const char *name)
{
- copy_string(lsm.session_name, name, NAME_MAX);
+ copy_string(lsm.session.name, name, NAME_MAX);
return ask_sessiond(LTTNG_DESTROY_SESSION, NULL);
}
{
int ret;
- copy_string(lsm.session_name, session_name, NAME_MAX);
+ copy_string(lsm.session.name, session_name, NAME_MAX);
ret = ask_sessiond(LTTNG_LIST_DOMAINS, (void**) domains);
if (ret < 0) {
return ret;
{
int ret;
- copy_string(lsm.session_name, session_name, NAME_MAX);
+ copy_string(lsm.session.name, session_name, NAME_MAX);
copy_lttng_domain(domain);
ret = ask_sessiond(LTTNG_LIST_CHANNELS, (void**) channels);
{
int ret;
- copy_string(lsm.session_name, session_name, NAME_MAX);
+ copy_string(lsm.session.name, session_name, NAME_MAX);
copy_string(lsm.u.list.channel_name, channel_name, NAME_MAX);
copy_lttng_domain(domain);
*/
void lttng_set_session_name(const char *name)
{
- copy_string(lsm.session_name, name, NAME_MAX);
+ copy_string(lsm.session.name, name, NAME_MAX);
}
/*
return 0;
}
+/*
+ * lttng_calibrate
+ */
+int lttng_calibrate(struct lttng_domain *domain,
+ struct lttng_calibrate *calibrate)
+{
+ int ret;
+
+ copy_lttng_domain(domain);
+
+ memcpy(&lsm.u.calibrate, calibrate, sizeof(struct lttng_calibrate));
+ ret = ask_sessiond(LTTNG_CALIBRATE, NULL);
+
+ return ret;
+}
+
/*
* lttng_check_session_daemon
*
return ret;
}
- /* If socket exist, we consider the daemon started */
+ /* If socket exist, we check if the daemon listens to connect. */
ret = access(sessiond_sock_path, F_OK);
if (ret < 0) {
/* Not alive */
return 0;
}
+ ret = lttcomm_connect_unix_sock(sessiond_sock_path);
+ if (ret < 0) {
+ /* Not alive */
+ return 0;
+ }
+ ret = lttcomm_close_unix_sock(ret);
+ if (ret < 0)
+ perror("lttcomm_close_unix_sock");
+
/* Is alive */
return 1;
}
projects / lttng-tools.git / blobdiff