stamp: polishing

Author: nyannyacha

crates/base/src/runtime/mod.rs

@@ -102,8 +102,6 @@ use serde::Serialize;
 use strum::IntoStaticStr;
 use tokio::runtime::Handle;
 use tokio::sync::mpsc;
-use tokio::sync::OwnedSemaphorePermit;
-use tokio::sync::Semaphore;
 use tokio::time::interval;
 use tokio_util::sync::CancellationToken;
 use tracing::debug;
@@ -158,15 +156,6 @@ pub static SHOULD_INCLUDE_MALLOCED_MEMORY_ON_MEMCHECK: OnceCell<bool> =
   OnceCell::new();
 pub static MAYBE_DENO_VERSION: OnceCell<String> = OnceCell::new();
 
-thread_local! {
-  // NOTE: Suppose we have met `.await` points while initializing a
-  // DenoRuntime. In that case, the current v8 isolate's thread-local state
-  // can be corrupted by a task initializing another DenoRuntime, so we must
-  // prevent this with a Semaphore.
-
-  static RUNTIME_CREATION_SEM: Arc<Semaphore> = Arc::new(Semaphore::new(1));
-}
-
 #[ctor]
 fn init_v8_platform() {
   set_v8_flags();
@@ -460,16 +449,6 @@ impl<RuntimeContext> Drop for DenoRuntime<RuntimeContext> {
   }
 }
 
-impl DenoRuntime<DefaultRuntimeContext> {
-  pub async fn acquire() -> OwnedSemaphorePermit {
-    RUNTIME_CREATION_SEM
-      .with(|v| v.clone())
-      .acquire_owned()
-      .await
-      .unwrap()
-  }
-}
-
 impl<RuntimeContext> DenoRuntime<RuntimeContext> {
   #[inline]
   fn assert_isolate_not_locked(&mut self) {
@@ -1489,22 +1468,8 @@ where
 
     let state = self.runtime_state.clone();
     let mem_check_state = is_user_worker.then(|| self.mem_check.clone());
-    // let mut poll_sem = None::<PollSemaphore>;
 
     poll_fn(move |cx| {
-      // if poll_sem.is_none() {
-      //   poll_sem =
-      //     Some(RUNTIME_CREATION_SEM.with(|v| PollSemaphore::new(v.clone())));
-      // }
-
-      // let Poll::Ready(Some(_permit)) =
-      //   poll_sem.as_mut().unwrap().poll_acquire(cx)
-      // else {
-      //   return Poll::Pending;
-      // };
-
-      // poll_sem = None;
-
       let waker = cx.waker();
       let woked = global_waker.take().is_none();
 

crates/base/src/worker/supervisor/strategy_per_worker.rs

@@ -295,7 +295,6 @@ pub async fn supervise(args: Arguments) -> (ShutdownReason, i64) {
         match metrics {
           CPUUsageMetrics::Enter(_thread_id, timer) => {
             state.worker_enter();
-            error!("cpu enter: {:?}, {:?}", _thread_id, std::thread::current());
 
             if !state.is_cpu_time_limit_disabled {
               cpu_timer_rx = Some(timer.set_channel().in_current_span().await);

crates/base/src/worker/worker_inner.rs

@@ -226,7 +226,6 @@ impl Worker {
 
     let rt = imp.runtime_handle();
     let worker_fut = async move {
-      // let permit = DenoRuntime::acquire().await;
       let new_runtime = 'scope: {
         match DenoRuntime::new(self).await {
           Ok(mut v) => {
@@ -243,25 +242,13 @@ impl Worker {
       let mut new_runtime = match new_runtime {
         Ok(v) => v,
         Err(err) => {
-          // drop(permit);
-
           let err = CloneableError::from(err.context("worker boot error"));
           let _ = booter_signal.send(Err(err.clone().into()));
 
           return Some(imp.on_boot_error(err.into()).await);
         }
       };
 
-      // let mut runtime = scopeguard::guard(new_runtime, |mut runtime| unsafe {
-      //   runtime.js_runtime.v8_isolate().enter();
-      // });
-
-      // unsafe {
-      //   runtime.js_runtime.v8_isolate().exit();
-      // }
-
-      // drop(permit);
-
       let metric_src = {
         let metric_src =
           WorkerMetricSource::from_js_runtime(&mut new_runtime.js_runtime);