Index: samples/lineprocessor.cc |
diff --git a/samples/lineprocessor.cc b/samples/lineprocessor.cc |
index 23e02142691dd1541b04c34d8fc2fb20717e069e..26e787f2b7d0d3ce2c886b96dea5aac8d5068719 100644 |
--- a/samples/lineprocessor.cc |
+++ b/samples/lineprocessor.cc |
@@ -25,19 +25,11 @@ |
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
- |
-// This controls whether this sample is compiled with debugger support. |
-// You may trace its usages in source text to see what parts of program |
-// are responsible for debugging support. |
-// Note that V8 itself should be compiled with enabled debugger support |
-// to have it all working. |
-#define SUPPORT_DEBUGGING |
- |
#include <v8.h> |
-#ifdef SUPPORT_DEBUGGING |
+#ifdef ENABLE_DEBUGGER_SUPPORT |
#include <v8-debug.h> |
-#endif |
+#endif // ENABLE_DEBUGGER_SUPPORT |
#include <fcntl.h> |
#include <string.h> |
@@ -116,7 +108,7 @@ bool RunCppCycle(v8::Handle<v8::Script> script, v8::Local<v8::Context> context, |
bool report_exceptions); |
-#ifdef SUPPORT_DEBUGGING |
+#ifdef ENABLE_DEBUGGER_SUPPORT |
v8::Persistent<v8::Context> debug_message_context; |
void DispatchDebugMessages() { |
@@ -135,7 +127,7 @@ void DispatchDebugMessages() { |
v8::Debug::ProcessDebugMessages(); |
} |
-#endif |
+#endif // ENABLE_DEBUGGER_SUPPORT |
int RunMain(int argc, char* argv[]) { |
@@ -146,11 +138,11 @@ int RunMain(int argc, char* argv[]) { |
v8::Handle<v8::Value> script_name(NULL); |
int script_param_counter = 0; |
-#ifdef SUPPORT_DEBUGGING |
+#ifdef ENABLE_DEBUGGER_SUPPORT |
int port_number = -1; |
bool wait_for_connection = false; |
bool support_callback = false; |
-#endif |
+#endif // ENABLE_DEBUGGER_SUPPORT |
MainCycleType cycle_type = CycleInCpp; |
@@ -164,7 +156,7 @@ int RunMain(int argc, char* argv[]) { |
cycle_type = CycleInCpp; |
} else if (strcmp(str, "--main-cycle-in-js") == 0) { |
cycle_type = CycleInJs; |
-#ifdef SUPPORT_DEBUGGING |
+#ifdef ENABLE_DEBUGGER_SUPPORT |
} else if (strcmp(str, "--callback") == 0) { |
support_callback = true; |
} else if (strcmp(str, "--wait-for-connection") == 0) { |
@@ -172,7 +164,7 @@ int RunMain(int argc, char* argv[]) { |
} else if (strcmp(str, "-p") == 0 && i + 1 < argc) { |
port_number = atoi(argv[i + 1]); // NOLINT |
i++; |
-#endif |
+#endif // ENABLE_DEBUGGER_SUPPORT |
} else if (strncmp(str, "--", 2) == 0) { |
printf("Warning: unknown flag %s.\nTry --help for options\n", str); |
} else if (strcmp(str, "-e") == 0 && i + 1 < argc) { |
@@ -219,7 +211,7 @@ int RunMain(int argc, char* argv[]) { |
// Enter the newly created execution environment. |
v8::Context::Scope context_scope(context); |
-#ifdef SUPPORT_DEBUGGING |
+#ifdef ENABLE_DEBUGGER_SUPPORT |
debug_message_context = v8::Persistent<v8::Context>::New(context); |
v8::Locker locker; |
@@ -231,7 +223,7 @@ int RunMain(int argc, char* argv[]) { |
if (port_number != -1) { |
v8::Debug::EnableAgent("lineprocessor", port_number, wait_for_connection); |
} |
-#endif |
+#endif // ENABLE_DEBUGGER_SUPPORT |
bool report_exceptions = true; |
@@ -272,9 +264,9 @@ int RunMain(int argc, char* argv[]) { |
bool RunCppCycle(v8::Handle<v8::Script> script, v8::Local<v8::Context> context, |
bool report_exceptions) { |
-#ifdef SUPPORT_DEBUGGING |
+#ifdef ENABLE_DEBUGGER_SUPPORT |
v8::Locker lock; |
-#endif |
+#endif // ENABLE_DEBUGGER_SUPPORT |
v8::Handle<v8::String> fun_name = v8::String::New("ProcessLine"); |
v8::Handle<v8::Value> process_val = |
@@ -427,9 +419,9 @@ v8::Handle<v8::String> ReadLine() { |
char* res; |
{ |
-#ifdef SUPPORT_DEBUGGING |
+#ifdef ENABLE_DEBUGGER_SUPPORT |
v8::Unlocker unlocker; |
-#endif |
+#endif // ENABLE_DEBUGGER_SUPPORT |
res = fgets(buffer, kBufferSize, stdin); |
} |
if (res == NULL) { |