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 023ad48b991a75e983cf9d9148909d8b567e06b7..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) {
@@
-2924,8
+2924,19
@@
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_UND;
goto error;
}
ret = LTTCOMM_UND;
goto error;
}
@@
-4066,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:
@@
-4147,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.026496 seconds
and
5
git commands to generate.