Skip to content

Commit 7f7a08a

Browse files
committed
Build with zstd fix
1 parent 367d1fd commit 7f7a08a

File tree

3 files changed

+20
-6
lines changed

3 files changed

+20
-6
lines changed

build/jsroot.js

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ const version_id = '7.7.x',
1111

1212
/** @summary version date
1313
* @desc Release date in format day/month/year like '14/04/2022' */
14-
version_date = '2/08/2024',
14+
version_date = '21/08/2024',
1515

1616
/** @summary version id and date
1717
* @desc Produced by concatenation of {@link version_id} and {@link version_date}
@@ -98421,10 +98421,23 @@ async function R__unzip(arr, tgtsize, noalert, src_shift) {
9842198421
const tgt8arr = new Uint8Array(tgtbuf, fullres);
9842298422

9842398423
if (fmt === 'ZSTD') {
98424-
const promise = internals._ZstdStream
98425-
? Promise.resolve(internals._ZstdStream)
98426-
: (isNodeJs() ? Promise.resolve().then(function () { return _rollup_plugin_ignore_empty_module_placeholder$1; }) : Promise.resolve().then(function () { return _rollup_plugin_ignore_empty_module_placeholder$1; }))
98427-
.then(({ ZstdInit }) => ZstdInit()).then(({ ZstdStream }) => { internals._ZstdStream = ZstdStream; return ZstdStream; });
98424+
let promise;
98425+
if (internals._ZstdStream)
98426+
promise = Promise.resolve(internals._ZstdStream);
98427+
else if (internals._ZstdInit !== undefined)
98428+
promise = new Promise(resolveFunc => { internals._ZstdInit.push(resolveFunc); });
98429+
else {
98430+
internals._ZstdInit = [];
98431+
promise = (isNodeJs() ? Promise.resolve().then(function () { return _rollup_plugin_ignore_empty_module_placeholder$1; }) : Promise.resolve().then(function () { return _rollup_plugin_ignore_empty_module_placeholder$1; }))
98432+
.then(({ ZstdInit }) => ZstdInit())
98433+
.then(({ ZstdStream }) => {
98434+
internals._ZstdStream = ZstdStream;
98435+
internals._ZstdInit.forEach(func => func(ZstdStream));
98436+
delete internals._ZstdInit;
98437+
return ZstdStream;
98438+
});
98439+
}
98440+
9842898441
return promise.then(ZstdStream => {
9842998442
const data2 = ZstdStream.decompress(uint8arr),
9843098443
reslen = data2.length;

changes.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
## Changes in 7.7.x
44
1. Fix - correctly handle in I/O empty std::map
55
2. Fix - reading of small (<1KB) ROOT files
6+
3. Fix - race condition in zstd initialization #318
67

78

89
## Changes in 7.7.2

modules/core.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ const version_id = '7.7.x',
44

55
/** @summary version date
66
* @desc Release date in format day/month/year like '14/04/2022' */
7-
version_date = '2/08/2024',
7+
version_date = '21/08/2024',
88

99
/** @summary version id and date
1010
* @desc Produced by concatenation of {@link version_id} and {@link version_date}

0 commit comments

Comments
 (0)