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
/
marker.c
diff --git
a/libust/marker.c
b/libust/marker.c
index 4dc7de1c8b7a13d538727abdedfcc247510728f6..0c85cc3997f0d8669473c91055b7582ea4ad4f7c 100644
(file)
--- a/
libust/marker.c
+++ b/
libust/marker.c
@@
-235,7
+235,7
@@
static notrace void marker_probe_cb_noarg(const struct marker *mdata,
static void free_old_closure(struct rcu_head *head)
{
static void free_old_closure(struct rcu_head *head)
{
- struct marker_entry *entry = container_of(head,
+ struct marker_entry *entry =
_ust_
container_of(head,
struct marker_entry, rcu);
free(entry->oldptr);
/* Make sure we free the data before setting the pending flag to 0 */
struct marker_entry, rcu);
free(entry->oldptr);
/* Make sure we free the data before setting the pending flag to 0 */
@@
-428,10
+428,10
@@
static struct marker_entry *add_marker(const char *channel, const char *name,
}
}
/*
}
}
/*
- * Using malloc here to allocate a variable length element. Could
+ * Using
z
malloc here to allocate a variable length element. Could
* cause some memory fragmentation if overused.
*/
* cause some memory fragmentation if overused.
*/
- e = malloc(sizeof(struct marker_entry)
+ e =
z
malloc(sizeof(struct marker_entry)
+ channel_len + name_len + format_len);
if (!e)
return ERR_PTR(-ENOMEM);
+ channel_len + name_len + format_len);
if (!e)
return ERR_PTR(-ENOMEM);
@@
-439,7
+439,7
@@
static struct marker_entry *add_marker(const char *channel, const char *name,
e->name = &e->channel[channel_len];
memcpy(e->name, name, name_len);
if (format) {
e->name = &e->channel[channel_len];
memcpy(e->name, name, name_len);
if (format) {
- e->format = &e->name[
channel_len +
name_len];
+ e->format = &e->name[name_len];
memcpy(e->format, format, format_len);
if (strcmp(e->format, MARK_NOARGS) == 0)
e->call = marker_probe_cb_noarg;
memcpy(e->format, format, format_len);
if (strcmp(e->format, MARK_NOARGS) == 0)
e->call = marker_probe_cb_noarg;
@@
-529,7
+529,7
@@
static int set_marker(struct marker_entry *entry, struct marker *elem,
if (entry->format) {
if (strcmp(entry->format, elem->format) != 0) {
if (entry->format) {
if (strcmp(entry->format, elem->format) != 0) {
-
DBG
("Format mismatch for probe %s (%s), marker (%s)",
+
ERR
("Format mismatch for probe %s (%s), marker (%s)",
entry->name,
entry->format,
elem->format);
entry->name,
entry->format,
elem->format);
@@
-1363,7
+1363,7
@@
int marker_register_lib(struct marker *markers_start, int markers_count)
{
struct lib *pl;
{
struct lib *pl;
- pl = (struct lib *) malloc(sizeof(struct lib));
+ pl = (struct lib *)
z
malloc(sizeof(struct lib));
pl->markers_start = markers_start;
pl->markers_count = markers_count;
pl->markers_start = markers_start;
pl->markers_count = markers_count;
This page took
0.023826 seconds
and
4
git commands to generate.