Skip to contentSkip to conversation

perf machine: Do not call map_groups__delete(), drop refcnt instead

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message May 27, 2015 perf events

lore
Share & tools
lore

tip-bot for Arnaldo Carvalho de Melo

author merge bot
#0 lore raw
Commit-ID:  8e160b2e1e3efdd84ddef726f9b5136dd192a682
Gitweb:     http://git.kernel.org/tip/8e160b2e1e3efdd84ddef726f9b5136dd192a682
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Tue, 19 May 2015 20:07:14 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Wed, 27 May 2015 12:21:44 -0300

perf machine: Do not call map_groups__delete(), drop refcnt instead

It could be used somewhere, so just call map__groups_put() to make sure we don't delete it prematurely

Cc Adrian Hunter <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc David Ahern <[email protected]>
Cc Don Zickus <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Jiri Olsa <[email protected]>
Cc Namhyung Kim <[email protected]>
Cc Stephane Eranian <[email protected]>
Link http://lkml.kernel.org/n/[email protected] open here
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
---
 tools/perf/util/machine.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/perf/util/machine.c +1 -1
index daa5591..7ec3188 100644
@@ -333,7 +333,7 @@ static void machine__update_thread_pid(struct machine *machine,
 		if (!map_groups__empty(th->mg))
 			pr_err("Discarding thread maps for %d:%d\n",
 			       th->pid_, th->tid);
-		map_groups__delete(th->mg);
+		map_groups__put(th->mg);
 	}
 
 	th->mg = map_groups__get(leader->mg);