projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: mismatch of ust_app_snapshot_record prototype
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
utils.c
diff --git
a/src/bin/lttng-sessiond/utils.c
b/src/bin/lttng-sessiond/utils.c
index 99ec7772bfcf849da5730c5aeca3e7924e870261..978af5883e2fe0b532897379ca0bd3486ddf7e3b 100644
(file)
--- a/
src/bin/lttng-sessiond/utils.c
+++ b/
src/bin/lttng-sessiond/utils.c
@@
-23,6
+23,7
@@
#include <common/error.h>
#include "utils.h"
#include <common/error.h>
#include "utils.h"
+#include "snapshot.h"
#include "lttng-sessiond.h"
int ht_cleanup_pipe[2] = { -1, -1 };
#include "lttng-sessiond.h"
int ht_cleanup_pipe[2] = { -1, -1 };
@@
-98,19
+99,12
@@
int loglevels_match(int a_loglevel_type, int a_loglevel_value,
const char *session_get_base_path(const struct ltt_session *session)
{
const char *session_get_base_path(const struct ltt_session *session)
{
- struct consumer_output *consumer;
-
- if (session->kernel_session) {
- consumer = session->kernel_session->consumer;
- } else if (session->ust_session) {
- consumer = session->ust_session->consumer;
- } else {
- abort();
- }
+ return consumer_output_get_base_path(session->consumer);
+}
- if (session->net_handle > 0) {
- return consumer->dst.net.base_dir;
- } else {
- return consumer->dst.session_root_path;
- }
+const char *consumer_output_get_base_path(const struct consumer_output *output)
+{
+ return output->type == CONSUMER_DST_LOCAL ?
+ output->dst.session_root_path :
+ output->dst.net.base_dir;
}
}
This page took
0.026756 seconds
and
4
git commands to generate.