diff options
| -rw-r--r-- | cli/build.rs | 9 | ||||
| -rw-r--r-- | cli/js.rs | 31 | ||||
| -rw-r--r-- | runtime/build.rs | 9 | ||||
| -rw-r--r-- | runtime/js.rs | 33 |
4 files changed, 75 insertions, 7 deletions
diff --git a/cli/build.rs b/cli/build.rs index ddcd08778..956293b78 100644 --- a/cli/build.rs +++ b/cli/build.rs @@ -378,7 +378,14 @@ fn create_cli_snapshot(snapshot_path: PathBuf) { startup_snapshot: Some(deno_runtime::js::deno_isolate_init()), extensions, extensions_with_js, - compression_cb: None, + compression_cb: Some(Box::new(|vec, snapshot_slice| { + lzzzz::lz4_hc::compress_to_vec( + snapshot_slice, + vec, + lzzzz::lz4_hc::CLEVEL_MAX, + ) + .expect("snapshot compression failed"); + })), snapshot_module_load_cb: None, }) } @@ -1,12 +1,37 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. use deno_core::Snapshot; +use log::debug; +use once_cell::sync::Lazy; -static CLI_SNAPSHOT: &[u8] = - include_bytes!(concat!(env!("OUT_DIR"), "/CLI_SNAPSHOT.bin")); +pub static CLI_SNAPSHOT: Lazy<Box<[u8]>> = Lazy::new( + #[allow(clippy::uninit_vec)] + #[cold] + #[inline(never)] + || { + static COMPRESSED_CLI_SNAPSHOT: &[u8] = + include_bytes!(concat!(env!("OUT_DIR"), "/CLI_SNAPSHOT.bin")); + + let size = + u32::from_le_bytes(COMPRESSED_CLI_SNAPSHOT[0..4].try_into().unwrap()) + as usize; + let mut vec = Vec::with_capacity(size); + + // SAFETY: vec is allocated with exact snapshot size (+ alignment) + // SAFETY: non zeroed bytes are overwritten with decompressed snapshot + unsafe { + vec.set_len(size); + } + + lzzzz::lz4::decompress(&COMPRESSED_CLI_SNAPSHOT[4..], &mut vec).unwrap(); + + vec.into_boxed_slice() + }, +); pub fn deno_isolate_init() -> Snapshot { - Snapshot::Static(CLI_SNAPSHOT) + debug!("Deno isolate init with snapshots."); + Snapshot::Static(&CLI_SNAPSHOT) } #[cfg(test)] diff --git a/runtime/build.rs b/runtime/build.rs index 07b56945f..5bf694cec 100644 --- a/runtime/build.rs +++ b/runtime/build.rs @@ -294,7 +294,14 @@ mod startup_snapshot { startup_snapshot: None, extensions: vec![], extensions_with_js, - compression_cb: None, + compression_cb: Some(Box::new(|vec, snapshot_slice| { + lzzzz::lz4_hc::compress_to_vec( + snapshot_slice, + vec, + lzzzz::lz4_hc::CLEVEL_MAX, + ) + .expect("snapshot compression failed"); + })), snapshot_module_load_cb: Some(Box::new(transpile_ts_for_snapshotting)), }); } diff --git a/runtime/js.rs b/runtime/js.rs index 3101e4b6b..57b1e7be4 100644 --- a/runtime/js.rs +++ b/runtime/js.rs @@ -1,14 +1,43 @@ // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license. #[cfg(not(feature = "dont_create_runtime_snapshot"))] use deno_core::Snapshot; +#[cfg(not(feature = "dont_create_runtime_snapshot"))] +use log::debug; +#[cfg(not(feature = "dont_create_runtime_snapshot"))] +use once_cell::sync::Lazy; #[cfg(not(feature = "dont_create_runtime_snapshot"))] -static RUNTIME_SNAPSHOT: &[u8] = +static COMPRESSED_RUNTIME_SNAPSHOT: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/RUNTIME_SNAPSHOT.bin")); #[cfg(not(feature = "dont_create_runtime_snapshot"))] +pub static RUNTIME_SNAPSHOT: Lazy<Box<[u8]>> = Lazy::new( + #[allow(clippy::uninit_vec)] + #[cold] + #[inline(never)] + || { + let size = + u32::from_le_bytes(COMPRESSED_RUNTIME_SNAPSHOT[0..4].try_into().unwrap()) + as usize; + let mut vec = Vec::with_capacity(size); + + // SAFETY: vec is allocated with exact snapshot size (+ alignment) + // SAFETY: non zeroed bytes are overwritten with decompressed snapshot + unsafe { + vec.set_len(size); + } + + lzzzz::lz4::decompress(&COMPRESSED_RUNTIME_SNAPSHOT[4..], &mut vec) + .unwrap(); + + vec.into_boxed_slice() + }, +); + +#[cfg(not(feature = "dont_create_runtime_snapshot"))] pub fn deno_isolate_init() -> Snapshot { - Snapshot::Static(RUNTIME_SNAPSHOT) + debug!("Deno isolate init with snapshots."); + Snapshot::Static(&RUNTIME_SNAPSHOT) } #[cfg(not(feature = "include_js_files_for_snapshotting"))] |