projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing rcu register thread calls
[lttng-tools.git]
/
lttng-sessiond
/
channel.c
diff --git
a/lttng-sessiond/channel.c
b/lttng-sessiond/channel.c
index 06b799db1d2132aab97e10ca2ad7e8970be1c10c..b4dc48d161e662f12678e5d8de900e5a7c2761b0 100644
(file)
--- a/
lttng-sessiond/channel.c
+++ b/
lttng-sessiond/channel.c
@@
-20,11
+20,11
@@
#include <unistd.h>
#include <lttng/lttng.h>
#include <unistd.h>
#include <lttng/lttng.h>
+#include <lttng-ht.h>
#include <lttng-sessiond-comm.h>
#include <lttngerr.h>
#include "channel.h"
#include <lttng-sessiond-comm.h>
#include <lttngerr.h>
#include "channel.h"
-#include "hashtable.h"
#include "kernel.h"
#include "ust-ctl.h"
#include "utils.h"
#include "kernel.h"
#include "ust-ctl.h"
#include "utils.h"
@@
-216,7
+216,7
@@
int channel_ust_create(struct ltt_ust_session *usess, int domain,
struct lttng_channel *attr)
{
int ret = LTTCOMM_OK;
struct lttng_channel *attr)
{
int ret = LTTCOMM_OK;
- struct
cds_lf
ht *chan_ht;
+ struct
lttng_
ht *chan_ht;
struct ltt_ust_channel *uchan = NULL;
struct lttng_channel *defattr = NULL;
struct ltt_ust_channel *uchan = NULL;
struct lttng_channel *defattr = NULL;
@@
-259,13
+259,17
@@
int channel_ust_create(struct ltt_ust_session *usess, int domain,
}
uchan->enabled = 1;
}
uchan->enabled = 1;
-
hashtable_add_unique
(chan_ht, &uchan->node);
+
lttng_ht_add_unique_str
(chan_ht, &uchan->node);
DBG2("Channel %s created successfully", uchan->name);
free(defattr);
return LTTCOMM_OK;
error_free_chan:
DBG2("Channel %s created successfully", uchan->name);
free(defattr);
return LTTCOMM_OK;
error_free_chan:
+ /*
+ * No need to remove the channel from the hash table because at this point
+ * it was not added hence the direct call and no call_rcu().
+ */
trace_ust_destroy_channel(uchan);
error:
free(defattr);
trace_ust_destroy_channel(uchan);
error:
free(defattr);
This page took
0.034142 seconds
and
4
git commands to generate.