Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

refactor(core): More efficient serde for ES modules in snapshot #17856

Merged
merged 7 commits into from
Feb 21, 2023
Merged

refactor(core): More efficient serde for ES modules in snapshot #17856

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
11e891c
more efficient deserialization
bartlomieju Feb 21, 2023
7f73dd2
don't store urls in snapshot data
bartlomieju Feb 21, 2023
68b71b9
more efficient serde for ModuleInfo
bartlomieju Feb 21, 2023
bef9a95
more efficient serde for ModuleMap::by_name
bartlomieju Feb 21, 2023
653b2c3
cleanup
bartlomieju Feb 21, 2023
b72d2c5
Merge branch 'main' into faster_startup_core
bartlomieju Feb 21, 2023
2623700
review
bartlomieju Feb 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
review
  • Loading branch information
@bartlomieju
bartlomieju committed Feb 21, 2023
commit 2623700ea25d8ba6e076bbd78e878c895542ff07
30 changes: 8 additions & 22 deletions core/modules.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ fn json_module_evaluation_steps<'a>(
/// the module against an import assertion (if one is present
/// in the import statement).
#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
#[repr(u32)]
pub enum ModuleType {
JavaScript,
Json,
Expand Down Expand Up @@ -903,6 +904,7 @@ impl Stream for RecursiveModuleLoad {
}

#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, Serialize, Deserialize)]
#[repr(u32)]
pub(crate) enum AssertedModuleType {
JavaScriptOrWasm,
Json,
Expand Down Expand Up @@ -1018,13 +1020,8 @@ impl ModuleMap {
let specifier = v8::String::new(scope, &request.specifier).unwrap();
requests_arr.set_index(scope, 2 * i as u32, specifier.into());

let asserted_module_type = v8::Integer::new(
scope,
match request.asserted_module_type {
AssertedModuleType::JavaScriptOrWasm => 0,
AssertedModuleType::Json => 1,
},
);
let asserted_module_type =
v8::Integer::new(scope, request.asserted_module_type as i32);
requests_arr.set_index(
scope,
(2 * i) as u32 + 1,
Expand All @@ -1033,13 +1030,7 @@ impl ModuleMap {
}
module_info_arr.set_index(scope, 3, requests_arr.into());

let module_type = v8::Integer::new(
scope,
match info.module_type {
ModuleType::JavaScript => 0,
ModuleType::Json => 1,
},
);
let module_type = v8::Integer::new(scope, info.module_type as i32);
module_info_arr.set_index(scope, 4, module_type.into());

info_arr.set_index(scope, i as u32, module_info_arr.into());
Expand All @@ -1051,17 +1042,12 @@ impl ModuleMap {
for (i, elem) in self.by_name.iter().enumerate() {
let arr = v8::Array::new(scope, 3);

let (specifier, asserted_module_type) = &elem.0;
let (specifier, asserted_module_type) = elem.0;
let specifier = v8::String::new(scope, specifier).unwrap();
arr.set_index(scope, 0, specifier.into());

let asserted_module_type = v8::Integer::new(
scope,
match asserted_module_type {
AssertedModuleType::JavaScriptOrWasm => 0,
AssertedModuleType::Json => 1,
},
);
let asserted_module_type =
v8::Integer::new(scope, *asserted_module_type as i32);
arr.set_index(scope, 1, asserted_module_type.into());

let symbolic_module: v8::Local<v8::Value> = match &elem.1 {
Expand Down