From 714820acea0ee46dbcae2463eeed651ba60a9755 Mon Sep 17 00:00:00 2001
From: Rich Trott <rtrott@gmail.com>
Date: Fri, 15 Jun 2018 16:12:34 -0700
Subject: [PATCH] Revert "workers,trace_events: set thread name for workers"

This reverts commit a24b691c6cfb31bc77f5d0cd64596106dc21d890.
---
 src/env-inl.h                                 |  4 +--
 src/env.h                                     |  6 ++--
 src/node_worker.cc                            | 15 ++-------
 src/node_worker.h                             |  2 +-
 .../test-trace-events-worker-metadata.js      | 33 -------------------
 5 files changed, 9 insertions(+), 51 deletions(-)
 delete mode 100644 test/parallel/test-trace-events-worker-metadata.js

diff --git a/src/env-inl.h b/src/env-inl.h
index bbb80c6f7ae916..c84fdf0bb8215b 100644
--- a/src/env-inl.h
+++ b/src/env-inl.h
@@ -598,11 +598,11 @@ inline bool Environment::is_main_thread() const {
   return thread_id_ == 0;
 }
 
-inline uint64_t Environment::thread_id() const {
+inline double Environment::thread_id() const {
   return thread_id_;
 }
 
-inline void Environment::set_thread_id(uint64_t id) {
+inline void Environment::set_thread_id(double id) {
   thread_id_ = id;
 }
 
diff --git a/src/env.h b/src/env.h
index 786f0846f4ae1a..1a96abe106a752 100644
--- a/src/env.h
+++ b/src/env.h
@@ -726,8 +726,8 @@ class Environment {
   bool is_stopping_worker() const;
 
   inline bool is_main_thread() const;
-  inline uint64_t thread_id() const;
-  inline void set_thread_id(uint64_t id);
+  inline double thread_id() const;
+  inline void set_thread_id(double id);
   inline worker::Worker* worker_context() const;
   inline void set_worker_context(worker::Worker* context);
   inline void add_sub_worker_context(worker::Worker* context);
@@ -881,7 +881,7 @@ class Environment {
   std::unordered_map<std::string, uint64_t> performance_marks_;
 
   bool can_call_into_js_ = true;
-  uint64_t thread_id_ = 0;
+  double thread_id_ = 0;
   std::unordered_set<worker::Worker*> sub_worker_contexts_;
 
 
diff --git a/src/node_worker.cc b/src/node_worker.cc
index c628e6295c46af..320b6703d40d21 100644
--- a/src/node_worker.cc
+++ b/src/node_worker.cc
@@ -9,8 +9,6 @@
 #include "async_wrap.h"
 #include "async_wrap-inl.h"
 
-#include <string>
-
 using v8::ArrayBuffer;
 using v8::Context;
 using v8::Function;
@@ -32,7 +30,7 @@ namespace worker {
 
 namespace {
 
-uint64_t next_thread_id = 1;
+double next_thread_id = 1;
 Mutex next_thread_id_mutex;
 
 }  // anonymous namespace
@@ -46,8 +44,7 @@ Worker::Worker(Environment* env, Local<Object> wrap)
   }
   wrap->Set(env->context(),
             env->thread_id_string(),
-            Number::New(env->isolate(),
-                        static_cast<double>(thread_id_))).FromJust();
+            Number::New(env->isolate(), thread_id_)).FromJust();
 
   // Set up everything that needs to be set up in the parent environment.
   parent_port_ = MessagePort::New(env, env->context());
@@ -115,11 +112,6 @@ bool Worker::is_stopped() const {
 }
 
 void Worker::Run() {
-  std::string name = "WorkerThread ";
-  name += std::to_string(thread_id_);
-  TRACE_EVENT_METADATA1(
-      "__metadata", "thread_name", "name",
-      TRACE_STR_COPY(name.c_str()));
   MultiIsolatePlatform* platform = isolate_data_->platform();
   CHECK_NE(platform, nullptr);
 
@@ -426,8 +418,7 @@ void InitWorker(Local<Object> target,
   auto thread_id_string = FIXED_ONE_BYTE_STRING(env->isolate(), "threadId");
   target->Set(env->context(),
               thread_id_string,
-              Number::New(env->isolate(),
-                          static_cast<double>(env->thread_id()))).FromJust();
+              Number::New(env->isolate(), env->thread_id())).FromJust();
 }
 
 }  // anonymous namespace
diff --git a/src/node_worker.h b/src/node_worker.h
index d802b5cfefdf77..0a98d2f11ef00f 100644
--- a/src/node_worker.h
+++ b/src/node_worker.h
@@ -62,7 +62,7 @@ class Worker : public AsyncWrap {
 
   bool thread_joined_ = true;
   int exit_code_ = 0;
-  uint64_t thread_id_ = -1;
+  double thread_id_ = -1;
 
   std::unique_ptr<MessagePortData> child_port_data_;
 
diff --git a/test/parallel/test-trace-events-worker-metadata.js b/test/parallel/test-trace-events-worker-metadata.js
deleted file mode 100644
index e1ae323e0c6e70..00000000000000
--- a/test/parallel/test-trace-events-worker-metadata.js
+++ /dev/null
@@ -1,33 +0,0 @@
-// Flags: --experimental-worker
-'use strict';
-const common = require('../common');
-const assert = require('assert');
-const cp = require('child_process');
-const fs = require('fs');
-const { isMainThread } = require('worker_threads');
-
-if (isMainThread) {
-  const CODE = 'const { Worker } = require(\'worker_threads\'); ' +
-               `new Worker('${__filename}')`;
-  const FILE_NAME = 'node_trace.1.log';
-  const tmpdir = require('../common/tmpdir');
-  tmpdir.refresh();
-  process.chdir(tmpdir.path);
-
-  const proc = cp.spawn(process.execPath,
-                        [ '--experimental-worker',
-                          '--trace-event-categories', 'node',
-                          '-e', CODE ]);
-  proc.once('exit', common.mustCall(() => {
-    assert(common.fileExists(FILE_NAME));
-    fs.readFile(FILE_NAME, common.mustCall((err, data) => {
-      const traces = JSON.parse(data.toString()).traceEvents;
-      assert(traces.length > 0);
-      assert(traces.some((trace) =>
-        trace.cat === '__metadata' && trace.name === 'thread_name' &&
-          trace.args.name === 'WorkerThread 1'));
-    }));
-  }));
-} else {
-  // Do nothing here.
-}