--- old/src/hotspot/os/linux/gc/z/zBackingPath_linux.hpp 2020-01-15 13:48:05.011005663 +0100 +++ /dev/null 2020-01-07 09:26:22.747784373 +0100 @@ -1,52 +0,0 @@ -/* - * Copyright (c) 2016, 2019, 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. - */ - -#ifndef OS_LINUX_GC_Z_ZBACKINGPATH_LINUX_HPP -#define OS_LINUX_GC_Z_ZBACKINGPATH_LINUX_HPP - -#include "gc/z/zArray.hpp" -#include "memory/allocation.hpp" - -class ZBackingPath : public StackObj { -private: - char* _path; - - char* get_mountpoint(const char* line, - const char* filesystem) const; - void get_mountpoints(const char* filesystem, - ZArray* mountpoints) const; - void free_mountpoints(ZArray* mountpoints) const; - char* find_preferred_mountpoint(const char* filesystem, - ZArray* mountpoints, - const char** preferred_mountpoints) const; - char* find_mountpoint(const char* filesystem, - const char** preferred_mountpoints) const; - -public: - ZBackingPath(const char* filesystem, const char** preferred_mountpoints); - ~ZBackingPath(); - - const char* get() const; -}; - -#endif // OS_LINUX_GC_Z_ZBACKINGPATH_LINUX_HPP --- /dev/null 2020-01-07 09:26:22.747784373 +0100 +++ new/src/hotspot/os/linux/gc/z/zMountPoint_linux.hpp 2020-01-15 13:48:04.648998296 +0100 @@ -0,0 +1,52 @@ +/* + * Copyright (c) 2016, 2019, 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. + */ + +#ifndef OS_LINUX_GC_Z_ZMOUNTPOINT_LINUX_HPP +#define OS_LINUX_GC_Z_ZMOUNTPOINT_LINUX_HPP + +#include "gc/z/zArray.hpp" +#include "memory/allocation.hpp" + +class ZMountPoint : public StackObj { +private: + char* _path; + + char* get_mountpoint(const char* line, + const char* filesystem) const; + void get_mountpoints(const char* filesystem, + ZArray* mountpoints) const; + void free_mountpoints(ZArray* mountpoints) const; + char* find_preferred_mountpoint(const char* filesystem, + ZArray* mountpoints, + const char** preferred_mountpoints) const; + char* find_mountpoint(const char* filesystem, + const char** preferred_mountpoints) const; + +public: + ZMountPoint(const char* filesystem, const char** preferred_mountpoints); + ~ZMountPoint(); + + const char* get() const; +}; + +#endif // OS_LINUX_GC_Z_ZMOUNTPOINT_LINUX_HPP