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: work-around mismatching variant type tag field and selector names
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
context.cpp
diff --git
a/src/bin/lttng-sessiond/context.cpp
b/src/bin/lttng-sessiond/context.cpp
index c8c89243823fe47a883e675532252065a75a551f..8dc82fbe82e70b538d41c2df88a1deb377df9412 100644
(file)
--- a/
src/bin/lttng-sessiond/context.cpp
+++ b/
src/bin/lttng-sessiond/context.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2011
David Goulet <david.goulet@polymtl.ca>
+ * Copyright (C) 2011
EfficiOS Inc.
* Copyright (C) 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
*
* SPDX-License-Identifier: GPL-2.0-only
* Copyright (C) 2016 Jérémie Galarneau <jeremie.galarneau@efficios.com>
*
* SPDX-License-Identifier: GPL-2.0-only
@@
-13,14
+13,14
@@
#include <unistd.h>
#include <urcu/list.h>
#include <unistd.h>
#include <urcu/list.h>
-#include <common/error.h>
-#include <common/sessiond-comm/sessiond-comm.h>
+#include <common/error.h
pp
>
+#include <common/sessiond-comm/sessiond-comm.h
pp
>
-#include "context.h"
-#include "kernel.h"
-#include "ust-app.h"
-#include "trace-ust.h"
-#include "agent.h"
+#include "context.h
pp
"
+#include "kernel.h
pp
"
+#include "ust-app.h
pp
"
+#include "trace-ust.h
pp
"
+#include "agent.h
pp
"
/*
* Add kernel context to all channel.
/*
* Add kernel context to all channel.
@@
-187,7
+187,8
@@
duplicate:
* Add kernel context to tracer.
*/
int context_kernel_add(struct ltt_kernel_session *ksession,
* Add kernel context to tracer.
*/
int context_kernel_add(struct ltt_kernel_session *ksession,
- const struct lttng_event_context *ctx, char *channel_name)
+ const struct lttng_event_context *ctx,
+ const char *channel_name)
{
int ret;
struct ltt_kernel_channel *kchan;
{
int ret;
struct ltt_kernel_channel *kchan;
@@
-366,7
+367,7
@@
error:
int context_ust_add(struct ltt_ust_session *usess,
enum lttng_domain_type domain,
const struct lttng_event_context *ctx,
int context_ust_add(struct ltt_ust_session *usess,
enum lttng_domain_type domain,
const struct lttng_event_context *ctx,
- char *channel_name)
+ c
onst c
har *channel_name)
{
int ret = LTTNG_OK;
struct lttng_ht_iter iter;
{
int ret = LTTNG_OK;
struct lttng_ht_iter iter;
This page took
0.024799 seconds
and
4
git commands to generate.