projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: sessiond: check for lttng-modules ABI 2.1 rather than 2.8
[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 9ab54e9d7a64553f9e0d61d31d2e54661ad67ef9..c2ac56679aec771a44043af177096b7f521889b1 100644
(file)
--- a/
src/bin/lttng-sessiond/ust-consumer.c
+++ b/
src/bin/lttng-sessiond/ust-consumer.c
@@
-30,6
+30,7
@@
#include "consumer.h"
#include "health-sessiond.h"
#include "ust-consumer.h"
#include "consumer.h"
#include "health-sessiond.h"
#include "ust-consumer.h"
+#include "lttng-ust-error.h"
#include "buffer-registry.h"
#include "session.h"
#include "lttng-sessiond.h"
#include "buffer-registry.h"
#include "session.h"
#include "lttng-sessiond.h"
@@
-55,6
+56,7
@@
static int ask_channel_creation(struct ust_app_session *ua_sess,
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;
+ size_t consumer_path_offset = 0;
assert(ua_sess);
assert(ua_chan);
assert(ua_sess);
assert(ua_chan);
@@
-66,7
+68,8
@@
static int ask_channel_creation(struct ust_app_session *ua_sess,
is_local_trace = consumer->net_seq_index == -1ULL;
/* Format the channel's path (relative to the current trace chunk). */
is_local_trace = consumer->net_seq_index == -1ULL;
/* Format the channel's path (relative to the current trace chunk). */
- pathname = setup_channel_trace_path(consumer, ua_sess->path);
+ pathname = setup_channel_trace_path(consumer, ua_sess->path,
+ &consumer_path_offset);
if (!pathname) {
ret = -1;
goto error;
if (!pathname) {
ret = -1;
goto error;
@@
-147,7
+150,7
@@
static int ask_channel_creation(struct ust_app_session *ua_sess,
output,
(int) ua_chan->attr.type,
ua_sess->tracing_id,
output,
(int) ua_chan->attr.type,
ua_sess->tracing_id,
-
pathname
,
+
&pathname[consumer_path_offset]
,
ua_chan->name,
consumer->net_seq_index,
ua_chan->key,
ua_chan->name,
consumer->net_seq_index,
ua_chan->key,
This page took
0.024592 seconds
and
4
git commands to generate.