foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-22 07:14:47 -05:00
Code Issues Packages 1 Wiki Activity

fix: use millisecond precision for Deno.futime and Deno.utime (#7299)

Browse source
This commit is contained in:
Casper Beyer 2020-09-01 22:03:07 +08:00 committed by GitHub
parent 644190eed8
commit 87e513ffc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 63 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
cli/ops/fs.rs
View file

@ -1683,8 +1683,8 @@ async fn op_make_temp_file_async(
#[serde(rename_all = "camelCase")]
struct FutimeArgs {
rid: i32,
atime: i64,
mtime: i64,
atime: (i64, u32),
mtime: (i64, u32),
}
fn op_futime_sync(
@ -1696,8 +1696,8 @@ fn op_futime_sync(
state.check_unstable("Deno.futimeSync");
let args: FutimeArgs = serde_json::from_value(args)?;
let rid = args.rid as u32;
let atime = filetime::FileTime::from_unix_time(args.atime, 0);
let mtime = filetime::FileTime::from_unix_time(args.mtime, 0);
let atime = filetime::FileTime::from_unix_time(args.atime.0, args.atime.1);
let mtime = filetime::FileTime::from_unix_time(args.mtime.0, args.mtime.1);
std_file_resource(resource_table, rid, |r| match r {
Ok(std_file) => {
@ -1721,8 +1721,8 @@ async fn op_futime_async(
state.check_unstable("Deno.futime");
let args: FutimeArgs = serde_json::from_value(args)?;
let rid = args.rid as u32;
let atime = filetime::FileTime::from_unix_time(args.atime, 0);
let mtime = filetime::FileTime::from_unix_time(args.mtime, 0);
let atime = filetime::FileTime::from_unix_time(args.atime.0, args.atime.1);
let mtime = filetime::FileTime::from_unix_time(args.mtime.0, args.mtime.1);
let mut resource_table = resource_table.borrow_mut();
std_file_resource(&mut resource_table, rid, |r| match r {
@ -1742,8 +1742,8 @@ async fn op_futime_async(
#[serde(rename_all = "camelCase")]
struct UtimeArgs {
path: String,
atime: i64,
mtime: i64,
atime: (i64, u32),
mtime: (i64, u32),
}
fn op_utime_sync(
@ -1756,11 +1756,10 @@ fn op_utime_sync(
let args: UtimeArgs = serde_json::from_value(args)?;
let path = PathBuf::from(&args.path);
let atime = filetime::FileTime::from_unix_time(args.atime, 0);
let mtime = filetime::FileTime::from_unix_time(args.mtime, 0);
let atime = filetime::FileTime::from_unix_time(args.atime.0, args.atime.1);
let mtime = filetime::FileTime::from_unix_time(args.mtime.0, args.mtime.1);
state.check_write(&path)?;
debug!("op_utime_sync {} {} {}", args.path, args.atime, args.mtime);
filetime::set_file_times(path, atime, mtime)?;
Ok(json!({}))
}
@ -1775,13 +1774,12 @@ async fn op_utime_async(
let args: UtimeArgs = serde_json::from_value(args)?;
let path = PathBuf::from(&args.path);
let atime = filetime::FileTime::from_unix_time(args.atime, 0);
let mtime = filetime::FileTime::from_unix_time(args.mtime, 0);
let atime = filetime::FileTime::from_unix_time(args.atime.0, args.atime.1);
let mtime = filetime::FileTime::from_unix_time(args.mtime.0, args.mtime.1);
state.check_write(&path)?;
tokio::task::spawn_blocking(move || {
debug!("op_utime_async {} {} {}", args.path, args.atime, args.mtime);
filetime::set_file_times(path, atime, mtime)?;
Ok(json!({}))
})

41
cli/rt/30_fs.js
View file

@ -264,8 +264,25 @@
await sendAsync("op_link_async", { oldpath, newpath });
}
function toSecondsFromEpoch(v) {
return v instanceof Date ? Math.trunc(v.valueOf() / 1000) : v;
function toUnixTimeFromEpoch(value) {
if (value instanceof Date) {
const time = value.valueOf();
const seconds = Math.trunc(time / 1e3);
const nanoseconds = Math.trunc(time - (seconds * 1e3)) * 1e6;
return [
seconds,
nanoseconds,
];
}
const seconds = value;
const nanoseconds = 0;
return [
seconds,
nanoseconds,
];
}
function futimeSync(
@ -275,9 +292,8 @@
) {
sendSync("op_futime_sync", {
rid,
// TODO(caspervonb) split atime, mtime into [seconds, nanoseconds] tuple
atime: toSecondsFromEpoch(atime),
mtime: toSecondsFromEpoch(mtime),
atime: toUnixTimeFromEpoch(atime),
mtime: toUnixTimeFromEpoch(mtime),
});
}
@ -288,9 +304,8 @@
) {
await sendAsync("op_futime_async", {
rid,
// TODO(caspervonb) split atime, mtime into [seconds, nanoseconds] tuple
atime: toSecondsFromEpoch(atime),
mtime: toSecondsFromEpoch(mtime),
atime: toUnixTimeFromEpoch(atime),
mtime: toUnixTimeFromEpoch(mtime),
});
}
@ -301,9 +316,8 @@
) {
sendSync("op_utime_sync", {
path,
// TODO(ry) split atime, mtime into [seconds, nanoseconds] tuple
atime: toSecondsFromEpoch(atime),
mtime: toSecondsFromEpoch(mtime),
atime: toUnixTimeFromEpoch(atime),
mtime: toUnixTimeFromEpoch(mtime),
});
}
@ -314,9 +328,8 @@
) {
await sendAsync("op_utime_async", {
path,
// TODO(ry) split atime, mtime into [seconds, nanoseconds] tuple
atime: toSecondsFromEpoch(atime),
mtime: toSecondsFromEpoch(mtime),
atime: toUnixTimeFromEpoch(atime),
mtime: toUnixTimeFromEpoch(mtime),
});
}

53
cli/tests/unit/utime_test.ts
View file

@ -1,18 +1,11 @@
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
import {
unitTest,
assert,
assertEquals,
assertThrows,
assertThrowsAsync,
} from "./test_util.ts";
// Allow 10 second difference.
// Note this might not be enough for FAT (but we are not testing on such fs).
function assertFuzzyTimestampEquals(t1: Date | null, t2: Date): void {
assert(t1 instanceof Date);
assert(Math.abs(t1.valueOf() - t2.valueOf()) < 10_000);
}
unitTest(
{ perms: { read: true, write: true } },
async function futimeSyncSuccess(): Promise<void> {
@ -29,8 +22,8 @@ unitTest(
await Deno.fdatasync(file.rid);
const fileInfo = Deno.statSync(filename);
assertFuzzyTimestampEquals(fileInfo.atime, new Date(atime * 1000));
assertFuzzyTimestampEquals(fileInfo.mtime, new Date(mtime * 1000));
assertEquals(fileInfo.atime, new Date(atime * 1000));
assertEquals(fileInfo.mtime, new Date(mtime * 1000));
file.close();
},
);
@ -51,8 +44,8 @@ unitTest(
Deno.fdatasyncSync(file.rid);
const fileInfo = Deno.statSync(filename);
assertFuzzyTimestampEquals(fileInfo.atime, new Date(atime * 1000));
assertFuzzyTimestampEquals(fileInfo.mtime, new Date(mtime * 1000));
assertEquals(fileInfo.atime, new Date(atime * 1000));
assertEquals(fileInfo.mtime, new Date(mtime * 1000));
file.close();
},
);
@ -71,8 +64,8 @@ unitTest(
Deno.utimeSync(filename, atime, mtime);
const fileInfo = Deno.statSync(filename);
assertFuzzyTimestampEquals(fileInfo.atime, new Date(atime * 1000));
assertFuzzyTimestampEquals(fileInfo.mtime, new Date(mtime * 1000));
assertEquals(fileInfo.atime, new Date(atime * 1000));
assertEquals(fileInfo.mtime, new Date(mtime * 1000));
},
);
@ -86,8 +79,8 @@ unitTest(
Deno.utimeSync(testDir, atime, mtime);
const dirInfo = Deno.statSync(testDir);
assertFuzzyTimestampEquals(dirInfo.atime, new Date(atime * 1000));
assertFuzzyTimestampEquals(dirInfo.mtime, new Date(mtime * 1000));
assertEquals(dirInfo.atime, new Date(atime * 1000));
assertEquals(dirInfo.mtime, new Date(mtime * 1000));
},
);
@ -101,8 +94,8 @@ unitTest(
Deno.utimeSync(testDir, atime, mtime);
const dirInfo = Deno.statSync(testDir);
assertFuzzyTimestampEquals(dirInfo.atime, atime);
assertFuzzyTimestampEquals(dirInfo.mtime, mtime);
assertEquals(dirInfo.atime, atime);
assertEquals(dirInfo.mtime, mtime);
},
);
@ -119,8 +112,8 @@ unitTest(
Deno.utimeSync(filename, atime, mtime);
const fileInfo = Deno.statSync(filename);
assertFuzzyTimestampEquals(fileInfo.atime, atime);
assertFuzzyTimestampEquals(fileInfo.mtime, mtime);
assertEquals(fileInfo.atime, atime);
assertEquals(fileInfo.mtime, mtime);
},
);
@ -136,8 +129,8 @@ unitTest(
Deno.utimeSync(testDir, atime, mtime);
const dirInfo = Deno.statSync(testDir);
assertFuzzyTimestampEquals(dirInfo.atime, new Date(atime * 1000));
assertFuzzyTimestampEquals(dirInfo.mtime, new Date(mtime * 1000));
assertEquals(dirInfo.atime, new Date(atime * 1000));
assertEquals(dirInfo.mtime, new Date(mtime * 1000));
},
);
@ -179,8 +172,8 @@ unitTest(
await Deno.utime(filename, atime, mtime);
const fileInfo = Deno.statSync(filename);
assertFuzzyTimestampEquals(fileInfo.atime, new Date(atime * 1000));
assertFuzzyTimestampEquals(fileInfo.mtime, new Date(mtime * 1000));
assertEquals(fileInfo.atime, new Date(atime * 1000));
assertEquals(fileInfo.mtime, new Date(mtime * 1000));
},
);
@ -194,8 +187,8 @@ unitTest(
await Deno.utime(testDir, atime, mtime);
const dirInfo = Deno.statSync(testDir);
assertFuzzyTimestampEquals(dirInfo.atime, new Date(atime * 1000));
assertFuzzyTimestampEquals(dirInfo.mtime, new Date(mtime * 1000));
assertEquals(dirInfo.atime, new Date(atime * 1000));
assertEquals(dirInfo.mtime, new Date(mtime * 1000));
},
);
@ -209,8 +202,8 @@ unitTest(
await Deno.utime(testDir, atime, mtime);
const dirInfo = Deno.statSync(testDir);
assertFuzzyTimestampEquals(dirInfo.atime, atime);
assertFuzzyTimestampEquals(dirInfo.mtime, mtime);
assertEquals(dirInfo.atime, atime);
assertEquals(dirInfo.mtime, mtime);
},
);
@ -228,8 +221,8 @@ unitTest(
await Deno.utime(filename, atime, mtime);
const fileInfo = Deno.statSync(filename);
assertFuzzyTimestampEquals(fileInfo.atime, atime);
assertFuzzyTimestampEquals(fileInfo.mtime, mtime);
assertEquals(fileInfo.atime, atime);
assertEquals(fileInfo.mtime, mtime);
},
);

10
std/fs/copy_test.ts
View file

@ -32,13 +32,6 @@ function testCopy(
});
}
function testCopyIgnore(
name: string,
cb: (tempDir: string) => Promise<void>,
): void {
testCopy(name, cb, true);
}
function testCopySync(name: string, cb: (tempDir: string) => void): void {
Deno.test({
name,
@ -144,8 +137,7 @@ testCopy(
},
);
// TODO(#6644) This case is ignored because of the issue #5065.
testCopyIgnore(
testCopy(
"[fs] copy with preserve timestamps",
async (tempDir: string): Promise<void> => {
const srcFile = path.join(testdataDir, "copy_file.txt");