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-consumerd
/
lttng-consumerd.c
diff --git
a/src/bin/lttng-consumerd/lttng-consumerd.c
b/src/bin/lttng-consumerd/lttng-consumerd.c
index 8cb264ab1bd74b413a4b0a32b50cf80bfdbb5343..a637a904244979b5f8b0a310e458684a03162d19 100644
(file)
--- a/
src/bin/lttng-consumerd/lttng-consumerd.c
+++ b/
src/bin/lttng-consumerd/lttng-consumerd.c
@@
-40,10
+40,11
@@
#include <config.h>
#include <urcu/compiler.h>
#include <config.h>
#include <urcu/compiler.h>
-#include <common/lttngerr.h>
+#include <common/defaults.h>
+#include <common/common.h>
+#include <common/kernel-consumer/kernel-consumer.h>
#include <common/kernel-ctl/kernel-ctl.h>
#include <common/sessiond-comm/sessiond-comm.h>
#include <common/kernel-ctl/kernel-ctl.h>
#include <common/sessiond-comm/sessiond-comm.h>
-#include <common/kernel-consumer/kernel-consumer.h>
#include <common/ust-consumer/ust-consumer.h>
#include "lttng-consumerd.h"
#include <common/ust-consumer/ust-consumer.h>
#include "lttng-consumerd.h"
@@
-252,16
+253,16
@@
int main(int argc, char **argv)
if (strlen(command_sock_path) == 0) {
switch (opt_type) {
case LTTNG_CONSUMER_KERNEL:
if (strlen(command_sock_path) == 0) {
switch (opt_type) {
case LTTNG_CONSUMER_KERNEL:
- snprintf(command_sock_path, PATH_MAX, KCONSUMERD_CMD_SOCK_PATH,
- LTTNG_RUNDIR);
+ snprintf(command_sock_path, PATH_MAX,
DEFAULT_
KCONSUMERD_CMD_SOCK_PATH,
+
DEFAULT_
LTTNG_RUNDIR);
break;
case LTTNG_CONSUMER64_UST:
snprintf(command_sock_path, PATH_MAX,
break;
case LTTNG_CONSUMER64_UST:
snprintf(command_sock_path, PATH_MAX,
-
USTCONSUMERD64_CMD_SOCK_PATH,
LTTNG_RUNDIR);
+
DEFAULT_USTCONSUMERD64_CMD_SOCK_PATH, DEFAULT_
LTTNG_RUNDIR);
break;
case LTTNG_CONSUMER32_UST:
snprintf(command_sock_path, PATH_MAX,
break;
case LTTNG_CONSUMER32_UST:
snprintf(command_sock_path, PATH_MAX,
-
USTCONSUMERD32_CMD_SOCK_PATH,
LTTNG_RUNDIR);
+
DEFAULT_USTCONSUMERD32_CMD_SOCK_PATH, DEFAULT_
LTTNG_RUNDIR);
break;
default:
WARN("Unknown consumerd type");
break;
default:
WARN("Unknown consumerd type");
@@
-283,16
+284,16
@@
int main(int argc, char **argv)
if (strlen(error_sock_path) == 0) {
switch (opt_type) {
case LTTNG_CONSUMER_KERNEL:
if (strlen(error_sock_path) == 0) {
switch (opt_type) {
case LTTNG_CONSUMER_KERNEL:
- snprintf(error_sock_path, PATH_MAX, KCONSUMERD_ERR_SOCK_PATH,
- LTTNG_RUNDIR);
+ snprintf(error_sock_path, PATH_MAX,
DEFAULT_
KCONSUMERD_ERR_SOCK_PATH,
+
DEFAULT_
LTTNG_RUNDIR);
break;
case LTTNG_CONSUMER64_UST:
snprintf(error_sock_path, PATH_MAX,
break;
case LTTNG_CONSUMER64_UST:
snprintf(error_sock_path, PATH_MAX,
-
USTCONSUMERD64_ERR_SOCK_PATH,
LTTNG_RUNDIR);
+
DEFAULT_USTCONSUMERD64_ERR_SOCK_PATH, DEFAULT_
LTTNG_RUNDIR);
break;
case LTTNG_CONSUMER32_UST:
snprintf(error_sock_path, PATH_MAX,
break;
case LTTNG_CONSUMER32_UST:
snprintf(error_sock_path, PATH_MAX,
-
USTCONSUMERD32_ERR_SOCK_PATH,
LTTNG_RUNDIR);
+
DEFAULT_USTCONSUMERD32_ERR_SOCK_PATH, DEFAULT_
LTTNG_RUNDIR);
break;
default:
WARN("Unknown consumerd type");
break;
default:
WARN("Unknown consumerd type");
This page took
0.024619 seconds
and
4
git commands to generate.