Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c46219ac authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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

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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 7a997fe4

tools/perf/util/annotate.c

+20 −8
Original line number Diff line number Diff line
@@ -21,6 +21,14 @@ const char *disassembler_style; 
static struct ins *ins__find(const char *name);

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,

			      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);

}



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 = {

	.free	   = lock__delete,

	.parse	   = lock__parse,

	.scnprintf = lock__scnprintf,

};
@@ -542,14 +558,10 @@ void disasm_line__free(struct disasm_line *dl) 
{

	free(dl->line);

	free(dl->name);

	if (dl->ins && dl->ins->ops == &lock_ops) {

		free(dl->ops.locked.ops);

	} else {

		free(dl->ops.source.raw);

		free(dl->ops.source.name);

	}

	free(dl->ops.target.raw);

	free(dl->ops.target.name);

	if (dl->ins && dl->ins->ops->free)

		dl->ins->ops->free(&dl->ops);

	else

		ins__delete(&dl->ops);

	free(dl);

}

tools/perf/util/annotate.h

+1 −0
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ struct ins_operands { 
};



struct ins_ops {

	void (*free)(struct ins_operands *ops);

	int (*parse)(struct ins_operands *ops);

	int (*scnprintf)(struct ins *ins, char *bf, size_t size,

			 struct ins_operands *ops);