diff options
| -rw-r--r-- | components/script/dom/dedicatedworkerglobalscope.rs | 5 | ||||
| -rw-r--r-- | components/util/task.rs | 4 | ||||
| -rw-r--r-- | components/util/workqueue.rs | 4 |
3 files changed, 4 insertions, 9 deletions
diff --git a/components/script/dom/dedicatedworkerglobalscope.rs b/components/script/dom/dedicatedworkerglobalscope.rs index 0257f8edc2e..90145ca610e 100644 --- a/components/script/dom/dedicatedworkerglobalscope.rs +++ b/components/script/dom/dedicatedworkerglobalscope.rs @@ -23,7 +23,7 @@ use script_task::{ScriptTask, ScriptChan, ScriptMsg, TimerSource}; use script_task::StackRootTLS; use servo_net::resource_task::{ResourceTask, load_whole_resource}; -use servo_util::task::spawn_named_native; +use servo_util::task::spawn_named; use servo_util::task_state; use servo_util::task_state::{SCRIPT, IN_WORKER}; @@ -135,8 +135,7 @@ impl DedicatedWorkerGlobalScope { parent_sender: Box<ScriptChan+Send>, own_sender: Sender<(TrustedWorkerAddress, ScriptMsg)>, receiver: Receiver<(TrustedWorkerAddress, ScriptMsg)>) { - spawn_named_native(format!("WebWorker for {}", worker_url.serialize()), proc() { - + spawn_named(format!("WebWorker for {}", worker_url.serialize()), proc() { task_state::initialize(SCRIPT | IN_WORKER); let roots = RootCollection::new(); diff --git a/components/util/task.rs b/components/util/task.rs index 2962880aee0..5de066d5823 100644 --- a/components/util/task.rs +++ b/components/util/task.rs @@ -16,10 +16,6 @@ pub fn spawn_named<S: IntoMaybeOwned<'static>>(name: S, f: proc():Send) { }); } -pub fn spawn_named_native<S: IntoMaybeOwned<'static>>(name: S, f: proc():Send) { - spawn_named(name, f) -} - /// Arrange to send a particular message to a channel if the task fails. pub fn spawn_named_with_send_on_failure<T: Send>(name: &'static str, state: task_state::TaskState, diff --git a/components/util/workqueue.rs b/components/util/workqueue.rs index 8a224dd6e84..291ff40ca57 100644 --- a/components/util/workqueue.rs +++ b/components/util/workqueue.rs @@ -7,7 +7,7 @@ //! Data associated with queues is simply a pair of unsigned integers. It is expected that a //! higher-level API on top of this could allow safe fork-join parallelism. -use task::spawn_named_native; +use task::spawn_named; use task_state; use libc::funcs::posix88::unistd::usleep; @@ -248,7 +248,7 @@ impl<QueueData: Send, WorkData: Send> WorkQueue<QueueData, WorkData> { // Spawn threads. for (i, thread) in threads.into_iter().enumerate() { - spawn_named_native( + spawn_named( format!("{} worker {}/{}", task_name, i+1, thread_count), proc() { task_state::initialize(state | task_state::IN_WORKER); |