Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.
/ jdk23u Public archive

Commit daa67f4

Browse files
SendaoYanPaul Hohensee
SendaoYan
authored and
Paul Hohensee
committedOct 17, 2024
8341881: [REDO] java/nio/file/attribute/BasicFileAttributeView/CreationTime.java#tmp fails on alinux3
Backport-of: f56a154
·
jdk-23.0.2+7jdk-23.0.2-ga
1 parent 16f279c commit daa67f4

File tree

4 files changed

+205
-18
lines changed

4 files changed

+205
-18
lines changed
 

‎make/test/JtregNativeJdk.gmk

+2
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ ifeq ($(call isTargetOs, linux), true)
114114
# stripping during the test libraries' build.
115115
BUILD_JDK_JTREG_LIBRARIES_CFLAGS_libFib := -g
116116
BUILD_JDK_JTREG_LIBRARIES_STRIP_SYMBOLS_libFib := false
117+
# nio tests' libCreationTimeHelper native needs -ldl linker flag
118+
BUILD_JDK_JTREG_LIBRARIES_LDFLAGS_libCreationTimeHelper := -ldl
117119
endif
118120

119121
ifeq ($(ASAN_ENABLED), true)

‎test/jdk/java/nio/file/attribute/BasicFileAttributeView/CreationTime.java

+20-18
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/*
22
* Copyright (c) 2013, 2024, Oracle and/or its affiliates. All rights reserved.
3+
* Copyright (c) 2024 Alibaba Group Holding Limited. All Rights Reserved.
34
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
45
*
56
* This code is free software; you can redistribute it and/or modify it
@@ -25,18 +26,18 @@
2526
* @bug 8011536 8151430 8316304 8334339
2627
* @summary Basic test for creationTime attribute on platforms/file systems
2728
* that support it, tests using /tmp directory.
28-
* @library ../.. /test/lib
29-
* @build jdk.test.lib.Platform
30-
* @run main CreationTime
29+
* @library ../.. /test/lib /java/foreign
30+
* @build jdk.test.lib.Platform NativeTestHelper
31+
* @run main/othervm/native --enable-native-access=ALL-UNNAMED CreationTime
3132
*/
3233

3334
/* @test id=cwd
3435
* @summary Basic test for creationTime attribute on platforms/file systems
3536
* that support it, tests using the test scratch directory, the test
3637
* scratch directory maybe at diff disk partition to /tmp on linux.
37-
* @library ../.. /test/lib
38-
* @build jdk.test.lib.Platform
39-
* @run main CreationTime .
38+
* @library ../.. /test/lib /java/foreign
39+
* @build jdk.test.lib.Platform NativeTestHelper
40+
* @run main/othervm/native --enable-native-access=ALL-UNNAMED CreationTime .
4041
*/
4142

4243
import java.lang.foreign.Linker;
@@ -51,8 +52,6 @@
5152

