GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-07-07 06:52:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

perf annotate: Introduce ->free() method in ins_ops

Browse source 
So that we don't special case disasm_line__free, allowing each
instruction class to provide an specialized destructor, like is needed
for 'lock'.

Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Namhyung Kim <namhyung@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Link: http://lkml.kernel.org/n/tip-xxw4vs5n077tf35jsvjzylhb@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Arnaldo Carvalho de Melo 2012-05-12 13:26:20 -03:00
parent 7a997fe401
commit c46219ac34
2 changed files with 21 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

28
tools/perf/util/annotate.c
View file

@ -21,6 +21,14 @@ const char *disassembler_style;
static struct ins *ins__find(const char *name); static struct ins *ins__find(const char *name);
static int disasm_line__parse(char *line, char **namep, char **rawp); static int disasm_line__parse(char *line, char **namep, char **rawp);
static void ins__delete(struct ins_operands *ops)
{
free(ops->source.raw);
free(ops->source.name);
free(ops->target.raw);
free(ops->target.name);
}
static int ins__raw_scnprintf(struct ins *ins, char *bf, size_t size, static int ins__raw_scnprintf(struct ins *ins, char *bf, size_t size,
struct ins_operands *ops) struct ins_operands *ops)
{ {
@ -192,7 +200,15 @@ static int lock__scnprintf(struct ins *ins, char *bf, size_t size,
size - printed, ops->locked.ops); size - printed, ops->locked.ops);
} }
static void lock__delete(struct ins_operands *ops)
{
free(ops->locked.ops);
free(ops->target.raw);
free(ops->target.name);
}
static struct ins_ops lock_ops = { static struct ins_ops lock_ops = {
.free = lock__delete,
.parse = lock__parse, .parse = lock__parse,
.scnprintf = lock__scnprintf, .scnprintf = lock__scnprintf,
}; };
@ -542,14 +558,10 @@ void disasm_line__free(struct disasm_line *dl)
{ {
free(dl->line); free(dl->line);
free(dl->name); free(dl->name);
if (dl->ins && dl->ins->ops == &lock_ops) { if (dl->ins && dl->ins->ops->free)
free(dl->ops.locked.ops); dl->ins->ops->free(&dl->ops);
} else { else
free(dl->ops.source.raw); ins__delete(&dl->ops);
free(dl->ops.source.name);
}
free(dl->ops.target.raw);
free(dl->ops.target.name);
free(dl); free(dl);
} }

1
tools/perf/util/annotate.h
View file

@ -32,6 +32,7 @@ struct ins_operands {
}; };
struct ins_ops { struct ins_ops {
void (*free)(struct ins_operands *ops);
int (*parse)(struct ins_operands *ops); int (*parse)(struct ins_operands *ops);
int (*scnprintf)(struct ins *ins, char *bf, size_t size, int (*scnprintf)(struct ins *ins, char *bf, size_t size,
struct ins_operands *ops); struct ins_operands *ops);