stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8338236: Compile error in cgroup code on Linux when using clang

Browse Source 
Reviewed-by: mdoerr, sgehwolf
This commit is contained in:
Matthias Baesken 2024-08-14 09:52:23 +00:00
parent 9fe1777faf
commit 38bd8a3670
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/hotspot/os/linux/cgroupV1Subsystem_linux.hpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2019, 2023, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2019, 2024, 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
@ -62,7 +62,7 @@ class CgroupV1Controller: public CgroupController {
void set_subsystem_path(char *cgroup_path);
char *subsystem_path() override { return _path; }
bool is_read_only() { return _read_only; }
bool is_read_only() override { return _read_only; }
};
class CgroupV1MemoryController final : public CgroupMemoryController {

6
src/hotspot/os/linux/cgroupV2Subsystem_linux.hpp
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2020, 2022, Red Hat Inc.
* Copyright (c) 2020, 2024, Red Hat Inc.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -128,8 +128,8 @@ class CgroupV2Subsystem: public CgroupSubsystem {
const char * container_type() override {
return "cgroupv2";
}
CachingCgroupController<CgroupMemoryController>* memory_controller() { return _memory; }
CachingCgroupController<CgroupCpuController>* cpu_controller() { return _cpu; }
CachingCgroupController<CgroupMemoryController>* memory_controller() override { return _memory; }
CachingCgroupController<CgroupCpuController>* cpu_controller() override { return _cpu; }
};
#endif // CGROUP_V2_SUBSYSTEM_LINUX_HPP