src: move debug agent from deps/ to src/

bnoordhuis · bnoordhuis · commit 29d7fd6bb85f · 2014-11-03T12:08:04.000+01:00
There is not much point in keeping it a separate project because it
doesn't build standalone, plus it makes applying changes to core more
difficult because of the implicit dependency on header files in src/.
diff --git a/Makefile.build b/Makefile.build
@@ -233,7 +233,6 @@ NACL_ARCHES = nacl_ia32 nacl_x64
 GYPFILES = \
 	common.gypi \
 	deps/cares/cares.gyp \
-	deps/debugger-agent/debugger-agent.gyp \
 	deps/http_parser/http_parser.gyp \
 	deps/openssl/openssl.gyp \
 	deps/uv/uv.gyp \
diff --git a/deps/debugger-agent/debugger-agent.gyp b/deps/debugger-agent/debugger-agent.gyp
diff --git a/deps/debugger-agent/src/agent.h b/deps/debugger-agent/src/agent.h
diff --git a/lib/_debug_agent.js b/lib/_debug_agent.js
diff --git a/node.gyp b/node.gyp
@@ -16,6 +16,7 @@
     'node_v8_options%': '',
     'library_files': [
       'src/node.js',
+      'lib/_debug_agent.js',
       'lib/_debugger.js',
       'lib/_linklist.js',
       'lib/assert.js',
@@ -67,7 +68,6 @@
       'lib/util.js',
       'lib/vm.js',
       'lib/zlib.js',
-      'deps/debugger-agent/lib/_debugger_agent.js',
     ],
   },
 
@@ -78,7 +78,6 @@
 
       'dependencies': [
         'node_js2c#host',
-        'deps/debugger-agent/debugger-agent.gyp:debugger-agent',
       ],
 
       'include_dirs': [
@@ -89,6 +88,7 @@
       ],
 
       'sources': [
+        'src/debug-agent.cc',
         'src/fs_event_wrap.cc',
         'src/cares_wrap.cc',
         'src/handle_wrap.cc',
@@ -124,6 +124,7 @@
         'src/async-wrap-inl.h',
         'src/base-object.h',
         'src/base-object-inl.h',
+        'src/debug-agent.h',
         'src/env.h',
         'src/env-inl.h',
         'src/handle_wrap.h',
diff --git a/src/debug-agent.cc b/src/debug-agent.cc
@@ -19,8 +19,7 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#include "agent.h"
-#include "debugger-agent.h"
+#include "debug-agent.h"
 
 #include "node.h"
 #include "node_internals.h"  // ARRAY_SIZE
diff --git a/src/debug-agent.h b/src/debug-agent.h
@@ -19,21 +19,24 @@
 // OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
 // USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-#ifndef DEPS_DEBUGGER_AGENT_INCLUDE_DEBUGGER_AGENT_H_
-#define DEPS_DEBUGGER_AGENT_INCLUDE_DEBUGGER_AGENT_H_
+#ifndef SRC_DEBUG_AGENT_H_
+#define SRC_DEBUG_AGENT_H_
 
 #include "uv.h"
 #include "v8.h"
 #include "v8-debug.h"
+#include "queue.h"
 
-namespace node {
+#include <string.h>
 
-// Forward declaration
+// Forward declaration to break recursive dependency chain with src/env.h.
+namespace node {
 class Environment;
+}  // namespace node
 
+namespace node {
 namespace debugger {
 
-// Forward declaration
 class AgentMessage;
 
 class Agent {
@@ -97,13 +100,38 @@ class Agent {
   uv_loop_t child_loop_;
   v8::Persistent<v8::Object> api_;
 
-  // QUEUE
-  void* messages_[2];
+  QUEUE messages_;
 
   DispatchHandler dispatch_handler_;
 };
 
+class AgentMessage {
+ public:
+  AgentMessage(uint16_t* val, int length) : length_(length) {
+    if (val == NULL) {
+      data_ = val;
+    } else {
+      data_ = new uint16_t[length];
+      memcpy(data_, val, length * sizeof(*data_));
+    }
+  }
+
+  ~AgentMessage() {
+    delete[] data_;
+    data_ = NULL;
+  }
+
+  inline const uint16_t* data() const { return data_; }
+  inline int length() const { return length_; }
+
+  QUEUE member;
+
+ private:
+  uint16_t* data_;
+  int length_;
+};
+
 }  // namespace debugger
 }  // namespace node
 
-#endif  // DEPS_DEBUGGER_AGENT_INCLUDE_DEBUGGER_AGENT_H_
+#endif  // SRC_DEBUG_AGENT_H_
diff --git a/src/env.h b/src/env.h
@@ -23,12 +23,12 @@
 #define SRC_ENV_H_
 
 #include "ares.h"
+#include "debug-agent.h"
 #include "tree.h"
 #include "util.h"
 #include "uv.h"
 #include "v8.h"
 #include "queue.h"
-#include "debugger-agent.h"
 
 #include <stdint.h>
 
diff --git a/src/node.js b/src/node.js
@@ -85,7 +85,7 @@
 
     } else if (process.argv[1] == '--debug-agent') {
       // Start the debugger agent
-      var d = NativeModule.require('_debugger_agent');
+      var d = NativeModule.require('_debug_agent');
       d.start();
 
     } else if (process._eval != null) {
