refactor

Author: SyMind

benches/bench.rs

@@ -28,7 +28,6 @@ use bench_source_map::{
 
 use benchmark_repetitive_react_components::{
   benchmark_repetitive_react_components_map,
-  benchmark_repetitive_react_components_map_with_object_pool_scope,
   benchmark_repetitive_react_components_source,
 };
 
@@ -188,11 +187,6 @@ fn bench_rspack_sources(criterion: &mut Criterion) {
     benchmark_repetitive_react_components_map,
   );
 
-  group.bench_function(
-    "repetitive_react_components_map_with_object_pool_scope",
-    benchmark_repetitive_react_components_map_with_object_pool_scope,
-  );
-
   group.bench_function(
     "repetitive_react_components_source",
     benchmark_repetitive_react_components_source,

benches/benchmark_repetitive_react_components.rs

@@ -9,9 +9,9 @@ pub use criterion::*;
 pub use codspeed_criterion_compat::*;
 
 use rspack_sources::{
-  with_object_pool_scope, BoxSource, ConcatSource, MapOptions, OriginalSource,
-  RawStringSource, ReplaceSource, ReplacementEnforce, Source, SourceExt,
-  SourceMap, SourceMapSource, SourceMapSourceOptions,
+  BoxSource, ConcatSource, MapOptions, OriginalSource, RawStringSource,
+  ReplaceSource, ReplacementEnforce, Source, SourceExt, SourceMap,
+  SourceMapSource, SourceMapSourceOptions,
 };
 
 static REPETITIVE_1K_REACT_COMPONENTS_SOURCE: LazyLock<BoxSource> =
@@ -3516,18 +3516,3 @@ pub fn benchmark_repetitive_react_components_source(b: &mut Bencher) {
     black_box(source.source());
   });
 }
-
-pub fn benchmark_repetitive_react_components_map_with_object_pool_scope(
-  b: &mut Bencher,
-) {
-  let source = REPETITIVE_1K_REACT_COMPONENTS_SOURCE.clone();
-
-  with_object_pool_scope(|| {
-    // Warm up the object pool
-    black_box(source.map(&MapOptions::default()));
-
-    b.iter(|| {
-      black_box(source.map(&MapOptions::default()));
-    });
-  })
-}

src/cached_source.rs

@@ -11,6 +11,7 @@ use crate::{
     stream_and_get_source_and_map, stream_chunks_of_raw_source,
     stream_chunks_of_source_map, StreamChunks,
   },
+  object_pool::ObjectPool,
   rope::Rope,
   source::SourceValue,
   BoxSource, MapOptions, Source, SourceExt, SourceMap,
