From 0879c6be710b2f5f2f21f7229e54f4377bdaac8d Mon Sep 17 00:00:00 2001 From: Vitaliy Cherepanov Date: Mon, 4 Aug 2014 13:13:41 +0400 Subject: [PATCH] [FIX] internal external call Change-Id: Ic6107b8e48d4c8abe2f8c4d907caadc7af7e31b2 Signed-off-by: Vitaliy Cherepanov --- helper/damaps.c | 6 ++++-- helper/libdaprobe.c | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/helper/damaps.c b/helper/damaps.c index 5dad110..13f6d28 100755 --- a/helper/damaps.c +++ b/helper/damaps.c @@ -381,7 +381,8 @@ static int update_is_instrument_lib_attr_nolock() for (i = 0; i < map_inst_count; i++) { map = get_map_by_filename(map_inst_list[i]); if (map) { - PRINTMSG("set 1!!! = %s", map->filename); + PRINTMSG("set 1!!! = %s [%p:%p]", map->filename, + map->addr, map->endaddr); map->is_instrument = 1; } } @@ -596,7 +597,8 @@ int maps_is_instrument_section_by_addr(const void *addr) if (ret == -1) { PRINTMSG("========> hz addr %p. remap", addr); maps_make(); - if (maps_is_instrument_section_by_addr_no_remap(addr) == -1) { + ret = maps_is_instrument_section_by_addr_no_remap(addr); + if (ret == -1) { print_list(); PRINTERR("!!!!unknown addr %p", addr); get_map_by_addr((void *)addr); diff --git a/helper/libdaprobe.c b/helper/libdaprobe.c index ed7c422..014a0c8 100755 --- a/helper/libdaprobe.c +++ b/helper/libdaprobe.c @@ -773,7 +773,7 @@ int preBlockBegin(const void *caller, bool bFiltering, enum DaOptions option) probeBlockStart(); - if (maps_is_instrument_section_by_addr(caller)) { + if (maps_is_instrument_section_by_addr(caller) == 1) { probingStart(); return 2; /* user call */ } else { -- 2.7.4