1d037ca164
perf defines both __used and __unused variables to use for marking
unused variables. The variable __used is defined to
__attribute__((__unused__)), which contradicts the kernel definition to
__attribute__((__used__)) for new gcc versions. On Android, __used is
also defined in system headers and this leads to warnings like: warning:
'__used__' attribute ignored
__unused is not defined in the kernel and is not a standard definition.
If __unused is included everywhere instead of __used, this leads to
conflicts with glibc headers, since glibc has a variables with this name
in its headers.
The best approach is to use __maybe_unused, the definition used in the
kernel for __attribute__((unused)). In this way there is only one
definition in perf sources (instead of 2 definitions that point to the
same thing: __used and __unused) and it works on both Linux and Android.
This patch simply replaces all instances of __used and __unused with
__maybe_unused.
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
Acked-by: Pekka Enberg <penberg@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1347315303-29906-7-git-send-email-irina.tirdea@intel.com
[ committer note: fixed up conflict with a116e05 in builtin-sched.c ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
102 lines
2.1 KiB
C
102 lines
2.1 KiB
C
/*
|
|
* Based on intlist.c by:
|
|
* (c) 2009 Arnaldo Carvalho de Melo <acme@redhat.com>
|
|
*
|
|
* Licensed under the GPLv2.
|
|
*/
|
|
|
|
#include <errno.h>
|
|
#include <stdlib.h>
|
|
#include <linux/compiler.h>
|
|
|
|
#include "intlist.h"
|
|
|
|
static struct rb_node *intlist__node_new(struct rblist *rblist __maybe_unused,
|
|
const void *entry)
|
|
{
|
|
int i = (int)((long)entry);
|
|
struct rb_node *rc = NULL;
|
|
struct int_node *node = malloc(sizeof(*node));
|
|
|
|
if (node != NULL) {
|
|
node->i = i;
|
|
rc = &node->rb_node;
|
|
}
|
|
|
|
return rc;
|
|
}
|
|
|
|
static void int_node__delete(struct int_node *ilist)
|
|
{
|
|
free(ilist);
|
|
}
|
|
|
|
static void intlist__node_delete(struct rblist *rblist __maybe_unused,
|
|
struct rb_node *rb_node)
|
|
{
|
|
struct int_node *node = container_of(rb_node, struct int_node, rb_node);
|
|
|
|
int_node__delete(node);
|
|
}
|
|
|
|
static int intlist__node_cmp(struct rb_node *rb_node, const void *entry)
|
|
{
|
|
int i = (int)((long)entry);
|
|
struct int_node *node = container_of(rb_node, struct int_node, rb_node);
|
|
|
|
return node->i - i;
|
|
}
|
|
|
|
int intlist__add(struct intlist *ilist, int i)
|
|
{
|
|
return rblist__add_node(&ilist->rblist, (void *)((long)i));
|
|
}
|
|
|
|
void intlist__remove(struct intlist *ilist, struct int_node *node)
|
|
{
|
|
rblist__remove_node(&ilist->rblist, &node->rb_node);
|
|
}
|
|
|
|
struct int_node *intlist__find(struct intlist *ilist, int i)
|
|
{
|
|
struct int_node *node = NULL;
|
|
struct rb_node *rb_node = rblist__find(&ilist->rblist, (void *)((long)i));
|
|
|
|
if (rb_node)
|
|
node = container_of(rb_node, struct int_node, rb_node);
|
|
|
|
return node;
|
|
}
|
|
|
|
struct intlist *intlist__new(void)
|
|
{
|
|
struct intlist *ilist = malloc(sizeof(*ilist));
|
|
|
|
if (ilist != NULL) {
|
|
rblist__init(&ilist->rblist);
|
|
ilist->rblist.node_cmp = intlist__node_cmp;
|
|
ilist->rblist.node_new = intlist__node_new;
|
|
ilist->rblist.node_delete = intlist__node_delete;
|
|
}
|
|
|
|
return ilist;
|
|
}
|
|
|
|
void intlist__delete(struct intlist *ilist)
|
|
{
|
|
if (ilist != NULL)
|
|
rblist__delete(&ilist->rblist);
|
|
}
|
|
|
|
struct int_node *intlist__entry(const struct intlist *ilist, unsigned int idx)
|
|
{
|
|
struct int_node *node = NULL;
|
|
struct rb_node *rb_node;
|
|
|
|
rb_node = rblist__entry(&ilist->rblist, idx);
|
|
if (rb_node)
|
|
node = container_of(rb_node, struct int_node, rb_node);
|
|
|
|
return node;
|
|
}
|