projects
/
ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
New naming convention for internal macros
[ust.git]
/
libust
/
channels.c
diff --git
a/libust/channels.c
b/libust/channels.c
index 32942cf795f79a4d7c1f7b63755eef68a9c4fdf8..57e980104fd5ad40b3bbf9ed9841d53d69801bfb 100644
(file)
--- a/
libust/channels.c
+++ b/
libust/channels.c
@@
-24,7
+24,6
@@
*/
#include <stdlib.h>
*/
#include <stdlib.h>
-#include <ust/kernelcompat.h>
#include <ust/marker.h>
#include "channels.h"
#include "usterr.h"
#include <ust/marker.h>
#include "channels.h"
#include "usterr.h"
@@
-67,7
+66,7
@@
static struct ltt_channel_setting *lookup_channel(const char *name)
*/
static void release_channel_setting(struct kref *kref)
{
*/
static void release_channel_setting(struct kref *kref)
{
- struct ltt_channel_setting *setting = container_of(kref,
+ struct ltt_channel_setting *setting =
_ust_
container_of(kref,
struct ltt_channel_setting, kref);
struct ltt_channel_setting *iter;
struct ltt_channel_setting, kref);
struct ltt_channel_setting *iter;
@@
-110,7
+109,7
@@
int ltt_channels_register(const char *name)
struct ltt_channel_setting *setting;
int ret = 0;
struct ltt_channel_setting *setting;
int ret = 0;
- mutex_lock(<t_channel_mutex);
+
pthread_
mutex_lock(<t_channel_mutex);
setting = lookup_channel(name);
if (setting) {
if (uatomic_read(&setting->kref.refcount) == 0)
setting = lookup_channel(name);
if (setting) {
if (uatomic_read(&setting->kref.refcount) == 0)
@@
-131,7
+130,7
@@
int ltt_channels_register(const char *name)
init_kref:
kref_init(&setting->kref);
end:
init_kref:
kref_init(&setting->kref);
end:
- mutex_unlock(<t_channel_mutex);
+
pthread_
mutex_unlock(<t_channel_mutex);
return ret;
}
//ust// EXPORT_SYMBOL_GPL(ltt_channels_register);
return ret;
}
//ust// EXPORT_SYMBOL_GPL(ltt_channels_register);
@@
-147,7
+146,7
@@
int ltt_channels_unregister(const char *name)
struct ltt_channel_setting *setting;
int ret = 0;
struct ltt_channel_setting *setting;
int ret = 0;
- mutex_lock(<t_channel_mutex);
+
pthread_
mutex_lock(<t_channel_mutex);
setting = lookup_channel(name);
if (!setting || uatomic_read(&setting->kref.refcount) == 0) {
ret = -ENOENT;
setting = lookup_channel(name);
if (!setting || uatomic_read(&setting->kref.refcount) == 0) {
ret = -ENOENT;
@@
-155,7
+154,7
@@
int ltt_channels_unregister(const char *name)
}
kref_put(&setting->kref, release_channel_setting);
end:
}
kref_put(&setting->kref, release_channel_setting);
end:
- mutex_unlock(<t_channel_mutex);
+
pthread_
mutex_unlock(<t_channel_mutex);
return ret;
}
//ust// EXPORT_SYMBOL_GPL(ltt_channels_unregister);
return ret;
}
//ust// EXPORT_SYMBOL_GPL(ltt_channels_unregister);
@@
-173,7
+172,7
@@
int ltt_channels_set_default(const char *name,
struct ltt_channel_setting *setting;
int ret = 0;
struct ltt_channel_setting *setting;
int ret = 0;
- mutex_lock(<t_channel_mutex);
+
pthread_
mutex_lock(<t_channel_mutex);
setting = lookup_channel(name);
if (!setting || uatomic_read(&setting->kref.refcount) == 0) {
ret = -ENOENT;
setting = lookup_channel(name);
if (!setting || uatomic_read(&setting->kref.refcount) == 0) {
ret = -ENOENT;
@@
-182,7
+181,7
@@
int ltt_channels_set_default(const char *name,
setting->subbuf_size = subbuf_size;
setting->subbuf_cnt = subbuf_cnt;
end:
setting->subbuf_size = subbuf_size;
setting->subbuf_cnt = subbuf_cnt;
end:
- mutex_unlock(<t_channel_mutex);
+
pthread_
mutex_unlock(<t_channel_mutex);
return ret;
}
//ust// EXPORT_SYMBOL_GPL(ltt_channels_set_default);
return ret;
}
//ust// EXPORT_SYMBOL_GPL(ltt_channels_set_default);
@@
-255,7
+254,7
@@
struct ust_channel *ltt_channels_trace_alloc(unsigned int *nr_channels,
struct ust_channel *channel = NULL;
struct ltt_channel_setting *iter;
struct ust_channel *channel = NULL;
struct ltt_channel_setting *iter;
- mutex_lock(<t_channel_mutex);
+
pthread_
mutex_lock(<t_channel_mutex);
if (!free_index) {
WARN("ltt_channels_trace_alloc: no free_index; are there any probes connected?");
goto end;
if (!free_index) {
WARN("ltt_channels_trace_alloc: no free_index; are there any probes connected?");
goto end;
@@
-281,7
+280,7
@@
struct ust_channel *ltt_channels_trace_alloc(unsigned int *nr_channels,
channel[iter->index].channel_name = iter->name;
}
end:
channel[iter->index].channel_name = iter->name;
}
end:
- mutex_unlock(<t_channel_mutex);
+
pthread_
mutex_unlock(<t_channel_mutex);
return channel;
}
//ust// EXPORT_SYMBOL_GPL(ltt_channels_trace_alloc);
return channel;
}
//ust// EXPORT_SYMBOL_GPL(ltt_channels_trace_alloc);
@@
-296,10
+295,10
@@
end:
void ltt_channels_trace_free(struct ust_channel *channels)
{
lock_markers();
void ltt_channels_trace_free(struct ust_channel *channels)
{
lock_markers();
- mutex_lock(<t_channel_mutex);
+
pthread_
mutex_lock(<t_channel_mutex);
free(channels);
kref_put(&index_kref, release_trace_channel);
free(channels);
kref_put(&index_kref, release_trace_channel);
- mutex_unlock(<t_channel_mutex);
+
pthread_
mutex_unlock(<t_channel_mutex);
unlock_markers();
}
//ust// EXPORT_SYMBOL_GPL(ltt_channels_trace_free);
unlock_markers();
}
//ust// EXPORT_SYMBOL_GPL(ltt_channels_trace_free);
@@
-353,9
+352,9
@@
int ltt_channels_get_event_id(const char *channel, const char *name)
{
int ret;
{
int ret;
- mutex_lock(<t_channel_mutex);
+
pthread_
mutex_lock(<t_channel_mutex);
ret = _ltt_channels_get_event_id(channel, name);
ret = _ltt_channels_get_event_id(channel, name);
- mutex_unlock(<t_channel_mutex);
+
pthread_
mutex_unlock(<t_channel_mutex);
return ret;
}
return ret;
}
This page took
0.02574 seconds
and
4
git commands to generate.