0f40a05309
Recently, the maps for an elf in memory might show up looking like: f0000-f1000 0 r-- /system/lib/libc.so f1000-f2000 0 --- f2000-f3000 1000 r-x /system/lib/libc.so f3000-f4000 2000 rw- /system/lib/libc.so The problem is that there is logic in the code that assumed that the map before the execute map must be the read-only map. In the case above, this is not true. Add a new prev_real_map that will point to the previous map that is not one of these empty maps. This will fix the backtraces that look like this: #00 pc 0000000000050d58 /apex/com.android.runtime/lib64/bionic/libc.so!libc.so (offset 0x50000) (syscall+24) (BuildId: 5252408bf30e395d49ee270b54c77ca4) To get rid of the !libc.so and the offset value, which is not correct. Added new unit tests to verify this. Added new offline test which an empty map between read-only and execute map. Before this change, the backtraces had lines like libc.so!libc.so (offset XXX) would be present. Bug: 148075852 Test: Ran unit tests. Change-Id: Ie04bfc96b8f91ed885cb1e655cf1e346efe48a45
75 lines
2.3 KiB
C++
75 lines
2.3 KiB
C++
/*
|
|
* Copyright (C) 2018 The Android Open Source Project
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
#include <stdint.h>
|
|
|
|
#include <gtest/gtest.h>
|
|
|
|
#include <unwindstack/MapInfo.h>
|
|
#include <unwindstack/Maps.h>
|
|
|
|
#include "ElfFake.h"
|
|
|
|
namespace unwindstack {
|
|
|
|
TEST(MapInfoTest, maps_constructor_const_char) {
|
|
MapInfo prev_map(nullptr, nullptr, 0, 0, 0, 0, "");
|
|
MapInfo map_info(&prev_map, &prev_map, 1, 2, 3, 4, "map");
|
|
|
|
EXPECT_EQ(&prev_map, map_info.prev_map);
|
|
EXPECT_EQ(1UL, map_info.start);
|
|
EXPECT_EQ(2UL, map_info.end);
|
|
EXPECT_EQ(3UL, map_info.offset);
|
|
EXPECT_EQ(4UL, map_info.flags);
|
|
EXPECT_EQ("map", map_info.name);
|
|
EXPECT_EQ(INT64_MAX, map_info.load_bias);
|
|
EXPECT_EQ(0UL, map_info.elf_offset);
|
|
EXPECT_TRUE(map_info.elf.get() == nullptr);
|
|
}
|
|
|
|
TEST(MapInfoTest, maps_constructor_string) {
|
|
std::string name("string_map");
|
|
MapInfo prev_map(nullptr, nullptr, 0, 0, 0, 0, "");
|
|
MapInfo map_info(&prev_map, &prev_map, 1, 2, 3, 4, name);
|
|
|
|
EXPECT_EQ(&prev_map, map_info.prev_map);
|
|
EXPECT_EQ(1UL, map_info.start);
|
|
EXPECT_EQ(2UL, map_info.end);
|
|
EXPECT_EQ(3UL, map_info.offset);
|
|
EXPECT_EQ(4UL, map_info.flags);
|
|
EXPECT_EQ("string_map", map_info.name);
|
|
EXPECT_EQ(INT64_MAX, map_info.load_bias);
|
|
EXPECT_EQ(0UL, map_info.elf_offset);
|
|
EXPECT_TRUE(map_info.elf.get() == nullptr);
|
|
}
|
|
|
|
TEST(MapInfoTest, get_function_name) {
|
|
ElfFake* elf = new ElfFake(nullptr);
|
|
ElfInterfaceFake* interface = new ElfInterfaceFake(nullptr);
|
|
elf->FakeSetInterface(interface);
|
|
interface->FakePushFunctionData(FunctionData("function", 1000));
|
|
|
|
MapInfo map_info(nullptr, nullptr, 1, 2, 3, 4, "");
|
|
map_info.elf.reset(elf);
|
|
|
|
std::string name;
|
|
uint64_t offset;
|
|
ASSERT_TRUE(map_info.GetFunctionName(1000, &name, &offset));
|
|
EXPECT_EQ("function", name);
|
|
EXPECT_EQ(1000UL, offset);
|
|
}
|
|
|
|
} // namespace unwindstack
|