projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename lttngerr.h to error.h
[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 0d1a916c2b0f7e40abf5a0c15bc5b1cbf33b0166..d7ed4eb0b0a7fc0ec18b99d7fd73a1a8c8b1485e 100644
(file)
--- a/
src/bin/lttng-sessiond/main.c
+++ b/
src/bin/lttng-sessiond/main.c
@@
-39,14
+39,14
@@
#include <config.h>
#include <bin/lttng-consumerd/lttng-consumerd.h>
#include <config.h>
#include <bin/lttng-consumerd/lttng-consumerd.h>
-#include <common/lttngerr.h>
+#include <common/common.h>
+#include <common/compat/poll.h>
+#include <common/defaults.h>
#include <common/kernel-consumer/kernel-consumer.h>
#include <common/ust-consumer/ust-consumer.h>
#include <common/kernel-consumer/kernel-consumer.h>
#include <common/ust-consumer/ust-consumer.h>
-#include <common/runas.h>
#include "lttng-sessiond.h"
#include "channel.h"
#include "lttng-sessiond.h"
#include "channel.h"
-#include "compat/poll.h"
#include "context.h"
#include "event.h"
#include "futex.h"
#include "context.h"
#include "event.h"
#include "futex.h"
@@
-4169,14
+4169,14
@@
static void sighandler(int sig)
{
switch (sig) {
case SIGPIPE:
{
switch (sig) {
case SIGPIPE:
- DBG("SIGPIPE ca
tched
");
+ DBG("SIGPIPE ca
ugth
");
return;
case SIGINT:
return;
case SIGINT:
- DBG("SIGINT ca
tched
");
+ DBG("SIGINT ca
ugth
");
stop_threads();
break;
case SIGTERM:
stop_threads();
break;
case SIGTERM:
- DBG("SIGTERM ca
tched
");
+ DBG("SIGTERM ca
ugth
");
stop_threads();
break;
default:
stop_threads();
break;
default:
@@
-4278,7
+4278,7
@@
int main(int argc, char **argv)
is_root = !getuid();
if (is_root) {
is_root = !getuid();
if (is_root) {
- rundir = strdup(LTTNG_RUNDIR);
+ rundir = strdup(
DEFAULT_
LTTNG_RUNDIR);
/* Create global run dir with root access */
ret = create_lttng_rundir(rundir);
/* Create global run dir with root access */
ret = create_lttng_rundir(rundir);
@@
-4325,7
+4325,7
@@
int main(int argc, char **argv)
* Create rundir from home path. This will create something like
* $HOME/.lttng
*/
* Create rundir from home path. This will create something like
* $HOME/.lttng
*/
- ret = asprintf(&rundir, LTTNG_HOME_RUNDIR, home_path);
+ ret = asprintf(&rundir,
DEFAULT_
LTTNG_HOME_RUNDIR, home_path);
if (ret < 0) {
ret = -ENOMEM;
goto error;
if (ret < 0) {
ret = -ENOMEM;
goto error;
This page took
0.024668 seconds
and
4
git commands to generate.