infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-01-28 12:09:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

8371587: Final mapping lost in ProcSmapsParser::parse_next

Browse Source 
Reviewed-by: jsjolen, fandreuzzi
This commit is contained in:
Albert Mingkun Yang 2025-12-02 13:05:46 +00:00
parent 6abf7b6f22
commit eecba58c68
3 changed files with 125 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/hotspot/os/linux/procMapsParser.cpp
View File

@ -50,7 +50,14 @@ ProcSmapsParser::~ProcSmapsParser() {
bool ProcSmapsParser::read_line() {
_line[0] = '\0';
return ::fgets(_line, _linelen, _f) != nullptr;
if (::fgets(_line, _linelen, _f) == nullptr) {
// On error or EOF, ensure deterministic empty buffer
_line[0] = '\0';
return false;
} else {
return true;
}
}
bool ProcSmapsParser::is_header_line() {
@ -101,8 +108,6 @@ void ProcSmapsParser::scan_additional_line(ProcSmapsInfo& out) {
}
}
// Starts or continues parsing. Returns true on success,
// false on EOF or on error.
bool ProcSmapsParser::parse_next(ProcSmapsInfo& out) {
// Information about a single mapping reaches across several lines.
@ -117,15 +122,13 @@ bool ProcSmapsParser::parse_next(ProcSmapsInfo& out) {
assert(is_header_line(), "Not a header line: \"%s\".", _line);
scan_header_line(out);
// Now read until we encounter the next header line or EOF or an error.
bool ok = false, stop = false;
do {
ok = read_line();
stop = !ok || is_header_line();
if (!stop) {
scan_additional_line(out);
while (true) {
bool ok = read_line();
if (!ok || is_header_line()) {
break; // EOF or next header
}
} while (!stop);
scan_additional_line(out);
}
return ok;
return true; // always return true if a mapping was parsed
}

3
src/hotspot/os/linux/procMapsParser.hpp
View File

@ -84,8 +84,7 @@ public:
ProcSmapsParser(FILE* f);
~ProcSmapsParser();
// Starts or continues parsing. Returns true on success,
// false on EOF or on error.
// Starts or continues parsing. Returns true iff a mapping was parsed.
bool parse_next(ProcSmapsInfo& out);
};

109
test/hotspot/gtest/runtime/test_procMapsParser_linux.cpp Normal file
View File

@ -0,0 +1,109 @@
/*
* Copyright (c) 2025, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 only, as
* published by the Free Software Foundation.
*
* This code is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* version 2 for more details (a copy is included in the LICENSE file that
* accompanied this code).
*
* You should have received a copy of the GNU General Public License version
* 2 along with this work; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
*
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
* or visit www.oracle.com if you need additional information or have any
* questions.
*
*/
#ifdef LINUX
#include "procMapsParser.hpp"
#include "unittest.hpp"
#include <stdio.h>
TEST(ProcSmapsParserTest, ParseMappings) {
const char* smaps_content =
"7f5a00000000-7f5a00001000 r--p 00000000 00:00 0 [anon]\n"
"Size: 4 kB\n"
"KernelPageSize: 4 kB\n"
"MMUPageSize: 4 kB\n"
"Rss: 0 kB\n"
"Pss: 0 kB\n"
"Shared_Clean: 0 kB\n"
"Shared_Dirty: 0 kB\n"
"Private_Clean: 0 kB\n"
"Private_Dirty: 0 kB\n"
"Referenced: 0 kB\n"
"Anonymous: 0 kB\n"
"LazyFree: 0 kB\n"
"AnonHugePages: 0 kB\n"
"ShmemPmdMapped: 0 kB\n"
"FilePmdMapped: 0 kB\n"
"Shared_Hugetlb: 0 kB\n"
"Private_Hugetlb: 0 kB\n"
"Swap: 0 kB\n"
"SwapPss: 0 kB\n"
"Locked: 0 kB\n"
"THPeligible: 0\n"
"VmFlags: rd mr mw me ac \n"
"7f5a00001000-7f5a00002000 rw-p 00000000 00:00 0 [anon]\n"
"Size: 4 kB\n"
"KernelPageSize: 4 kB\n"
"MMUPageSize: 4 kB\n"
"Rss: 4 kB\n"
"Pss: 4 kB\n"
"Shared_Clean: 0 kB\n"
"Shared_Dirty: 0 kB\n"
"Private_Clean: 0 kB\n"
"Private_Dirty: 4 kB\n"
"Referenced: 4 kB\n"
"Anonymous: 4 kB\n"
"LazyFree: 0 kB\n"
"AnonHugePages: 0 kB\n"
"ShmemPmdMapped: 0 kB\n"
"FilePmdMapped: 0 kB\n"
"Shared_Hugetlb: 0 kB\n"
"Private_Hugetlb: 0 kB\n"
"Swap: 0 kB\n"
"SwapPss: 0 kB\n"
"Locked: 0 kB\n"
"THPeligible: 0\n"
"VmFlags: rd wr mr mw me ac \n";
FILE* f = fmemopen((void*)smaps_content, strlen(smaps_content), "r");
ASSERT_TRUE(f != nullptr);
ProcSmapsParser parser(f);
ProcSmapsInfo info;
// First mapping
ASSERT_TRUE(parser.parse_next(info));
EXPECT_EQ((uintptr_t)info.from, 0x7f5a00000000ULL);
EXPECT_EQ((uintptr_t)info.to, 0x7f5a00001000ULL);
EXPECT_STREQ(info.prot, "r--p");
EXPECT_TRUE(info.rd);
EXPECT_FALSE(info.wr);
// Second mapping
ASSERT_TRUE(parser.parse_next(info));
EXPECT_EQ((uintptr_t)info.from, 0x7f5a00001000ULL);
EXPECT_EQ((uintptr_t)info.to, 0x7f5a00002000ULL);
EXPECT_STREQ(info.prot, "rw-p");
EXPECT_TRUE(info.rd);
EXPECT_TRUE(info.wr);
// End of file
ASSERT_FALSE(parser.parse_next(info));
fclose(f);
}
#endif // LINUX