perf: memory pool

Author: SyMind

benches/bench.rs

@@ -145,46 +145,46 @@ fn benchmark_cached_source_hash(b: &mut Bencher) {
 fn bench_rspack_sources(criterion: &mut Criterion) {
   let mut group = criterion.benchmark_group("rspack_sources");
 
-  group.bench_function(
-    "concat_generate_string_with_cache",
-    benchmark_concat_generate_string_with_cache,
-  );
-  group
-    .bench_function("concat_generate_string", benchmark_concat_generate_string);
+  // group.bench_function(
+  //   "concat_generate_string_with_cache",
+  //   benchmark_concat_generate_string_with_cache,
+  // );
+  // group
+  //   .bench_function("concat_generate_string", benchmark_concat_generate_string);
 
-  group.bench_function("cached_source_hash", benchmark_cached_source_hash);
+  // group.bench_function("cached_source_hash", benchmark_cached_source_hash);
 
-  group.bench_function(
-    "complex_replace_source_map",
-    benchmark_complex_replace_source_map,
-  );
+  // group.bench_function(
+  //   "complex_replace_source_map",
+  //   benchmark_complex_replace_source_map,
+  // );
 
   group.bench_function(
     "complex_replace_source_source",
     benchmark_complex_replace_source_source,
   );
 
-  group.bench_function(
-    "parse_source_map_from_json",
-    benchmark_parse_source_map_from_json,
-  );
+  // group.bench_function(
+  //   "parse_source_map_from_json",
+  //   benchmark_parse_source_map_from_json,
+  // );
 
-  group.bench_function("source_map_clone", benchmark_source_map_clone);
+  // group.bench_function("source_map_clone", benchmark_source_map_clone);
 
-  group.bench_function(
-    "stringify_source_map_to_json",
-    benchmark_stringify_source_map_to_json,
-  );
+  // group.bench_function(
+  //   "stringify_source_map_to_json",
+  //   benchmark_stringify_source_map_to_json,
+  // );
 
-  group.bench_function(
-    "repetitive_react_components_map",
-    benchmark_repetitive_react_components_map,
-  );
+  // group.bench_function(
+  //   "repetitive_react_components_map",
+  //   benchmark_repetitive_react_components_map,
+  // );
 
-  group.bench_function(
-    "repetitive_react_components_source",
-    benchmark_repetitive_react_components_source,
-  );
+  // group.bench_function(
+  //   "repetitive_react_components_source",
+  //   benchmark_repetitive_react_components_source,
+  // );
 
   group.finish();
 }

src/cached_source.rs

@@ -301,10 +301,7 @@ mod tests {
 
   #[test]
   fn should_produce_correct_output_for_cached_raw_source() {
-    let map_options = MapOptions {
-      columns: true,
-      final_source: true,
-    };
+    let map_options = MapOptions::new(true);
 
     let source = RawStringSource::from("Test\nTest\nTest\n");
     let mut on_chunk_count = 0;

src/helpers.rs

@@ -2,18 +2,13 @@ use std::{
   borrow::{BorrowMut, Cow},
   cell::{OnceCell, RefCell},
   marker::PhantomData,
-  ops::Range,
+  ops::Range, rc::Rc,
 };
 
 use rustc_hash::FxHashMap as HashMap;
 
 use crate::{
-  decoder::MappingsDecoder,
-  encoder::create_encoder,
-  linear_map::LinearMap,
-  source::{Mapping, OriginalLocation},
-  with_indices::WithIndices,
-  MapOptions, Rope, SourceMap,
+  decoder::MappingsDecoder, encoder::create_encoder, linear_map::LinearMap, source::{Mapping, OriginalLocation}, with_indices::WithIndices, work_context::{self, WorkContext}, MapOptions, Rope, SourceMap
 };
 
 // Adding this type because sourceContentLine not happy
@@ -33,6 +28,7 @@ pub fn get_map<'a, S: StreamChunks>(
     &MapOptions {
       columns: options.columns,
       final_source: true,
+      work_context: options.work_context.clone(),
     },
     // on_chunk
     &mut |_, mapping| {
@@ -317,24 +313,28 @@ where
     MapOptions {
       columns: true,
       final_source: true,
+      ..
     } => stream_chunks_of_source_map_final(
       source, source_map, on_chunk, on_source, on_name,
     ),
     MapOptions {
       columns: true,
       final_source: false,
+      work_context
     } => stream_chunks_of_source_map_full(
-      source, source_map, on_chunk, on_source, on_name,
+      work_context.clone(), source, source_map, on_chunk, on_source, on_name,
     ),
     MapOptions {
       columns: false,
       final_source: true,
+      ..
     } => stream_chunks_of_source_map_lines_final(
       source, source_map, on_chunk, on_source, on_name,
     ),
     MapOptions {
       columns: false,
       final_source: false,
+      ..
     } => stream_chunks_of_source_map_lines_full(
       source, source_map, on_chunk, on_source, on_name,
     ),
@@ -413,6 +413,7 @@ where
 }
 
 fn stream_chunks_of_source_map_full<'a, S>(
+  work_context: Rc<WorkContext>,
   source: S,
   source_map: &'a SourceMap,
   on_chunk: OnChunk<'_, 'a>,
@@ -423,7 +424,7 @@ where
   S: SourceText<'a> + 'a,
 {
   let lines = split_into_lines(&source);
-  let line_with_indices_list = lines.map(WithIndices::new).collect::<Vec<_>>();
+  let line_with_indices_list = lines.map(|line| WithIndices::new(work_context.clone(), line)).collect::<Vec<_>>();
 
   if line_with_indices_list.is_empty() {
     return GeneratedInfo {
@@ -710,6 +711,7 @@ type InnerSourceIndexValueMapping<'a> =
 
 #[allow(clippy::too_many_arguments)]
 pub fn stream_chunks_of_combined_source_map<'a, S>(
+  work_context: Rc<WorkContext>,
   source: S,
   source_map: &'a SourceMap,
   inner_source_name: &'a str,
@@ -830,7 +832,7 @@ where
                     match inner_source_contents.get(&inner_source_index) {
                       Some(Some(source_content)) => Some(
                         split_into_lines(source_content)
-                          .map(WithIndices::new)
+                          .map(|line| WithIndices::new(work_context.clone(), line))
                           .collect(),
                       ),
                       _ => None,
@@ -930,7 +932,7 @@ where
                     match inner_source_contents.get(&inner_source_index) {
                       Some(Some(source_content)) => Some(
                         split_into_lines(source_content)
-                          .map(WithIndices::new)
+                          .map(|line| WithIndices::new(work_context.clone(), line))
                           .collect(),
                       ),
                       _ => None,
@@ -1167,6 +1169,7 @@ where
           &MapOptions {
             columns: options.columns,
             final_source: false,
+            work_context: options.work_context.clone(),
           },
         );
       } else {

src/lib.rs

@@ -14,6 +14,7 @@ mod rope;
 mod source;
 mod source_map_source;
 mod with_indices;
+mod work_context;
 
 pub use cached_source::CachedSource;
 pub use concat_source::ConcatSource;

src/replace_source.rs

@@ -391,7 +391,7 @@ impl StreamChunks for ReplaceSource {
           match source_content {
             SourceContent::Raw(source) => {
               let lines = split_into_lines(source)
-                .map(WithIndices::new)
+                .map(|line| WithIndices::new(options.work_context.clone(), line))
                 .collect::<Vec<_>>();
               let matched =
                 check_content_at_position(&lines, line, column, expected_chunk);
@@ -411,6 +411,7 @@ impl StreamChunks for ReplaceSource {
       &MapOptions {
         columns: options.columns,
         final_source: false,
+        work_context: options.work_context.clone()
       },
       &mut |chunk, mut mapping| {
         // SAFETY: final_source is false in ReplaceSource

src/source.rs

@@ -1,19 +1,12 @@
 use std::{
-  any::{Any, TypeId},
-  borrow::Cow,
-  convert::{TryFrom, TryInto},
-  fmt,
-  hash::{Hash, Hasher},
-  sync::Arc,
+  any::{Any, TypeId}, borrow::Cow, collections::BinaryHeap, convert::{TryFrom, TryInto}, fmt, hash::{Hash, Hasher}, rc::Rc, sync::Arc
 };
 
 use dyn_clone::DynClone;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-  helpers::{decode_mappings, StreamChunks},
-  rope::Rope,
-  Result,
+  helpers::{decode_mappings, StreamChunks}, rope::Rope, work_context::WorkContext, Result
 };
 
 /// An alias for `Box<dyn Source>`.
@@ -250,19 +243,36 @@ impl<T: Source + 'static> SourceExt for T {
 }
 
 /// Options for [Source::map].
-#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+#[derive(Debug, Clone)]
 pub struct MapOptions {
   /// Whether have columns info in generated [SourceMap] mappings.
   pub columns: bool,
   /// Whether the source will have changes, internal used for `ReplaceSource`, etc.
   pub(crate) final_source: bool,
+  pub(crate) work_context: Rc<WorkContext>,
+}
+
+impl PartialEq for MapOptions {
+  fn eq(&self, other: &Self) -> bool {
+    self.columns == other.columns && self.final_source == other.final_source
+  }
+}
+
+impl Eq for MapOptions {}
+
+impl Hash for MapOptions {
+  fn hash<H: Hasher>(&self, state: &mut H) {
+    self.columns.hash(state);
+    self.final_source.hash(state);
+  }
 }
 
 impl Default for MapOptions {
   fn default() -> Self {
     Self {
       columns: true,
       final_source: false,
+      work_context: Default::default()
     }
   }
 }

src/source_map_source.rs

@@ -191,6 +191,7 @@ impl StreamChunks for SourceMapSource {
   ) -> crate::helpers::GeneratedInfo {
     if let Some(inner_source_map) = &self.inner_source_map {
       stream_chunks_of_combined_source_map(
+        options.work_context.clone(),
         &*self.value,
         &self.source_map,
         &self.name,
@@ -469,10 +470,7 @@ mod tests {
       .into_string_lossy()
       .into_owned());
     test_cached!(source, |s: &dyn Source| s.map(&MapOptions::default()));
-    test_cached!(source, |s: &dyn Source| s.map(&MapOptions {
-      columns: false,
-      final_source: true
-    }));
+    test_cached!(source, |s: &dyn Source| s.map(&MapOptions::new(false)));
   }
 
   #[test]