@@ -124,6 +125,7 @@ impl StreamChunks for CachedSource {
   fn stream_chunks<'a>(
     &'a self,
     options: &MapOptions,
+    object_pool: &'a ObjectPool,
     on_chunk: crate::helpers::OnChunk<'_, 'a>,
     on_source: crate::helpers::OnSource<'_, 'a>,
     on_name: crate::helpers::OnName<'_, 'a>,
@@ -138,7 +140,13 @@ impl StreamChunks for CachedSource {
         let source = self.rope();
         if let Some(map) = map {
           stream_chunks_of_source_map(
-            source, map, on_chunk, on_source, on_name, options,
+            options,
+            object_pool,
+            source,
+            map,
+            on_chunk,
+            on_source,
+            on_name,
           )
         } else {
           stream_chunks_of_raw_source(
@@ -148,8 +156,9 @@ impl StreamChunks for CachedSource {
       }
       None => {
         let (generated_info, map) = stream_and_get_source_and_map(
-          &self.inner,
           options,
+          object_pool,
+          &self.inner,
           on_chunk,
           on_source,
           on_name,
@@ -310,6 +319,7 @@ mod tests {
     let mut on_name_count = 0;
     let generated_info = source.stream_chunks(
       &map_options,
+      &ObjectPool::default(),
       &mut |_chunk, _mapping| {
         on_chunk_count += 1;
       },
@@ -324,6 +334,7 @@ mod tests {
     let cached_source = CachedSource::new(source);
     cached_source.stream_chunks(
       &map_options,
+      &ObjectPool::default(),
       &mut |_chunk, _mapping| {},
       &mut |_source_index, _source, _source_content| {},
       &mut |_name_index, _name| {},
@@ -334,6 +345,7 @@ mod tests {
     let mut cached_on_name_count = 0;
     let cached_generated_info = cached_source.stream_chunks(
       &map_options,
+      &ObjectPool::default(),
       &mut |_chunk, _mapping| {
         cached_on_chunk_count += 1;
       },

src/concat_source.rs

@@ -10,6 +10,7 @@ use rustc_hash::FxHashMap as HashMap;
 use crate::{
   helpers::{get_map, GeneratedInfo, OnChunk, OnName, OnSource, StreamChunks},
   linear_map::LinearMap,
+  object_pool::ObjectPool,
   source::{Mapping, OriginalLocation},
   BoxSource, MapOptions, RawStringSource, Rope, Source, SourceExt, SourceMap,
   SourceValue,
@@ -231,14 +232,21 @@ impl StreamChunks for ConcatSource {
   fn stream_chunks<'a>(
     &'a self,
     options: &MapOptions,
+    object_pool: &'a ObjectPool,
     on_chunk: OnChunk<'_, 'a>,
     on_source: OnSource<'_, 'a>,
     on_name: OnName<'_, 'a>,
   ) -> crate::helpers::GeneratedInfo {
     let children = self.optimized_children();
 
     if children.len() == 1 {
-      return children[0].stream_chunks(options, on_chunk, on_source, on_name);
+      return children[0].stream_chunks(
+        options,
+        object_pool,
+        on_chunk,
+        on_source,
+        on_name,
+      );
     }
     let mut current_line_offset = 0;
     let mut current_column_offset = 0;
@@ -260,6 +268,7 @@ impl StreamChunks for ConcatSource {
         generated_column,
       } = item.stream_chunks(
         options,
+        object_pool,
         &mut |chunk, mapping| {
           let line = mapping.generated_line + current_line_offset;
           let column = if mapping.generated_line == 1 {

src/helpers.rs

@@ -12,7 +12,7 @@ use crate::{
   decoder::MappingsDecoder,
   encoder::create_encoder,
   linear_map::LinearMap,
-  object_pool::with_current_thread_object_pool_scope,
+  object_pool::ObjectPool,
   source::{Mapping, OriginalLocation},
   source_content_lines::SourceContentLines,
   with_indices::WithIndices,
@@ -22,13 +22,6 @@ use crate::{
 pub fn get_map<'a, S: StreamChunks>(
   stream: &'a S,
   options: &'a MapOptions,
-) -> Option<SourceMap> {
-  with_current_thread_object_pool_scope(|| get_map_impl(stream, options))
-}
-
-pub fn get_map_impl<'a, S: StreamChunks>(
-  stream: &'a S,
-  options: &'a MapOptions,
 ) -> Option<SourceMap> {
   let mut mappings_encoder = create_encoder(options.columns);
   let mut sources: Vec<String> = Vec::new();
@@ -40,6 +33,7 @@ pub fn get_map_impl<'a, S: StreamChunks>(
       columns: options.columns,
       final_source: true,
     },
+    &ObjectPool::default(),
     // on_chunk
     &mut |_, mapping| {
       mappings_encoder.encode(&mapping);
@@ -78,6 +72,7 @@ pub trait StreamChunks {
   fn stream_chunks<'a>(
     &'a self,
     options: &MapOptions,
+    object_pool: &'a ObjectPool,
     on_chunk: OnChunk<'_, 'a>,
     on_source: OnSource<'_, 'a>,
     on_name: OnName<'_, 'a>,
@@ -97,9 +92,10 @@ pub type OnName<'a, 'b> = &'a mut dyn FnMut(u32, Cow<'b, str>);
 
 /// Default stream chunks behavior impl, see [webpack-sources streamChunks](https://github.com/webpack/webpack-sources/blob/9f98066311d53a153fdc7c633422a1d086528027/lib/helpers/streamChunks.js#L15-L35).
 pub fn stream_chunks_default<'a, S>(
+  options: &MapOptions,
+  object_pool: &'a ObjectPool,
   source: S,
   source_map: Option<&'a SourceMap>,
-  options: &MapOptions,
   on_chunk: OnChunk<'_, 'a>,
   on_source: OnSource<'_, 'a>,
   on_name: OnName<'_, 'a>,
@@ -109,7 +105,13 @@ where
 {
   if let Some(map) = source_map {
     stream_chunks_of_source_map(
-      source, map, on_chunk, on_source, on_name, options,
+      options,
+      object_pool,
+      source,
+      map,
+      on_chunk,
+      on_source,
+      on_name,
     )
   } else {
     stream_chunks_of_raw_source(source, options, on_chunk, on_source, on_name)
@@ -308,12 +310,13 @@ where
 }
 
 pub fn stream_chunks_of_source_map<'a, S>(
+  options: &MapOptions,
+  object_pool: &'a ObjectPool,
   source: S,
   source_map: &'a SourceMap,
   on_chunk: OnChunk<'_, 'a>,
   on_source: OnSource<'_, 'a>,
   on_name: OnName<'_, 'a>,
-  options: &MapOptions,
 ) -> GeneratedInfo
 where
   S: SourceText<'a> + 'a,
@@ -322,24 +325,33 @@ 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,
+      ..
     } => stream_chunks_of_source_map_full(
-      source, source_map, on_chunk, on_source, on_name,
+      object_pool,
+      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,
     ),
@@ -418,6 +430,7 @@ where
 }
 
 fn stream_chunks_of_source_map_full<'a, S>(
+  object_pool: &'a ObjectPool,
   source: S,
   source_map: &'a SourceMap,
   on_chunk: OnChunk<'_, 'a>,
@@ -428,7 +441,9 @@ 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(object_pool, line))
+    .collect::<Vec<_>>();
 
   if line_with_indices_list.is_empty() {
     return GeneratedInfo {
@@ -715,6 +730,8 @@ type InnerSourceIndexValueMapping<'a> =
 
 #[allow(clippy::too_many_arguments)]
 pub fn stream_chunks_of_combined_source_map<'a, S>(
+  options: &MapOptions,
+  object_pool: &'a ObjectPool,
   source: S,
   source_map: &'a SourceMap,
   inner_source_name: &'a str,
@@ -724,7 +741,6 @@ pub fn stream_chunks_of_combined_source_map<'a, S>(
   on_chunk: OnChunk<'_, 'a>,
   on_source: OnSource<'_, 'a>,
   on_name: OnName<'_, 'a>,
-  options: &MapOptions,
 ) -> GeneratedInfo
 where
   S: SourceText<'a> + 'a,
@@ -781,6 +797,8 @@ where
   };
 
   stream_chunks_of_source_map(
+    options,
+    object_pool,
     source.clone(),
     source_map,
     &mut |chunk, mapping| {
@@ -835,7 +853,10 @@ where
                     let inner_source_contents = inner_source_contents.borrow();
                     match inner_source_contents.get(&inner_source_index) {
                       Some(Some(source_content)) => {
-                        Some(SourceContentLines::from(source_content.clone()))
+                        Some(SourceContentLines::from(
+                          object_pool,
+                          source_content.clone(),
+                        ))
                       }
                       _ => None,
                     }
@@ -934,7 +955,10 @@ where
                     let inner_source_contents = inner_source_contents.borrow();
                     match inner_source_contents.get(&inner_source_index) {
                       Some(Some(source_content)) => {
-                        Some(SourceContentLines::from(source_content.clone()))
+                        Some(SourceContentLines::from(
+                          object_pool,
+                          source_content.clone(),
+                        ))
                       }
                       _ => None,
                     }
@@ -1098,6 +1122,11 @@ where
         }
         source_index_mapping.borrow_mut().insert(i, -2);
         stream_chunks_of_source_map(
+          &MapOptions {
+            columns: options.columns,
+            final_source: false,
+          },
+          object_pool,
           source_content.unwrap().as_ref(),
           inner_source_map,
           &mut |chunk, mapping| {
@@ -1167,10 +1196,6 @@ where
             inner_name_index_mapping.borrow_mut().insert(i, -2);
             inner_name_index_value_mapping.borrow_mut().insert(i, name);
           },
-          &MapOptions {
-            columns: options.columns,
-            final_source: false,
-          },
         );
       } else {
         let mut source_mapping = source_mapping.borrow_mut();
@@ -1190,13 +1215,13 @@ where
       name_index_mapping.borrow_mut().insert(i, -2);
       name_index_value_mapping.borrow_mut().insert(i, name);
     },
-    options,
   )
 }
 
 pub fn stream_and_get_source_and_map<'a, S: StreamChunks>(
-  input_source: &'a S,
   options: &MapOptions,
+  object_pool: &'a ObjectPool,
+  input_source: &'a S,
   on_chunk: OnChunk<'_, 'a>,
   on_source: OnSource<'_, 'a>,
   on_name: OnName<'_, 'a>,
@@ -1208,6 +1233,7 @@ pub fn stream_and_get_source_and_map<'a, S: StreamChunks>(
 
   let generated_info = input_source.stream_chunks(
     options,
+    object_pool,
     &mut |chunk, mapping| {
       mappings_encoder.encode(&mapping);
       on_chunk(chunk, mapping);

src/lib.rs

@@ -42,4 +42,4 @@ pub mod stream_chunks {
 
 pub use helpers::{decode_mappings, encode_mappings};
 
-pub use object_pool::with_object_pool_scope;
+pub use object_pool::ObjectPool;