projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clock override: use getter API from LTTng-UST
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
ust-consumer.c
diff --git
a/src/bin/lttng-sessiond/ust-consumer.c
b/src/bin/lttng-sessiond/ust-consumer.c
index e5ba996cceaf160a4bc207113b22f7c08b4c05a9..cd0a4f21c5f8a2f551cba1e5a890262b7b3576a6 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-consumer.c
+++ b/
src/bin/lttng-sessiond/ust-consumer.c
@@
-6,13
+6,13
@@
*/
#define _LGPL_SOURCE
*/
#define _LGPL_SOURCE
-#include <errno.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
#include <inttypes.h>
+#include <common/compat/errno.h>
#include <common/common.h>
#include <common/consumer/consumer.h>
#include <common/defaults.h>
#include <common/common.h>
#include <common/consumer/consumer.h>
#include <common/defaults.h>
@@
-42,7
+42,7
@@
static int ask_channel_creation(struct ust_app_session *ua_sess,
uint64_t key, chan_reg_key;
char *pathname = NULL;
struct lttcomm_consumer_msg msg;
uint64_t key, chan_reg_key;
char *pathname = NULL;
struct lttcomm_consumer_msg msg;
- struct ust_registry_channel *
chan_reg
;
+ struct ust_registry_channel *
ust_reg_chan
;
char shm_path[PATH_MAX] = "";
char root_shm_path[PATH_MAX] = "";
bool is_local_trace;
char shm_path[PATH_MAX] = "";
char root_shm_path[PATH_MAX] = "";
bool is_local_trace;
@@
-97,7
+97,7
@@
static int ask_channel_creation(struct ust_app_session *ua_sess,
chan_reg_key = ua_chan->key;
}
chan_reg_key = ua_chan->key;
}
- if (ua_chan->attr.type == LTTNG_UST_CHAN_METADATA) {
+ if (ua_chan->attr.type == LTTNG_UST_
ABI_
CHAN_METADATA) {
chan_id = -1U;
/*
* Metadata channels shm_path (buffers) are handled within
chan_id = -1U;
/*
* Metadata channels shm_path (buffers) are handled within
@@
-105,9
+105,9
@@
static int ask_channel_creation(struct ust_app_session *ua_sess,
* those buffer files.
*/
} else {
* those buffer files.
*/
} else {
-
chan_reg
= ust_registry_channel_find(registry, chan_reg_key);
- assert(
chan_reg
);
- chan_id =
chan_reg
->chan_id;
+
ust_reg_chan
= ust_registry_channel_find(registry, chan_reg_key);
+ assert(
ust_reg_chan
);
+ chan_id =
ust_reg_chan
->chan_id;
if (ua_sess->shm_path[0]) {
strncpy(shm_path, ua_sess->shm_path, sizeof(shm_path));
shm_path[sizeof(shm_path) - 1] = '\0';
if (ua_sess->shm_path[0]) {
strncpy(shm_path, ua_sess->shm_path, sizeof(shm_path));
shm_path[sizeof(shm_path) - 1] = '\0';
@@
-123,7
+123,7
@@
static int ask_channel_creation(struct ust_app_session *ua_sess,
}
switch (ua_chan->attr.output) {
}
switch (ua_chan->attr.output) {
- case LTTNG_UST_MMAP:
+ case LTTNG_UST_
ABI_
MMAP:
default:
output = LTTNG_EVENT_MMAP;
break;
default:
output = LTTNG_EVENT_MMAP;
break;
@@
-136,6
+136,7
@@
static int ask_channel_creation(struct ust_app_session *ua_sess,
ua_chan->attr.switch_timer_interval,
ua_chan->attr.read_timer_interval,
ua_sess->live_timer_interval,
ua_chan->attr.switch_timer_interval,
ua_chan->attr.read_timer_interval,
ua_sess->live_timer_interval,
+ ua_sess->live_timer_interval != 0,
ua_chan->monitor_timer_interval,
output,
(int) ua_chan->attr.type,
ua_chan->monitor_timer_interval,
output,
(int) ua_chan->attr.type,
@@
-150,7
+151,7
@@
static int ask_channel_creation(struct ust_app_session *ua_sess,
ua_chan->tracefile_count,
ua_sess->id,
ua_sess->output_traces,
ua_chan->tracefile_count,
ua_sess->id,
ua_sess->output_traces,
-
ua_sess->real_credentials.uid
,
+
lttng_credentials_get_uid(&ua_sess->real_credentials)
,
ua_chan->attr.blocking_timeout,
root_shm_path, shm_path,
trace_chunk,
ua_chan->attr.blocking_timeout,
root_shm_path, shm_path,
trace_chunk,
This page took
0.025172 seconds
and
4
git commands to generate.