From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752827AbaAPCb3 (ORCPT ); Wed, 15 Jan 2014 21:31:29 -0500 Received: from lgeamrelo02.lge.com ([156.147.1.126]:46634 "EHLO LGEAMRELO02.lge.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752640AbaAPCbW (ORCPT ); Wed, 15 Jan 2014 21:31:22 -0500 X-AuditID: 9c93017e-b7b63ae000000e6a-cd-52d74477078c From: Namhyung Kim To: Steven Rostedt , Arnaldo Carvalho de Melo Cc: Frederic Weisbecker , Peter Zijlstra , Ingo Molnar , Namhyung Kim , LKML , Jiri Olsa Subject: [PATCH 04/12] tools lib traceevent: Unregister handler when hrtimer plugin unloaded Date: Thu, 16 Jan 2014 11:31:10 +0900 Message-Id: <1389839478-5887-5-git-send-email-namhyung@kernel.org> X-Mailer: git-send-email 1.7.11.7 In-Reply-To: <1389839478-5887-1-git-send-email-namhyung@kernel.org> References: <1389839478-5887-1-git-send-email-namhyung@kernel.org> X-Brightmail-Tracker: AAAAAA== Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The timer handlers should be unregistered when the plugin unloaded otherwise they'll try to access invalid memory. Acked-by: Steven Rostedt Reviewed-by: Jiri Olsa Signed-off-by: Namhyung Kim --- tools/lib/traceevent/plugin_hrtimer.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/tools/lib/traceevent/plugin_hrtimer.c b/tools/lib/traceevent/plugin_hrtimer.c index 0b0ebf30aa44..12bf14cc1152 100644 --- a/tools/lib/traceevent/plugin_hrtimer.c +++ b/tools/lib/traceevent/plugin_hrtimer.c @@ -76,3 +76,13 @@ int PEVENT_PLUGIN_LOADER(struct pevent *pevent) timer_start_handler, NULL); return 0; } + +void PEVENT_PLUGIN_UNLOADER(struct pevent *pevent) +{ + pevent_unregister_event_handler(pevent, -1, + "timer", "hrtimer_expire_entry", + timer_expire_handler, NULL); + + pevent_unregister_event_handler(pevent, -1, "timer", "hrtimer_start", + timer_start_handler, NULL); +} -- 1.7.11.7