Skip to content

Commit 1cdbe79

Browse files
aheejinaheejin
committed
Merge branch 'main' into update_libcxx_libcxxabi_19
2 parents d7aa36b + a6ecc86 commit 1cdbe79

File tree

145 files changed

+461
-711
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

145 files changed

+461
-711
lines changed

‎ChangeLog.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,14 @@ See docs/process.md for more on how version tagging works.
2020

2121
3.1.74 (in development)
2222
-----------------------
23+
- The file system was updated to independently track atime, mtime and ctime
24+
instead of using the same time for all three. (#22998)
25+
- The minimum supported chrome version was bumped from 32 to 33. (#23077)
2326

2427
3.1.73 - 11/28/24
2528
-----------------
2629
- libunwind was updated to LLVM 19.1.4. (#22394)
30+
- mimalloc was updated to 2.1.7. (#21548)
2731

2832
3.1.72 - 11/19/24
2933
-----------------

‎site/source/docs/tools_reference/settings_reference.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2939,7 +2939,7 @@ This setting also applies to modern Chromium-based Edge, which shares version
29392939
numbers with Chrome.
29402940
Chrome 85 was released on 2020-08-25.
29412941
MAX_INT (0x7FFFFFFF, or -1) specifies that target is not supported.
2942-
Minimum supported value is 32, which was released on 2014-01-04.
2942+
Minimum supported value is 33, which was released on 2014-02-18.
29432943

29442944
Default value: 85
29452945

‎src/library_async.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -520,9 +520,7 @@ addToLibrary({
520520
var imports = {'primary': wasmExports};
521521
// Replace '.wasm' suffix with '.deferred.wasm'.
522522
var deferred = wasmBinaryFile.slice(0, -5) + '.deferred.wasm';
523-
await new Promise((resolve) => {
524-
instantiateAsync(null, deferred, imports, resolve);
525-
});
523+
await instantiateAsync(null, deferred, imports);
526524
},
527525

528526
$Fibers__deps: ['$Asyncify', 'emscripten_stack_set_limits', '$stackRestore'],

‎src/library_fs.js

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,6 +146,7 @@ FS.staticInit();
146146
this.name = name;
147147
this.mode = mode;
148148
this.rdev = rdev;
149+
this.atime = this.mtime = this.ctime = Date.now();
149150
}
150151
get read() {
151152
return (this.mode & this.readMode) === this.readMode;
@@ -943,7 +944,7 @@ FS.staticInit();
943944
}
944945
node.node_ops.setattr(node, {
945946
mode: (mode & {{{ cDefs.S_IALLUGO }}}) | (node.mode & ~{{{ cDefs.S_IALLUGO }}}),
946-
timestamp: Date.now()
947+
ctime: Date.now()
947948
});
948949
},
949950
lchmod(path, mode) {
@@ -1016,7 +1017,8 @@ FS.staticInit();
10161017
var lookup = FS.lookupPath(path, { follow: true });
10171018
var node = lookup.node;
10181019
node.node_ops.setattr(node, {
1019-
timestamp: Math.max(atime, mtime)
1020+
atime: atime,
1021+
mtime: mtime
10201022
});
10211023
},
10221024
open(path, flags, mode = 0o666) {
@@ -1391,6 +1393,9 @@ FS.staticInit();
13911393
FS.mount({
13921394
mount() {
13931395
var node = FS.createNode(proc_self, 'fd', {{{ cDefs.S_IFDIR | 0o777 }}}, {{{ cDefs.S_IXUGO }}});
1396+
node.stream_ops = {
1397+
llseek: MEMFS.stream_ops.llseek,
1398+
};
13941399
node.node_ops = {
13951400
lookup(parent, name) {
13961401
var fd = +name;
@@ -1399,9 +1404,15 @@ FS.staticInit();
13991404
parent: null,
14001405
mount: { mountpoint: 'fake' },
14011406
node_ops: { readlink: () => stream.path },
1407+
id: fd + 1,
14021408
};
14031409
ret.parent = ret; // make it look like a simple root node
14041410
return ret;
1411+
},
1412+
readdir() {
1413+
return Array.from(FS.streams.entries())
1414+
.filter(([k, v]) => v)
1415+
.map(([k, v]) => k.toString());
14051416
}
14061417
};
14071418
return node;
@@ -1618,7 +1629,7 @@ FS.staticInit();
16181629
buffer[offset+i] = result;
16191630
}
16201631
if (bytesRead) {
1621-
stream.node.timestamp = Date.now();
1632+
stream.node.atime = Date.now();
16221633
}
16231634
return bytesRead;
16241635
},
@@ -1631,7 +1642,7 @@ FS.staticInit();
16311642
}
16321643
}
16331644
if (length) {
1634-
stream.node.timestamp = Date.now();
1645+
stream.node.mtime = stream.node.ctime = Date.now();
16351646
}
16361647
return i;
16371648
}

‎src/library_lz4.js

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ addToLibrary({
7070
node.mode = mode;
7171
node.node_ops = LZ4.node_ops;
7272
node.stream_ops = LZ4.stream_ops;
73-
node.timestamp = (mtime || new Date).getTime();
73+
this.atime = this.mtime = this.ctime = (mtime || new Date).getTime();
7474
assert(LZ4.FILE_MODE !== LZ4.DIR_MODE);
7575
if (mode === LZ4.FILE_MODE) {
7676
node.size = contents.end - contents.start;
@@ -95,19 +95,18 @@ addToLibrary({
9595
gid: 0,
9696
rdev: 0,
9797
size: node.size,
98-
atime: new Date(node.timestamp),
99-
mtime: new Date(node.timestamp),
100-
ctime: new Date(node.timestamp),
98+
atime: new Date(node.atime),
99+
mtime: new Date(node.mtime),
100+
ctime: new Date(node.ctime),
101101
blksize: 4096,
102102
blocks: Math.ceil(node.size / 4096),
103103
};
104104
},
105105
setattr(node, attr) {
106-
if (attr.mode !== undefined) {
107-
node.mode = attr.mode;
108-
}
109-
if (attr.timestamp !== undefined) {
110-
node.timestamp = attr.timestamp;
106+
for (const key of ['mode', 'atime', 'mtime', 'ctime']) {
107+
if (attr[key]) {
108+
node[key] = attr[key];
109+
}
111110
}
112111
},
113112
lookup(parent, name) {

‎src/library_memfs.js

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ addToLibrary({
9292
node.node_ops = MEMFS.ops_table.chrdev.node;
9393
node.stream_ops = MEMFS.ops_table.chrdev.stream;
9494
}
95-
node.timestamp = Date.now();
95+
node.atime = node.mtime = node.ctime = Date.now();
9696
// add the new node to the parent
9797
if (parent) {
9898
parent.contents[name] = node;
99-
parent.timestamp = node.timestamp;
99+
parent.atime = parent.mtime = parent.ctime = node.atime;
100100
}
101101
return node;
102102
},
@@ -161,21 +161,20 @@ addToLibrary({
161161
} else {
162162
attr.size = 0;
163163
}
164-
attr.atime = new Date(node.timestamp);
165-
attr.mtime = new Date(node.timestamp);
166-
attr.ctime = new Date(node.timestamp);
164+
attr.atime = new Date(node.atime);
165+
attr.mtime = new Date(node.mtime);
166+
attr.ctime = new Date(node.ctime);
167167
// NOTE: In our implementation, st_blocks = Math.ceil(st_size/st_blksize),
168168
// but this is not required by the standard.
169169
attr.blksize = 4096;
170170
attr.blocks = Math.ceil(attr.size / attr.blksize);
171171
return attr;
172172
},
173173
setattr(node, attr) {
174-
if (attr.mode !== undefined) {
175-
node.mode = attr.mode;
176-
}
177-
if (attr.timestamp !== undefined) {
178-
node.timestamp = attr.timestamp;
174+
for (const key of ["mode", "atime", "mtime", "ctime"]) {
175+
if (attr[key]) {
176+
node[key] = attr[key];
177+
}
179178
}
180179
if (attr.size !== undefined) {
181180
MEMFS.resizeFileStorage(node, attr.size);
@@ -207,22 +206,21 @@ addToLibrary({
207206
}
208207
// do the internal rewiring
209208
delete old_node.parent.contents[old_node.name];
210-
old_node.parent.timestamp = Date.now()
211-
old_node.name = new_name;
212209
new_dir.contents[new_name] = old_node;
213-
new_dir.timestamp = old_node.parent.timestamp;
210+
old_node.name = new_name;
211+
new_dir.ctime = new_dir.mtime = old_node.parent.ctime = old_node.parent.mtime = Date.now();
214212
},
215213
unlink(parent, name) {
216214
delete parent.contents[name];
217-
parent.timestamp = Date.now();
215+
parent.ctime = parent.mtime = Date.now();
218216
},
219217
rmdir(parent, name) {
220218
var node = FS.lookupNode(parent, name);
221219
for (var i in node.contents) {
222220
throw new FS.ErrnoError({{{ cDefs.ENOTEMPTY }}});
223221
}
224222
delete parent.contents[name];
225-
parent.timestamp = Date.now();
223+
parent.ctime = parent.mtime = Date.now();
226224
},
227225
readdir(node) {
228226
var entries = ['.', '..'];
@@ -282,7 +280,7 @@ addToLibrary({
282280

283281
if (!length) return 0;
284282
var node = stream.node;
285-
node.timestamp = Date.now();
283+
node.mtime = node.ctime = Date.now();
286284

287285
if (buffer.subarray && (!node.contents || node.contents.subarray)) { // This write is from a typed array to a typed array?
288286
if (canOwn) {

‎src/library_nodefs.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,10 @@ addToLibrary({
166166
// update the common node structure mode as well
167167
node.mode = attr.mode;
168168
}
169-
if (attr.timestamp !== undefined) {
170-
var date = new Date(attr.timestamp);
171-
fs.utimesSync(path, date, date);
169+
if (attr.atime || attr.mtime) {
170+
var atime = attr.atime && new Date(attr.atime);
171+
var mtime = attr.mtime && new Date(attr.mtime);
172+
fs.utimesSync(path, atime, mtime);
172173
}
173174
if (attr.size !== undefined) {
174175
fs.truncateSync(path, attr.size);

‎src/library_noderawfs.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -112,13 +112,13 @@ addToLibrary({
112112
fs.ftruncateSync(stream.nfd, len);
113113
},
114114
utime(path, atime, mtime) {
115-
// -1 here for atime or mtime means UTIME_OMIT was passed. Since node
115+
// null here for atime or mtime means UTIME_OMIT was passed. Since node
116116
// doesn't support this concept we need to first find the existing
117117
// timestamps in order to preserve them.
118-
if (atime == -1 || mtime == -1) {
118+
if ((atime === null) || (mtime === null)) {
119119
var st = fs.statSync(path);
120-
if (atime == -1) atime = st.atimeMs;
121-
if (mtime == -1) mtime = st.mtimeMs;
120+
atime ||= st.atimeMs;
121+
mtime ||= st.mtimeMs;
122122
}
123123
fs.utimesSync(path, atime/1000, mtime/1000);
124124
},

‎src/library_proxyfs.js

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,10 @@ addToLibrary({
6363
// update the common node structure mode as well
6464
node.mode = attr.mode;
6565
}
66-
if (attr.timestamp !== undefined) {
67-
var date = new Date(attr.timestamp);
68-
node.mount.opts.fs.utime(path, date, date);
66+
if (attr.atime || attr.mtime) {
67+
var atime = new Date(attr.atime || attr.mtime);
68+
var mtime = new Date(attr.mtime || attr.atime);
69+
node.mount.opts.fs.utime(path, atime, mtime);
6970
}
7071
if (attr.size !== undefined) {
7172
node.mount.opts.fs.truncate(path, attr.size);

‎src/library_syscall.js

Lines changed: 19 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -695,9 +695,9 @@ var SyscallsLibrary = {
695695
var pos = 0;
696696
var off = FS.llseek(stream, 0, {{{ cDefs.SEEK_CUR }}});
697697
698-
var idx = Math.floor(off / struct_size);
699-
700-
while (idx < stream.getdents.length && pos + struct_size <= count) {
698+
var startIdx = Math.floor(off / struct_size);
699+
var endIdx = Math.min(stream.getdents.length, startIdx + Math.floor(count/struct_size))
700+
for (var idx = startIdx; idx < endIdx; idx++) {
701701
var id;
702702
var type;
703703
var name = stream.getdents[idx];
@@ -711,7 +711,17 @@ var SyscallsLibrary = {
711711
type = 4; // DT_DIR
712712
}
713713
else {
714-
var child = FS.lookupNode(stream.node, name);
714+
var child;
715+
try {
716+
child = FS.lookupNode(stream.node, name);
717+
} catch (e) {
718+
// If the entry is not a directory, file, or symlink, nodefs
719+
// lookupNode will raise EINVAL. Skip these and continue.
720+
if (e?.errno === {{{ cDefs.EINVAL }}}) {
721+
continue;
722+
}
723+
throw e;
724+
}
715725
id = child.id;
716726
type = FS.isChrdev(child.mode) ? 2 : // DT_CHR, character device.
717727
FS.isDir(child.mode) ? 4 : // DT_DIR, directory.
@@ -727,7 +737,6 @@ var SyscallsLibrary = {
727737
{{{ makeSetValue('dirp + pos', C_STRUCTS.dirent.d_type, 'type', 'i8') }}};
728738
stringToUTF8(name, dirp + pos + {{{ C_STRUCTS.dirent.d_name }}}, 256);
729739
pos += struct_size;
730-
idx += 1;
731740
}
732741
FS.llseek(stream, idx * struct_size, {{{ cDefs.SEEK_SET }}});
733742
return pos;
@@ -959,7 +968,7 @@ var SyscallsLibrary = {
959968
if (nanoseconds == {{{ cDefs.UTIME_NOW }}}) {
960969
atime = now;
961970
} else if (nanoseconds == {{{ cDefs.UTIME_OMIT }}}) {
962-
atime = -1;
971+
atime = null;
963972
} else {
964973
atime = (seconds*1000) + (nanoseconds/(1000*1000));
965974
}
@@ -969,15 +978,14 @@ var SyscallsLibrary = {
969978
if (nanoseconds == {{{ cDefs.UTIME_NOW }}}) {
970979
mtime = now;
971980
} else if (nanoseconds == {{{ cDefs.UTIME_OMIT }}}) {
972-
mtime = -1;
981+
mtime = null;
973982
} else {
974983
mtime = (seconds*1000) + (nanoseconds/(1000*1000));
975984
}
976985
}
977-
// -1 here means UTIME_OMIT was passed. FS.utime tables the max of these
978-
// two values and sets the timestamp to that single value. If both were
979-
// set to UTIME_OMIT then we can skip the call completely.
980-
if (mtime != -1 || atime != -1) {
986+
// null here means UTIME_OMIT was passed. If both were set to UTIME_OMIT then
987+
// we can skip the call completely.
988+
if ((mtime ?? atime) !== null) {
981989
FS.utime(path, atime, mtime);
982990
}
983991
return 0;

‎src/library_tty.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ addToLibrary({
7979
buffer[offset+i] = result;
8080
}
8181
if (bytesRead) {
82-
stream.node.timestamp = Date.now();
82+
stream.node.atime = Date.now();
8383
}
8484
return bytesRead;
8585
},
@@ -95,7 +95,7 @@ addToLibrary({
9595
throw new FS.ErrnoError({{{ cDefs.EIO }}});
9696
}
9797
if (length) {
98-
stream.node.timestamp = Date.now();
98+
stream.node.mtime = stream.node.ctime = Date.now();
9999
}
100100
return i;
101101
}

‎src/library_workerfs.js

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ addToLibrary({
5757
node.mode = mode;
5858
node.node_ops = WORKERFS.node_ops;
5959
node.stream_ops = WORKERFS.stream_ops;
60-
node.timestamp = (mtime || new Date).getTime();
60+
node.atime = node.mtime = node.ctime = (mtime || new Date).getTime();
6161
assert(WORKERFS.FILE_MODE !== WORKERFS.DIR_MODE);
6262
if (mode === WORKERFS.FILE_MODE) {
6363
node.size = contents.size;
@@ -82,19 +82,18 @@ addToLibrary({
8282
gid: 0,
8383
rdev: 0,
8484
size: node.size,
85-
atime: new Date(node.timestamp),
86-
mtime: new Date(node.timestamp),
87-
ctime: new Date(node.timestamp),
85+
atime: new Date(node.atime),
86+
mtime: new Date(node.mtime),
87+
ctime: new Date(node.ctime),
8888
blksize: 4096,
8989
blocks: Math.ceil(node.size / 4096),
9090
};
9191
},
9292
setattr(node, attr) {
93-
if (attr.mode !== undefined) {
94-
node.mode = attr.mode;
95-
}
96-
if (attr.timestamp !== undefined) {
97-
node.timestamp = attr.timestamp;
93+
for (const key of ["mode", "atime", "mtime", "ctime"]) {
94+
if (attr[key]) {
95+
node[key] = attr[key];
96+
}
9897
}
9998
},
10099
lookup(parent, name) {

0 commit comments

Comments
 (0)