From a17479a8a143ae3d5ad9b19ef0d5e8dd1cc798ee Mon Sep 17 00:00:00 2001
From: Evan Lucas <evanlucas@me.com>
Date: Mon, 24 Aug 2015 19:28:06 -0500
Subject: [PATCH] src: check for --prof in ParseArgs

Previously, all of the cli arguments are parsed and then we loop
through the v8 arguments again. This patch removes the need for the
additional loop as we can check if the argument is --prof during the
initial ParseArgs.
---
 src/node.cc | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/node.cc b/src/node.cc
index 3c6441a6f2531e..425ee9d24a2dcf 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -3260,6 +3260,15 @@ static void ParseArgs(int* argc,
       // V8 option.  Pass through as-is.
       new_v8_argv[new_v8_argc] = arg;
       new_v8_argc += 1;
+
+      // TODO(bnoordhuis) Intercept --prof arguments and start the CPU profiler
+      // manually?  That would give us a little more control over its runtime
+      // behavior but it could also interfere with the user's intentions in ways
+      // we fail to anticipate.  Dillema.
+      if (!v8_is_profiling
+          && strncmp(arg, "--prof", sizeof("--prof") - 1) == 0) {
+        v8_is_profiling = true;
+      }
     }
 
     memcpy(new_exec_argv + new_exec_argc,
@@ -3688,17 +3697,6 @@ void Init(int* argc,
   const char** v8_argv;
   ParseArgs(argc, argv, exec_argc, exec_argv, &v8_argc, &v8_argv);
 
-  // TODO(bnoordhuis) Intercept --prof arguments and start the CPU profiler
-  // manually?  That would give us a little more control over its runtime
-  // behavior but it could also interfere with the user's intentions in ways
-  // we fail to anticipate.  Dillema.
-  for (int i = 1; i < v8_argc; ++i) {
-    if (strncmp(v8_argv[i], "--prof", sizeof("--prof") - 1) == 0) {
-      v8_is_profiling = true;
-      break;
-    }
-  }
-
 #if defined(NODE_HAVE_I18N_SUPPORT)
   if (icu_data_dir == nullptr) {
     // if the parameter isn't given, use the env variable.