5253
public class CreationTime {
5354

54-
private static final java.io.PrintStream err = System.err;
55-
5655
/**
5756
* Reads the creationTime attribute
5857
*/
@@ -78,14 +77,9 @@ static void test(Path top) throws IOException {
7877
FileTime creationTime = creationTime(file);
7978
Instant now = Instant.now();
8079
if (Math.abs(creationTime.toMillis()-now.toEpochMilli()) > 10000L) {
81-
System.out.println("creationTime.toMillis() == " + creationTime.toMillis());
82-
// If the file system doesn't support birth time, then skip this test
83-
if (creationTime.toMillis() == 0) {
84-
throw new SkippedException("birth time not support for: " + file);
85-
} else {
86-
err.println("File creation time reported as: " + creationTime);
87-
throw new RuntimeException("Expected to be close to: " + now);
88-
}
80+
System.err.println("creationTime.toMillis() == " + creationTime.toMillis());
81+
System.err.println("File creation time reported as: " + creationTime);
82+
throw new RuntimeException("Expected to be close to: " + now);
8983
}
9084

9185
/**
@@ -107,7 +101,12 @@ static void test(Path top) throws IOException {
107101
}
108102
} else if (Platform.isLinux()) {
109103
// Creation time read depends on statx system call support
110-
supportsCreationTimeRead = Linker.nativeLinker().defaultLookup().find("statx").isPresent();
104+
try {
105+
supportsCreationTimeRead = CreationTimeHelper.
106+
linuxIsCreationTimeSupported(file.toAbsolutePath().toString());
107+
} catch (Throwable e) {
108+
supportsCreationTimeRead = false;
109+
}
111110
// Creation time updates are not supported on Linux
112111
supportsCreationTimeWrite = false;
113112
}
@@ -122,8 +121,11 @@ static void test(Path top) throws IOException {
122121
Instant plusHour = Instant.now().plusSeconds(60L * 60L);
123122
Files.setLastModifiedTime(file, FileTime.from(plusHour));
124123
FileTime current = creationTime(file);
125-
if (!current.equals(creationTime))
124+
if (!current.equals(creationTime)) {
125+
System.err.println("current = " + current);
126+
System.err.println("creationTime = " + creationTime);
126127
throw new RuntimeException("Creation time should not have changed");
128+
}
127129
}
128130

129131
/**

‎test/jdk/java/nio/file/attribute/BasicFileAttributeView/CreationTimeHelper.java

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
/*
2+
* Copyright (c) 2024 Alibaba Group Holding Limited. All Rights Reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
24+
import java.lang.foreign.Arena;
25+
import java.lang.foreign.FunctionDescriptor;
26+
import java.lang.foreign.Linker;
27+
import java.lang.foreign.MemorySegment;
28+
import java.lang.foreign.SymbolLookup;
29+
import java.lang.foreign.ValueLayout;
30+
import java.lang.invoke.MethodHandle;
31+
32+
public class CreationTimeHelper extends NativeTestHelper {
33+
34+
static {
35+
System.loadLibrary("CreationTimeHelper");
36+
}
37+
38+
final static Linker abi = Linker.nativeLinker();
39+
static final SymbolLookup lookup = SymbolLookup.loaderLookup();
40+
final static MethodHandle methodHandle = abi.
41+
downcallHandle(lookup.findOrThrow("linuxIsCreationTimeSupported"),
42+
FunctionDescriptor.of(C_BOOL, C_POINTER));
43+
44+
// Helper so as to determine birth time support or not on Linux.
45+
// Support is determined in a two-step process:
46+
// 1. Determine if `statx` system call is available. If available proceed,
47+
// otherwise return false.
48+
// 2. Perform an actual `statx` call on the given file and check for birth
49+
// time support in the mask returned from the call. This is needed,
50+
// since some file systems, like nfs/tmpfs etc., don't support birth
51+
// time even though the `statx` system call is available.
52+
static boolean linuxIsCreationTimeSupported(String file) throws Throwable {
53+
if (!abi.defaultLookup().find("statx").isPresent()) {
54+
return false;
55+
}
56+
try (var arena = Arena.ofConfined()) {
57+
MemorySegment s = arena.allocateFrom(file);
58+
return (boolean)methodHandle.invokeExact(s);
59+
}
60+
}
61+
}

‎test/jdk/java/nio/file/attribute/BasicFileAttributeView/libCreationTimeHelper.c

+122
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
/*
2+
* Copyright (c) 2024 Alibaba Group Holding Limited. All Rights Reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* This code is free software; you can redistribute it and/or modify it
6+
* under the terms of the GNU General Public License version 2 only, as
7+
* published by the Free Software Foundation.
8+
*
9+
* This code is distributed in the hope that it will be useful, but WITHOUT
10+
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
11+
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
12+
* version 2 for more details (a copy is included in the LICENSE file that
13+
* accompanied this code).
14+
*
15+
* You should have received a copy of the GNU General Public License version
16+
* 2 along with this work; if not, write to the Free Software Foundation,
17+
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
18+
*
19+
* Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
20+
* or visit www.oracle.com if you need additional information or have any
21+
* questions.
22+
*/
23+
#include "export.h"
24+
#include <stdbool.h>
25+
#if defined(__linux__)
26+
#include <stdio.h>
27+
#include <string.h>
28+
#include <sys/stat.h>
29+
#include <bits/types.h>
30+
#include <dlfcn.h>
31+
#ifndef STATX_BASIC_STATS
32+
#define STATX_BASIC_STATS 0x000007ffU
33+
#endif
34+
#ifndef STATX_BTIME
35+
#define STATX_BTIME 0x00000800U
36+
#endif
37+
#ifndef RTLD_DEFAULT
38+
#define RTLD_DEFAULT RTLD_LOCAL
39+
#endif
40+
#ifndef AT_SYMLINK_NOFOLLOW
41+
#define AT_SYMLINK_NOFOLLOW 0x100
42+
#endif
43+
#ifndef AT_FDCWD
44+
#define AT_FDCWD -100
45+
#endif
46+
47+
/*
48+
* Timestamp structure for the timestamps in struct statx.
49+
*/
50+
struct my_statx_timestamp {
51+
__int64_t tv_sec;
52+
__uint32_t tv_nsec;
53+
__int32_t __reserved;
54+
};
55+
56+
/*
57+
* struct statx used by statx system call on >= glibc 2.28
58+
* systems
59+
*/
60+
struct my_statx
61+
{
62+
__uint32_t stx_mask;
63+
__uint32_t stx_blksize;
64+
__uint64_t stx_attributes;
65+
__uint32_t stx_nlink;
66+
__uint32_t stx_uid;
67+
__uint32_t stx_gid;
68+
__uint16_t stx_mode;
69+
__uint16_t __statx_pad1[1];
70+
__uint64_t stx_ino;
71+
__uint64_t stx_size;
72+
__uint64_t stx_blocks;
73+
__uint64_t stx_attributes_mask;
74+
struct my_statx_timestamp stx_atime;
75+
struct my_statx_timestamp stx_btime;
76+
struct my_statx_timestamp stx_ctime;
77+
struct my_statx_timestamp stx_mtime;
78+
__uint32_t stx_rdev_major;
79+
__uint32_t stx_rdev_minor;
80+
__uint32_t stx_dev_major;
81+
__uint32_t stx_dev_minor;
82+
__uint64_t __statx_pad2[14];
83+
};
84+
85+
typedef int statx_func(int dirfd, const char *restrict pathname, int flags,
86+
unsigned int mask, struct my_statx *restrict statxbuf);
87+
88+
static statx_func* my_statx_func = NULL;
89+
#endif //#defined(__linux__)
90+
91+
// static boolean linuxIsCreationTimeSupported(char* file)
92+
EXPORT bool linuxIsCreationTimeSupported(char* file) {
93+
#if defined(__linux__)
94+
struct my_statx stx = {0};
95+
int ret, atflag = AT_SYMLINK_NOFOLLOW;
96+
unsigned int mask = STATX_BASIC_STATS | STATX_BTIME;
97+
98+
my_statx_func = (statx_func*) dlsym(RTLD_DEFAULT, "statx");
99+
if (my_statx_func == NULL) {
100+
return false;
101+
}
102+
103+
if (file == NULL) {
104+
printf("input file error!\n");
105+
return false;
106+
}
107+
108+
ret = my_statx_func(AT_FDCWD, file, atflag, mask, &stx);
109+
if (ret != 0) {
110+
return false;
111+
}
112+
// On some systems where statx is available but birth time might still not
113+
// be supported as it's file system specific. The only reliable way to
114+
// check for supported or not is looking at the filled in STATX_BTIME bit
115+
// in the returned statx buffer mask.
116+
if ((stx.stx_mask & STATX_BTIME) != 0)
117+
return true;
118+
return false;
119+
#else
120+
return false;
121+
#endif
122+
}

3 commit comments

Comments
 (3)

openjdk-notifier[bot] commented on Oct 17, 2024

@openjdk-notifier[bot]
openjdk-notifier[bot]
on Oct 17, 2024

Review

Issues

sendaoYan commented on Oct 18, 2024

@sendaoYan
sendaoYan
on Oct 18, 2024
Member

/backport jdk21u-dev

openjdk[bot] commented on Oct 18, 2024

@openjdk[bot]
openjdk[bot]
on Oct 18, 2024

@sendaoYan Could not automatically backport daa67f45 to openjdk/jdk21u-dev due to conflicts in the following files:

  • make/test/JtregNativeJdk.gmk
  • test/jdk/java/nio/file/attribute/BasicFileAttributeView/CreationTime.java
  • test/jdk/java/nio/file/attribute/BasicFileAttributeView/CreationTimeHelper.java
  • test/jdk/java/nio/file/attribute/BasicFileAttributeView/libCreationTimeHelper.c

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk21u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk21u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-sendaoYan-daa67f45-master

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk23u.git daa67f45f0c17d4087eb51a708193d6db124b426

# Backport the commit
$ git cherry-pick --no-commit daa67f45f0c17d4087eb51a708193d6db124b426
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport daa67f45f0c17d4087eb51a708193d6db124b426'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk21u-dev with the title Backport daa67f45f0c17d4087eb51a708193d6db124b426.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit daa67f45 from the openjdk/jdk23u repository.

The commit being backported was authored by SendaoYan on 17 Oct 2024 and had no reviewers.

Thanks!

This repository has been archived.