src: avoid manual memory management in inspector

Make the inspector code easier to reason about by restructuring it
to avoid manual memory allocation and copying as much as possible.

An amusing side effect is that it reduces the total amount of memory
used in the test suite.

Before:

    $ valgrind ./out/Release/cctest 2>&1 | grep 'total heap' | cut -c31-
    1,017 allocs, 1,017 frees, 21,695,456 allocated

After:

    $ valgrind ./out/Release/cctest 2>&1 | grep 'total heap' | cut -c31-
    869 allocs, 869 frees, 14,484,641 bytes allocated

PR-URL: https://github.com/nodejs/node/pull/7906
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>

1 files changed, 23 insertions, 5 deletions

diff --git a/src/inspector_socket.h b/src/inspector_socket.h
index 3e52762e71..5d3477b98c 100644
--- a/src/inspector_socket.h
+++ b/src/inspector_socket.h
@@ -4,6 +4,9 @@
 #include "http_parser.h"
 #include "uv.h"
 
+#include <string>
+#include <vector>
+
 enum inspector_handshake_event {
   kInspectorHandshakeUpgrading,
   kInspectorHandshakeUpgraded,
@@ -19,17 +22,32 @@ typedef void (*inspector_cb)(struct inspector_socket_s*, int);
 // the connection. inspector_write can be used from the callback.
 typedef bool (*handshake_cb)(struct inspector_socket_s*,
                              enum inspector_handshake_event state,
-                             const char* path);
+                             const std::string& path);
+
+struct http_parsing_state_s {
+  http_parser parser;
+  http_parser_settings parser_settings;
+  handshake_cb callback;
+  bool done;
+  bool parsing_value;
+  std::string ws_key;
+  std::string path;
+  std::string current_header;
+};
 
-struct http_parsing_state_s;
-struct ws_state_s;
+struct ws_state_s {
+  uv_alloc_cb alloc_cb;
+  uv_read_cb read_cb;
+  inspector_cb close_cb;
+  bool close_sent;
+  bool received_close;
+};
 
 struct inspector_socket_s {
   void* data;
   struct http_parsing_state_s* http_parsing_state;
   struct ws_state_s* ws_state;
-  char* buffer;
-  size_t buffer_size;
+  std::vector<char> buffer;
   size_t data_len;
   size_t last_read_end;
   uv_tcp_t client;