projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Update loglevel ABI"
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
main.c
diff --git
a/src/bin/lttng-sessiond/main.c
b/src/bin/lttng-sessiond/main.c
index e1d50974bfc2f3c220fd7cf219e6145b005f5ae4..8304de8be394ca034f0726f622fdebe865c7c5df 100644
(file)
--- a/
src/bin/lttng-sessiond/main.c
+++ b/
src/bin/lttng-sessiond/main.c
@@
-77,7
+77,7
@@
struct consumer_data {
/* Const values */
const char default_home_dir[] = DEFAULT_HOME_DIR;
/* Const values */
const char default_home_dir[] = DEFAULT_HOME_DIR;
-const char default_tracing_group[] =
LTTNG_
DEFAULT_TRACING_GROUP;
+const char default_tracing_group[] = DEFAULT_TRACING_GROUP;
const char default_ust_sock_dir[] = DEFAULT_UST_SOCK_DIR;
const char default_global_apps_pipe[] = DEFAULT_GLOBAL_APPS_PIPE;
const char default_ust_sock_dir[] = DEFAULT_UST_SOCK_DIR;
const char default_global_apps_pipe[] = DEFAULT_GLOBAL_APPS_PIPE;
@@
-215,11
+215,11
@@
void setup_consumerd_path(void)
if (bin) {
consumerd64_bin = bin;
}
if (bin) {
consumerd64_bin = bin;
}
- libdir = getenv("LTTNG_
TOOLS_
CONSUMERD32_LIBDIR");
+ libdir = getenv("LTTNG_CONSUMERD32_LIBDIR");
if (libdir) {
consumerd32_libdir = libdir;
}
if (libdir) {
consumerd32_libdir = libdir;
}
- libdir = getenv("LTTNG_
TOOLS_
CONSUMERD64_LIBDIR");
+ libdir = getenv("LTTNG_CONSUMERD64_LIBDIR");
if (libdir) {
consumerd64_libdir = libdir;
}
if (libdir) {
consumerd64_libdir = libdir;
}
@@
-314,7
+314,7
@@
error:
static void teardown_kernel_session(struct ltt_session *session)
{
if (!session->kernel_session) {
static void teardown_kernel_session(struct ltt_session *session)
{
if (!session->kernel_session) {
- DBG3("No kernel session when tearingdown session");
+ DBG3("No kernel session when tearing
down session");
return;
}
return;
}
@@
-340,7
+340,7
@@
static void teardown_ust_session(struct ltt_session *session)
int ret;
if (!session->ust_session) {
int ret;
if (!session->ust_session) {
- DBG3("No UST session when tearingdown session");
+ DBG3("No UST session when tearing
down session");
return;
}
return;
}
@@
-397,7
+397,7
@@
static void cleanup(void)
}
free(cmd);
}
free(cmd);
- DBG("Cleaning up all session");
+ DBG("Cleaning up all session
s
");
/* Destroy session list mutex */
if (session_list_ptr != NULL) {
/* Destroy session list mutex */
if (session_list_ptr != NULL) {
@@
-1110,10
+1110,16
@@
static void *thread_manage_apps(void *data)
}
/*
}
/*
- * Add channel(s) and event(s) to newly registered apps
- * from lttng global UST domain.
+ * Validate UST version compatibility.
*/
*/
- update_ust_app(ust_cmd.sock);
+ ret = ust_app_validate_version(ust_cmd.sock);
+ if (ret >= 0) {
+ /*
+ * Add channel(s) and event(s) to newly registered apps
+ * from lttng global UST domain.
+ */
+ update_ust_app(ust_cmd.sock);
+ }
ret = ust_app_register_done(ust_cmd.sock);
if (ret < 0) {
ret = ust_app_register_done(ust_cmd.sock);
if (ret < 0) {
@@
-2153,11
+2159,11
@@
static int cmd_disable_channel(struct ltt_session *session,
}
break;
}
}
break;
}
+#if 0
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
case LTTNG_DOMAIN_UST_EXEC_NAME:
case LTTNG_DOMAIN_UST_PID:
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
case LTTNG_DOMAIN_UST_EXEC_NAME:
case LTTNG_DOMAIN_UST_PID:
- ret = LTTCOMM_NOT_IMPLEMENTED;
- goto error;
+#endif
default:
ret = LTTCOMM_UNKNOWN_DOMAIN;
goto error;
default:
ret = LTTCOMM_UNKNOWN_DOMAIN;
goto error;
@@
-2216,11
+2222,11
@@
static int cmd_enable_channel(struct ltt_session *session,
}
break;
}
}
break;
}
+#if 0
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
case LTTNG_DOMAIN_UST_EXEC_NAME:
case LTTNG_DOMAIN_UST_PID:
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
case LTTNG_DOMAIN_UST_EXEC_NAME:
case LTTNG_DOMAIN_UST_PID:
- ret = LTTCOMM_NOT_IMPLEMENTED;
- goto error;
+#endif
default:
ret = LTTCOMM_UNKNOWN_DOMAIN;
goto error;
default:
ret = LTTCOMM_UNKNOWN_DOMAIN;
goto error;
@@
-2283,11
+2289,13
@@
static int cmd_disable_event(struct ltt_session *session, int domain,
channel_name);
break;
}
channel_name);
break;
}
+#if 0
case LTTNG_DOMAIN_UST_EXEC_NAME:
case LTTNG_DOMAIN_UST_PID:
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
case LTTNG_DOMAIN_UST_EXEC_NAME:
case LTTNG_DOMAIN_UST_PID:
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
+#endif
default:
default:
- ret = LTTCOMM_
NOT_IMPLEMENTE
D;
+ ret = LTTCOMM_
UN
D;
goto error;
}
goto error;
}
@@
-2350,11
+2358,13
@@
static int cmd_disable_event_all(struct ltt_session *session, int domain,
break;
}
break;
}
+#if 0
case LTTNG_DOMAIN_UST_EXEC_NAME:
case LTTNG_DOMAIN_UST_PID:
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
case LTTNG_DOMAIN_UST_EXEC_NAME:
case LTTNG_DOMAIN_UST_PID:
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
+#endif
default:
default:
- ret = LTTCOMM_
NOT_IMPLEMENTE
D;
+ ret = LTTCOMM_
UN
D;
goto error;
}
goto error;
}
@@
-2391,11
+2401,13
@@
static int cmd_add_context(struct ltt_session *session, int domain,
}
break;
}
}
break;
}
+#if 0
case LTTNG_DOMAIN_UST_EXEC_NAME:
case LTTNG_DOMAIN_UST_PID:
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
case LTTNG_DOMAIN_UST_EXEC_NAME:
case LTTNG_DOMAIN_UST_PID:
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
+#endif
default:
default:
- ret = LTTCOMM_
NOT_IMPLEMENTE
D;
+ ret = LTTCOMM_
UN
D;
goto error;
}
goto error;
}
@@
-2506,11
+2518,13
@@
static int cmd_enable_event(struct ltt_session *session, int domain,
}
break;
}
}
break;
}
+#if 0
case LTTNG_DOMAIN_UST_EXEC_NAME:
case LTTNG_DOMAIN_UST_PID:
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
case LTTNG_DOMAIN_UST_EXEC_NAME:
case LTTNG_DOMAIN_UST_PID:
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
+#endif
default:
default:
- ret = LTTCOMM_
NOT_IMPLEMENTE
D;
+ ret = LTTCOMM_
UN
D;
goto error;
}
goto error;
}
@@
-2641,11
+2655,13
@@
static int cmd_enable_event_all(struct ltt_session *session, int domain,
break;
}
break;
}
+#if 0
case LTTNG_DOMAIN_UST_EXEC_NAME:
case LTTNG_DOMAIN_UST_PID:
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
case LTTNG_DOMAIN_UST_EXEC_NAME:
case LTTNG_DOMAIN_UST_PID:
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
+#endif
default:
default:
- ret = LTTCOMM_
NOT_IMPLEMENTE
D;
+ ret = LTTCOMM_
UN
D;
goto error;
}
goto error;
}
@@
-2679,7
+2695,7
@@
static ssize_t cmd_list_tracepoints(int domain, struct lttng_event **events)
}
break;
default:
}
break;
default:
- ret = LTTCOMM_
NOT_IMPLEMENTE
D;
+ ret = LTTCOMM_
UN
D;
goto error;
}
goto error;
}
@@
-2908,9
+2924,20
@@
static int cmd_calibrate(int domain, struct lttng_calibrate *calibrate)
}
break;
}
}
break;
}
+ case LTTNG_DOMAIN_UST:
+ {
+ struct lttng_ust_calibrate ucalibrate;
+
+ ucalibrate.type = calibrate->type;
+ ret = ust_app_calibrate_glb(&ucalibrate);
+ if (ret < 0) {
+ ret = LTTCOMM_UST_CALIBRATE_FAIL;
+ goto error;
+ }
+ break;
+ }
default:
default:
- /* TODO: Userspace tracing */
- ret = LTTCOMM_NOT_IMPLEMENTED;
+ ret = LTTCOMM_UND;
goto error;
}
goto error;
}
@@
-2946,7
+2973,7
@@
static int cmd_register_consumer(struct ltt_session *session, int domain,
break;
default:
/* TODO: Userspace tracing */
break;
default:
/* TODO: Userspace tracing */
- ret = LTTCOMM_
NOT_IMPLEMENTE
D;
+ ret = LTTCOMM_
UN
D;
goto error;
}
goto error;
}
@@
-3022,7
+3049,7
@@
static ssize_t cmd_list_channels(int domain, struct ltt_session *session,
break;
default:
*channels = NULL;
break;
default:
*channels = NULL;
- ret = -LTTCOMM_
NOT_IMPLEMENTE
D;
+ ret = -LTTCOMM_
UN
D;
goto error;
}
goto error;
}
@@
-3069,7
+3096,7
@@
static ssize_t cmd_list_events(int domain, struct ltt_session *session,
break;
}
default:
break;
}
default:
- ret = -LTTCOMM_
NOT_IMPLEMENTE
D;
+ ret = -LTTCOMM_
UN
D;
goto error;
}
goto error;
}
@@
-3535,7
+3562,7
@@
static void *thread_manage_clients(void *data)
* Notify parent pid that we are ready to accept command for client side.
*/
if (opt_sig_parent) {
* Notify parent pid that we are ready to accept command for client side.
*/
if (opt_sig_parent) {
- kill(ppid, SIG
CHLD
);
+ kill(ppid, SIG
USR1
);
}
while (1) {
}
while (1) {
@@
-4050,14
+4077,14
@@
static void sighandler(int sig)
{
switch (sig) {
case SIGPIPE:
{
switch (sig) {
case SIGPIPE:
- DBG("SIGPIPE caug
th
");
+ DBG("SIGPIPE caug
ht
");
return;
case SIGINT:
return;
case SIGINT:
- DBG("SIGINT caug
th
");
+ DBG("SIGINT caug
ht
");
stop_threads();
break;
case SIGTERM:
stop_threads();
break;
case SIGTERM:
- DBG("SIGTERM caug
th
");
+ DBG("SIGTERM caug
ht
");
stop_threads();
break;
default:
stop_threads();
break;
default:
@@
-4131,6
+4158,8
@@
int main(int argc, char **argv)
void *status;
const char *home_path;
void *status;
const char *home_path;
+ init_kernel_workarounds();
+
rcu_register_thread();
/* Create thread quit pipe */
rcu_register_thread();
/* Create thread quit pipe */
This page took
0.029423 seconds
and
4
git commands to generate.