projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix comments and enforce expected return values
[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 1b837c1fc52ed201bcc2e553d2c67ce71189bddc..631aa6b2d92e5e0d13aaa5a2d59072327b31eb69 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;
}
@@
-2295,7
+2295,7
@@
static int cmd_disable_event(struct ltt_session *session, int domain,
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
#endif
default:
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
#endif
default:
- ret = LTTCOMM_
NOT_IMPLEMENTE
D;
+ ret = LTTCOMM_
UN
D;
goto error;
}
goto error;
}
@@
-2364,7
+2364,7
@@
static int cmd_disable_event_all(struct ltt_session *session, int domain,
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
#endif
default:
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
#endif
default:
- ret = LTTCOMM_
NOT_IMPLEMENTE
D;
+ ret = LTTCOMM_
UN
D;
goto error;
}
goto error;
}
@@
-2407,7
+2407,7
@@
static int cmd_add_context(struct ltt_session *session, int domain,
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
#endif
default:
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
#endif
default:
- ret = LTTCOMM_
NOT_IMPLEMENTE
D;
+ ret = LTTCOMM_
UN
D;
goto error;
}
goto error;
}
@@
-2524,7
+2524,7
@@
static int cmd_enable_event(struct ltt_session *session, int domain,
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
#endif
default:
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
#endif
default:
- ret = LTTCOMM_
NOT_IMPLEMENTE
D;
+ ret = LTTCOMM_
UN
D;
goto error;
}
goto error;
}
@@
-2661,7
+2661,7
@@
static int cmd_enable_event_all(struct ltt_session *session, int domain,
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
#endif
default:
case LTTNG_DOMAIN_UST_PID_FOLLOW_CHILDREN:
#endif
default:
- ret = LTTCOMM_
NOT_IMPLEMENTE
D;
+ ret = LTTCOMM_
UN
D;
goto error;
}
goto error;
}
@@
-2695,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;
}
@@
-2924,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;
}
@@
-2962,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;
}
@@
-3038,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;
}
@@
-3085,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;
}
@@
-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:
This page took
0.047935 seconds
and
4
git commands to generate.