inspector: patch C++ debug options instead of process._breakFirstLine

joyeecheung · targos · commit 1b45704c1974 · 2019-03-30T14:44:58.000+01:00
Instead of patching process._breakFirstLine to inform the JS land to wait for the debugger, check that the JS land has not yet serialized the options and then patch the debug options from C++. The changes will be carried into JS later during option serialization. PR-URL: #26602 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Eugene Ostroukhov <eostroukhov@google.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
diff --git a/src/env-inl.h b/src/env-inl.h
@@ -684,6 +684,14 @@ inline void Environment::set_has_run_bootstrapping_code(bool value) {
   has_run_bootstrapping_code_ = value;
 }
 
+inline bool Environment::has_serialized_options() const {
+  return has_serialized_options_;
+}
+
+inline void Environment::set_has_serialized_options(bool value) {
+  has_serialized_options_ = value;
+}
+
 inline bool Environment::is_main_thread() const {
   return flags_ & kIsMainThread;
 }
diff --git a/src/env.h b/src/env.h
@@ -887,6 +887,9 @@ class Environment {
   inline bool has_run_bootstrapping_code() const;
   inline void set_has_run_bootstrapping_code(bool has_run_bootstrapping_code);
 
+  inline bool has_serialized_options() const;
+  inline void set_has_serialized_options(bool has_serialized_options);
+
   static uint64_t AllocateThreadId();
   static constexpr uint64_t kNoThreadId = -1;
 
@@ -1104,6 +1107,8 @@ class Environment {
   std::unordered_map<std::string, uint64_t> performance_marks_;
 
   bool has_run_bootstrapping_code_ = false;
+  bool has_serialized_options_ = false;
+
   bool can_call_into_js_ = true;
   Flags flags_;
   uint64_t thread_id_;
diff --git a/src/inspector_agent.cc b/src/inspector_agent.cc
@@ -728,18 +728,12 @@ bool Agent::Start(const std::string& path,
     return false;
   }
 
-  // TODO(joyeecheung): we should not be using process as a global object
-  // to transport --inspect-brk. Instead, the JS land can get this through
-  // require('internal/options') since it should be set once CLI parsing
-  // is done.
+  // Patch the debug options to implement waitForDebuggerOnStart for
+  // the NodeWorker.enable method.
   if (wait_for_connect) {
-    HandleScope scope(parent_env_->isolate());
-    parent_env_->process_object()->DefineOwnProperty(
-        parent_env_->context(),
-        FIXED_ONE_BYTE_STRING(parent_env_->isolate(), "_breakFirstLine"),
-        True(parent_env_->isolate()),
-        static_cast<v8::PropertyAttribute>(v8::ReadOnly | v8::DontEnum))
-        .FromJust();
+    CHECK(!parent_env_->has_serialized_options());
+    debug_options_.EnableBreakFirstLine();
+    parent_env_->options()->get_debug_options()->EnableBreakFirstLine();
     client_->waitForFrontend();
   }
   return true;
diff --git a/src/node_options.cc b/src/node_options.cc
@@ -553,6 +553,7 @@ void GetOptions(const FunctionCallbackInfo<Value>& args) {
     return env->ThrowError(
         "Should not query options before bootstrapping is done");
   }
+  env->set_has_serialized_options(true);
 
   Isolate* isolate = env->isolate();
   Local<Context> context = env->context();
diff --git a/src/node_options.h b/src/node_options.h
@@ -85,6 +85,12 @@ class DebugOptions : public Options {
     return deprecated_debug && !inspector_enabled;
   }
 
+  // Used to patch the options as if --inspect-brk is passed.
+  void EnableBreakFirstLine() {
+    inspector_enabled = true;
+    break_first_line = true;
+  }
+
   bool wait_for_connect() const {
     return break_first_line || break_node_first_line;
   }

Original file line number	Diff line number	Diff line change
`@@ -684,6 +684,14 @@ inline void Environment::set_has_run_bootstrapping_code(bool value) {`
`684`	`684`	`has_run_bootstrapping_code_ = value;`
`685`	`685`	`}`
`686`	`686`
	`687`	`+inline bool Environment::has_serialized_options() const {`
	`688`	`+ return has_serialized_options_;`
	`689`	`+}`
	`690`	`+`
	`691`	`+inline void Environment::set_has_serialized_options(bool value) {`
	`692`	`+ has_serialized_options_ = value;`
	`693`	`+}`
	`694`	`+`
`687`	`695`	`inline bool Environment::is_main_thread() const {`
`688`	`696`	`return flags_ & kIsMainThread;`
`689`	`697`	`}`
Original file line number	Diff line number	Diff line change
`@@ -553,6 +553,7 @@ void GetOptions(const FunctionCallbackInfo<Value>& args) {`
`553`	`553`	`return env->ThrowError(`
`554`	`554`	`"Should not query options before bootstrapping is done");`
`555`	`555`	`}`
	`556`	`+ env->set_has_serialized_options(true);`
`556`	`557`
`557`	`558`	`Isolate* isolate = env->isolate();`
`558`	`559`	`Local<Context> context = env->context();`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,12 @@ class DebugOptions : public Options {`
`85`	`85`	`return deprecated_debug && !inspector_enabled;`
`86`	`86`	`}`
`87`	`87`
	`88`	`+ // Used to patch the options as if --inspect-brk is passed.`
	`89`	`+ void EnableBreakFirstLine() {`
	`90`	`+ inspector_enabled = true;`
	`91`	`+ break_first_line = true;`
	`92`	`+ }`
	`93`	`+`
`88`	`94`	`bool wait_for_connect() const {`
`89`	`95`	`return break_first_line \|\| break_node_first_line;`
`90`	`96`	`}`