projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix events listing using the channel name
[lttng-tools.git]
/
lttng-sessiond
/
channel.c
diff --git
a/lttng-sessiond/channel.c
b/lttng-sessiond/channel.c
index fda679c78f3ebacfbee3ff9d52b4aabb25228cdc..2dd9840d4083e864230d87235eb9e01752f4cc68 100644
(file)
--- a/
lttng-sessiond/channel.c
+++ b/
lttng-sessiond/channel.c
@@
-21,13
+21,6
@@
#include <lttng/lttng.h>
#include <lttng-sessiond-comm.h>
#include <lttngerr.h>
#include <lttng/lttng.h>
#include <lttng-sessiond-comm.h>
#include <lttngerr.h>
-#ifdef CONFIG_LTTNG_TOOLS_HAVE_UST
-#include <ust/lttng-ust-ctl.h>
-#include <ust/lttng-ust-abi.h>
-#else
-#include "lttng-ust-ctl.h"
-#include "lttng-ust-abi.h"
-#endif
#include "channel.h"
#include "hashtable.h"
#include "channel.h"
#include "hashtable.h"
@@
-44,7
+37,7
@@
struct lttng_channel *channel_new_default_attr(int dom)
chan = zmalloc(sizeof(struct lttng_channel));
if (chan == NULL) {
chan = zmalloc(sizeof(struct lttng_channel));
if (chan == NULL) {
- perror("malloc channel init");
+ perror("
z
malloc channel init");
goto error_alloc;
}
goto error_alloc;
}
@@
-95,9
+88,9
@@
int channel_ust_copy(struct ltt_ust_channel *dst,
/*
cds_list_for_each_entry(uevent, &src->events.head, list) {
/*
cds_list_for_each_entry(uevent, &src->events.head, list) {
- new_uevent = malloc(sizeof(struct ltt_ust_event));
+ new_uevent =
z
malloc(sizeof(struct ltt_ust_event));
if (new_uevent == NULL) {
if (new_uevent == NULL) {
- perror("malloc ltt_ust_event");
+ perror("
z
malloc ltt_ust_event");
goto error;
}
goto error;
}
This page took
0.024613 seconds
and
4
git commands to generate.