projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing string.h include in libustctl_function_tests
[lttng-ust.git]
/
libust
/
tracepoint.c
diff --git
a/libust/tracepoint.c
b/libust/tracepoint.c
index 335ba4f7f53ad9ae41e971654b5303d864ac8a89..737e5f5c96c2adc63e6ead4b4aec9fe73efbc1d3 100644
(file)
--- a/
libust/tracepoint.c
+++ b/
libust/tracepoint.c
@@
-4,8
+4,8
@@
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation;
either
- * version 2.1 of the License
, or (at your option) any later version
.
+ * License as published by the Free Software Foundation;
+ * version 2.1 of the License.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-19,16
+19,16
@@
* Ported to userspace by Pierre-Marc Fournier.
*/
* Ported to userspace by Pierre-Marc Fournier.
*/
+#define _LGPL_SOURCE
#include <errno.h>
#include <ust/tracepoint.h>
#include <ust/core.h>
#include <ust/kcompat/kcompat.h>
#include <errno.h>
#include <ust/tracepoint.h>
#include <ust/core.h>
#include <ust/kcompat/kcompat.h>
-#include "usterr.h"
-
-#define _LGPL_SOURCE
#include <urcu-bp.h>
#include <urcu/hlist.h>
#include <urcu-bp.h>
#include <urcu/hlist.h>
+#include "usterr_signal_safe.h"
+
//extern struct tracepoint __start___tracepoints[] __attribute__((visibility("hidden")));
//extern struct tracepoint __stop___tracepoints[] __attribute__((visibility("hidden")));
//extern struct tracepoint __start___tracepoints[] __attribute__((visibility("hidden")));
//extern struct tracepoint __stop___tracepoints[] __attribute__((visibility("hidden")));
@@
-60,7
+60,7
@@
static struct cds_hlist_head tracepoint_table[TRACEPOINT_TABLE_SIZE];
*/
struct tracepoint_entry {
struct cds_hlist_node hlist;
*/
struct tracepoint_entry {
struct cds_hlist_node hlist;
- struct probe *probes;
+ struct
tracepoint_
probe *probes;
int refcount; /* Number of times armed. 0 if disarmed. */
char name[0];
};
int refcount; /* Number of times armed. 0 if disarmed. */
char name[0];
};
@@
-70,12
+70,12
@@
struct tp_probes {
//ust// struct rcu_head rcu;
struct cds_list_head list;
} u;
//ust// struct rcu_head rcu;
struct cds_list_head list;
} u;
- struct probe probes[0];
+ struct
tracepoint_
probe probes[0];
};
static inline void *allocate_probes(int count)
{
};
static inline void *allocate_probes(int count)
{
- struct tp_probes *p = zmalloc(count * sizeof(struct probe)
+ struct tp_probes *p = zmalloc(count * sizeof(struct
tracepoint_
probe)
+ sizeof(struct tp_probes));
return p == NULL ? NULL : p->probes;
}
+ sizeof(struct tp_probes));
return p == NULL ? NULL : p->probes;
}
@@
-112,7
+112,7
@@
tracepoint_entry_add_probe(struct tracepoint_entry *entry,
void *probe, void *data)
{
int nr_probes = 0;
void *probe, void *data)
{
int nr_probes = 0;
- struct probe *old, *new;
+ struct
tracepoint_
probe *old, *new;
WARN_ON(!probe);
WARN_ON(!probe);
@@
-130,7
+130,7
@@
tracepoint_entry_add_probe(struct tracepoint_entry *entry,
if (new == NULL)
return ERR_PTR(-ENOMEM);
if (old)
if (new == NULL)
return ERR_PTR(-ENOMEM);
if (old)
- memcpy(new, old, nr_probes * sizeof(struct probe));
+ memcpy(new, old, nr_probes * sizeof(struct
tracepoint_
probe));
new[nr_probes].func = probe;
new[nr_probes].data = data;
new[nr_probes + 1].func = NULL;
new[nr_probes].func = probe;
new[nr_probes].data = data;
new[nr_probes + 1].func = NULL;
@@
-145,7
+145,7
@@
tracepoint_entry_remove_probe(struct tracepoint_entry *entry, void *probe,
void *data)
{
int nr_probes = 0, nr_del = 0, i;
void *data)
{
int nr_probes = 0, nr_del = 0, i;
- struct probe *old, *new;
+ struct
tracepoint_
probe *old, *new;
old = entry->probes;
old = entry->probes;
@@
-265,7
+265,7
@@
static void set_tracepoint(struct tracepoint_entry **entry,
* is used.
*/
rcu_assign_pointer(elem->probes, (*entry)->probes);
* is used.
*/
rcu_assign_pointer(elem->probes, (*entry)->probes);
- elem->state
__imv
= active;
+ elem->state = active;
}
/*
}
/*
@@
-276,7
+276,7
@@
static void set_tracepoint(struct tracepoint_entry **entry,
*/
static void disable_tracepoint(struct tracepoint *elem)
{
*/
static void disable_tracepoint(struct tracepoint *elem)
{
- elem->state
__imv
= 0;
+ elem->state = 0;
rcu_assign_pointer(elem->probes, NULL);
}
rcu_assign_pointer(elem->probes, NULL);
}
@@
-333,22
+333,19
@@
static void tracepoint_update_probes(void)
//ust// __stop___tracepoints);
/* tracepoints in modules. */
lib_update_tracepoints();
//ust// __stop___tracepoints);
/* tracepoints in modules. */
lib_update_tracepoints();
- /* Update immediate values */
- core_imv_update();
-//ust// module_imv_update();
}
}
-static struct probe *
+static struct
tracepoint_
probe *
tracepoint_add_probe(const char *name, void *probe, void *data)
{
struct tracepoint_entry *entry;
tracepoint_add_probe(const char *name, void *probe, void *data)
{
struct tracepoint_entry *entry;
- struct probe *old;
+ struct
tracepoint_
probe *old;
entry = get_tracepoint(name);
if (!entry) {
entry = add_tracepoint(name);
if (IS_ERR(entry))
entry = get_tracepoint(name);
if (!entry) {
entry = add_tracepoint(name);
if (IS_ERR(entry))
- return (struct probe *)entry;
+ return (struct
tracepoint_
probe *)entry;
}
old = tracepoint_entry_add_probe(entry, probe, data);
if (IS_ERR(old) && !entry->refcount)
}
old = tracepoint_entry_add_probe(entry, probe, data);
if (IS_ERR(old) && !entry->refcount)
@@
-697,7
+694,7
@@
lib_added:
lib_update_tracepoints();
/* tracepoints_count - 1: skip dummy */
lib_update_tracepoints();
/* tracepoints_count - 1: skip dummy */
- DBG("just registered a tracepoints section from %p and having %d tracepoints
", tracepoints_start, tracepoints_count - 1
);
+ DBG("just registered a tracepoints section from %p and having %d tracepoints
(minus dummy tracepoints)", tracepoints_start, tracepoints_count
);
return 0;
}
return 0;
}
This page took
0.026971 seconds
and
4
git commands to generate.