src: externalize additional src/*.cc files

nodejs · jasnell · Jan 7, 2016 · Jan 8, 2016 · Jan 8, 2016 · Jan 8, 2016
commit a5d97de810728c4e7791a127f7b97420f453fd6a
diff --git a/src/messages/en/messages.h b/src/messages/en/messages.h
@@ -9,6 +9,7 @@
 // The messages used in src/*.cc
 // These are used only within the Node.js native source
 
+#define STR_CONVERT_ARGS_TO_UTF8_FAIL "Could not convert arguments to utf8."
 #define STR_CALLBACK_NOT_ASSIGNED                                         \
         "init callback is not assigned to a function"
 #define STR_HOOKSSHOULDNOTBESET                                           \
@@ -200,6 +201,18 @@
 #define STR_MTIME_REQUIRED "mtime required"
 #define STR_ATIME_NUMBER "atime must be a number"
 #define STR_MTIME_NUMBER "mtime must be a number"
+#define STR_OBJ_OBJECT "obj must be an object"
+#define STR_NAME_STRING "name must be a string"
+#define STR_V8_FLAG_REQUIRED "v8 flag is required"
+#define STR_V8_FLAG_STRING "v8 flag must be a string"
+#define STR_UNEXPECTED_EOF "unexpected end of file"
+#define STR_MISSING_DICTIONARY "Missing dictionary"
+#define STR_BAD_DICTIONARY "Bad dictionary"
+#define STR_ZLIB_ERROR "Zlib error"
+#define STR_INIT_ERROR "Init error"
+#define STR_FAILED_TO_SET_DICTIONARY "Failed to set dictionary"
+#define STR_FAILED_TO_SET_PARAMETERS "Failed to set parameters"
+#define STR_FAILED_TO_RESET_STREAM "Failed to reset stream"
 
 // The messages used in lib/*.js
 // These are exposes as constants on require('internal/messages')

diff --git a/src/node_lttng.cc b/src/node_lttng.cc
@@ -37,76 +37,72 @@ using v8::Object;
 using v8::String;
 using v8::Value;
 
-#define SLURP_STRING(obj, member, valp) \
-  if (!(obj)->IsObject()) { \
-    return env->ThrowError( \
-        "expected object for " #obj " to contain string member " #member); \
-  } \
-  node::Utf8Value _##member(env->isolate(), \
-      obj->Get(OneByteString(env->isolate(), #member))); \
-  if ((*(const char **)valp = *_##member) == nullptr) \
+#define SLURP_STRING(obj, member, valp)                                       \
+  if (!(obj)->IsObject()) {                                                   \
+    return VTHROWI18NERROR(env, EXPECTED_OBJECT_TO_CONTAIN_TYPED_MEMBER,      \
+                           #obj, "string", #member);                          \
+  }                                                                           \
+  node::Utf8Value _##member(env->isolate(),                                   \
+      obj->Get(OneByteString(env->isolate(), #member)));                      \
+  if ((*(const char **)valp = *_##member) == nullptr)                         \
     *(const char **)valp = "<unknown>";
 
-#define SLURP_INT(obj, member, valp) \
-  if (!(obj)->IsObject()) { \
-    return env->ThrowError( \
-      "expected object for " #obj " to contain integer member " #member); \
-  } \
-  *valp = obj->Get(OneByteString(env->isolate(), #member)) \
+#define SLURP_INT(obj, member, valp)                                          \
+  if (!(obj)->IsObject()) {                                                   \
+    return VTHROWI18NERROR(env, EXPECTED_OBJECT_TO_CONTAIN_TYPED_MEMBER,      \
+                           #obj, "integer", #member);                         \
+  }                                                                           \
+  *valp = obj->Get(OneByteString(env->isolate(), #member))                    \
       ->ToInteger(env->isolate())->Value();
 
-#define SLURP_OBJECT(obj, member, valp) \
-  if (!(obj)->IsObject()) { \
-    return env->ThrowError( \
-      "expected object for " #obj " to contain object member " #member); \
-  } \
+#define SLURP_OBJECT(obj, member, valp)                                       \
+  if (!(obj)->IsObject()) {                                                   \
+    return VTHROWI18NERROR(env, EXPECTED_OBJECT_TO_CONTAIN_TYPED_MEMBER,      \
+                           #obj, "object", #member);                          \
+  }                                                                           \
   *valp = Local<Object>::Cast(obj->Get(OneByteString(env->isolate(), #member)));
 
-#define SLURP_CONNECTION(arg, conn) \
-  if (!(arg)->IsObject()) { \
-    return env->ThrowError( \
-      "expected argument " #arg " to be a connection object"); \
-  } \
-  node_lttng_connection_t conn; \
-  Local<Object> _##conn = Local<Object>::Cast(arg); \
-  Local<Value> _handle = \
-      (_##conn)->Get(FIXED_ONE_BYTE_STRING(env->isolate(), "_handle")); \
-  if (_handle->IsObject()) { \
-    SLURP_INT(_handle.As<Object>(), fd, &conn.fd); \
-  } else { \
-    conn.fd = -1; \
-  } \
-  SLURP_STRING(_##conn, remoteAddress, &conn.remote); \
-  SLURP_INT(_##conn, remotePort, &conn.port); \
+#define SLURP_CONNECTION(arg, conn)                                           \
+  if (!(arg)->IsObject()) {                                                   \
+    return VTHROWI18NERROR(env, EXPECTED_CONNECTION_OBJECT, #arg);            \
+  }                                                                           \
+  node_lttng_connection_t conn;                                               \
+  Local<Object> _##conn = Local<Object>::Cast(arg);                           \
+  Local<Value> _handle =                                                      \
+      (_##conn)->Get(FIXED_ONE_BYTE_STRING(env->isolate(), "_handle"));       \
+  if (_handle->IsObject()) {                                                  \
+    SLURP_INT(_handle.As<Object>(), fd, &conn.fd);                            \
+  } else {                                                                    \
+    conn.fd = -1;                                                             \
+  }                                                                           \
+  SLURP_STRING(_##conn, remoteAddress, &conn.remote);                         \
+  SLURP_INT(_##conn, remotePort, &conn.port);                                 \
   SLURP_INT(_##conn, bufferSize, &conn.buffered);
 
-#define SLURP_CONNECTION_HTTP_CLIENT(arg, conn) \
-  if (!(arg)->IsObject()) { \
-    return env->ThrowError( \
-      "expected argument " #arg " to be a connection object"); \
-  } \
-  node_lttng_connection_t conn; \
-  Local<Object> _##conn = Local<Object>::Cast(arg); \
-  SLURP_INT(_##conn, fd, &conn.fd); \
-  SLURP_STRING(_##conn, host, &conn.remote); \
-  SLURP_INT(_##conn, port, &conn.port); \
+#define SLURP_CONNECTION_HTTP_CLIENT(arg, conn)                               \
+  if (!(arg)->IsObject()) {                                                   \
+    return VTHROWI18NERROR(env, EXPECTED_CONNECTION_OBJECT, #arg);            \
+  }                                                                           \
+  node_lttng_connection_t conn;                                               \
+  Local<Object> _##conn = Local<Object>::Cast(arg);                           \
+  SLURP_INT(_##conn, fd, &conn.fd);                                           \
+  SLURP_STRING(_##conn, host, &conn.remote);                                  \
+  SLURP_INT(_##conn, port, &conn.port);                                       \
   SLURP_INT(_##conn, bufferSize, &conn.buffered);
 
-#define SLURP_CONNECTION_HTTP_CLIENT_RESPONSE(arg0, arg1, conn) \
-  if (!(arg0)->IsObject()) { \
-    return env->ThrowError( \
-      "expected argument " #arg0 " to be a connection object"); \
-  } \
-  if (!(arg1)->IsObject()) { \
-    return env->ThrowError( \
-      "expected argument " #arg1 " to be a connection object"); \
-  } \
-  node_lttng_connection_t conn; \
-  Local<Object> _##conn = Local<Object>::Cast(arg0); \
-  SLURP_INT(_##conn, fd, &conn.fd); \
-  SLURP_INT(_##conn, bufferSize, &conn.buffered); \
-  _##conn = Local<Object>::Cast(arg1); \
-  SLURP_STRING(_##conn, host, &conn.remote); \
+#define SLURP_CONNECTION_HTTP_CLIENT_RESPONSE(arg0, arg1, conn)               \
+  if (!(arg0)->IsObject()) {                                                  \
+    return VTHROWI18NERROR(env, EXPECTED_CONNECTION_OBJECT, #arg0);           \
+  }                                                                           \
+  if (!(arg1)->IsObject()) {                                                  \
+    return VTHROWI18NERROR(env, EXPECTED_CONNECTION_OBJECT, #arg1);           \
+  }                                                                           \
+  node_lttng_connection_t conn;                                               \
+  Local<Object> _##conn = Local<Object>::Cast(arg0);                          \
+  SLURP_INT(_##conn, fd, &conn.fd);                                           \
+  SLURP_INT(_##conn, bufferSize, &conn.buffered);                             \
+  _##conn = Local<Object>::Cast(arg1);                                        \
+  SLURP_STRING(_##conn, host, &conn.remote);                                  \
   SLURP_INT(_##conn, port, &conn.port);
 
 
@@ -148,8 +144,8 @@ void LTTNG_HTTP_SERVER_REQUEST(const FunctionCallbackInfo<Value>& args) {
   SLURP_OBJECT(arg0, headers, &headers);
 
   if (!(headers)->IsObject()) {
-    return env->ThrowError(
-      "expected object for request to contain string member headers");
+    return THROWI18NERROR(env,
+      EXPECTED_OBJECT_FOR_REQUEST_TO_CONTAIN_STRING_HEADERS);
   }
 
   Local<Value> strfwdfor = headers->Get(env->x_forwarded_string());

diff --git a/src/node_main.cc b/src/node_main.cc
@@ -16,7 +16,7 @@ int wmain(int argc, wchar_t *wargv[]) {
                                      nullptr);
     if (size == 0) {
       // This should never happen.
-      fprintf(stderr, "Could not convert arguments to utf8.");
+      fprintf(stderr, STR_CONVERT_ARGS_TO_UTF8_FAIL);
       exit(1);
     }
     // Do the actual conversion
@@ -31,7 +31,7 @@ int wmain(int argc, wchar_t *wargv[]) {
                                        nullptr);
     if (result == 0) {
       // This should never happen.
-      fprintf(stderr, "Could not convert arguments to utf8.");
+      fprintf(stderr, STR_CONVERT_ARGS_TO_UTF8_FAIL);
       exit(1);
     }
   }

diff --git a/src/node_util.cc b/src/node_util.cc
@@ -41,10 +41,10 @@ static void GetHiddenValue(const FunctionCallbackInfo<Value>& args) {
   Environment* env = Environment::GetCurrent(args);
 
   if (!args[0]->IsObject())
-    return env->ThrowTypeError("obj must be an object");
+    return THROWI18NTYPEERROR(env, OBJ_OBJECT);
 
   if (!args[1]->IsString())
-    return env->ThrowTypeError("name must be a string");
+    return THROWI18NTYPEERROR(env, NAME_STRING);
 
   Local<Object> obj = args[0].As<Object>();
   Local<String> name = args[1].As<String>();
@@ -56,10 +56,10 @@ static void SetHiddenValue(const FunctionCallbackInfo<Value>& args) {
   Environment* env = Environment::GetCurrent(args);
 
   if (!args[0]->IsObject())
-    return env->ThrowTypeError("obj must be an object");
+    return THROWI18NTYPEERROR(env, OBJ_OBJECT);
 
   if (!args[1]->IsString())
-    return env->ThrowTypeError("name must be a string");
+    return THROWI18NTYPEERROR(env, NAME_STRING);
 
   Local<Object> obj = args[0].As<Object>();
   Local<String> name = args[1].As<String>();

diff --git a/src/node_v8.cc b/src/node_v8.cc
@@ -49,9 +49,9 @@ void SetFlagsFromString(const FunctionCallbackInfo<Value>& args) {
   Environment* env = Environment::GetCurrent(args);
 
   if (args.Length() < 1)
-    return env->ThrowTypeError("v8 flag is required");
+    return THROWI18NTYPEERROR(env, V8_FLAG_REQUIRED);
   if (!args[0]->IsString())
-    return env->ThrowTypeError("v8 flag must be a string");
+    return THROWI18NTYPEERROR(env, V8_FLAG_STRING);
 
   String::Utf8Value flags(args[0]);
   V8::SetFlagsFromString(*flags, flags.length());

diff --git a/src/node_zlib.cc b/src/node_zlib.cc
@@ -273,21 +273,21 @@ class ZCtx : public AsyncWrap {
     case Z_OK:
     case Z_BUF_ERROR:
       if (ctx->strm_.avail_out != 0 && ctx->flush_ == Z_FINISH) {
-        ZCtx::Error(ctx, "unexpected end of file");
+        ZCtx::Error(ctx, STR_UNEXPECTED_EOF);
         return false;
       }
     case Z_STREAM_END:
       // normal statuses, not fatal
       break;
     case Z_NEED_DICT:
       if (ctx->dictionary_ == nullptr)
-        ZCtx::Error(ctx, "Missing dictionary");
+        ZCtx::Error(ctx, STR_MISSING_DICTIONARY);
       else
-        ZCtx::Error(ctx, "Bad dictionary");
+        ZCtx::Error(ctx, STR_BAD_DICTIONARY);
       return false;
     default:
       // something else.
-      ZCtx::Error(ctx, "Zlib error");
+      ZCtx::Error(ctx, STR_ZLIB_ERROR);
       return false;
     }
 
@@ -353,12 +353,12 @@ class ZCtx : public AsyncWrap {
     Environment* env = Environment::GetCurrent(args);
 
     if (args.Length() < 1 || !args[0]->IsInt32()) {
-      return env->ThrowTypeError("Bad argument");
+      return THROWI18NTYPEERROR(env, BAD_ARGUMENT);
     }
     node_zlib_mode mode = static_cast<node_zlib_mode>(args[0]->Int32Value());
 
     if (mode < DEFLATE || mode > UNZIP) {
-      return env->ThrowTypeError("Bad argument");
+      return THROWI18NTYPEERROR(env, BAD_ARGUMENT);
     }
 
     new ZCtx(env, args.This(), mode);
@@ -468,7 +468,7 @@ class ZCtx : public AsyncWrap {
     }
 
     if (ctx->err_ != Z_OK) {
-      ZCtx::Error(ctx, "Init error");
+      ZCtx::Error(ctx, STR_INIT_ERROR);
     }
 
 
@@ -497,7 +497,7 @@ class ZCtx : public AsyncWrap {
     }
 
     if (ctx->err_ != Z_OK) {
-      ZCtx::Error(ctx, "Failed to set dictionary");
+      ZCtx::Error(ctx, STR_FAILED_TO_SET_DICTIONARY);
     }
   }
 
@@ -514,7 +514,7 @@ class ZCtx : public AsyncWrap {
     }
 
     if (ctx->err_ != Z_OK && ctx->err_ != Z_BUF_ERROR) {
-      ZCtx::Error(ctx, "Failed to set parameters");
+      ZCtx::Error(ctx, STR_FAILED_TO_SET_PARAMETERS);
     }
   }
 
@@ -535,7 +535,7 @@ class ZCtx : public AsyncWrap {
     }
 
     if (ctx->err_ != Z_OK) {
-      ZCtx::Error(ctx, "Failed to reset stream");
+      ZCtx::Error(ctx, STR_FAILED_TO_RESET_STREAM);
     }
   }