Skip to content

Stop trying to parse GNU Hurd kernel version as a Linux kernel version. #2031

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
petterreinholdtsen wants to merge 1 commit into
base: master
Choose a base branch
from
+5 −2
Open

Stop trying to parse GNU Hurd kernel version as a Linux kernel version. #2031

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions test/common/memory_usage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,8 @@ namespace utils {
peakUsage
};

#if __unix__
#if __unix__ && ! defined(__gnu_hurd__)

inline unsigned LinuxKernelVersion()
{
unsigned digit1, digit2, digit3;
Expand Down Expand Up @@ -125,9 +126,11 @@ namespace utils {
break;
}
}
// VmPeak is available in kernels staring 2.6.15
#if !defined(__gnu_hurd__)
// VmPeak is available in Linux kernels staring 2.6.15
if (stat != peakUsage || LinuxKernelVersion() >= 2006015)
Copy link
Copy Markdown
Contributor

@Alexandr-Konovalov Alexandr-Konovalov Apr 7, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Logic in the legacy is "size must be non-zero, except for VmPeak and really old Linux". And what is your assumption? Why you think is it reasonable to drop this check in every case?

ASSERT(size, "Invalid /proc/self/status format, pattern not found.");
#endif
fclose(fst);
return size * 1024;
#elif __APPLE__ && !__ARM_ARCH
Expand Down
Loading