removed some unnecessary stuff from d8's initialization

src/d8.cc

 // Copyright 2009 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 472 matching lines @@
 
 void Shell::AddHistogramSample(void* histogram, int sample) {
   Counter* counter = reinterpret_cast<Counter*>(histogram);
   counter->AddSample(sample);
 }
 
 void Shell::InstallUtilityScript() {
   Locker lock;
   HandleScope scope;
   Context::Scope utility_scope(utility_context_);
+
+#ifdef ENABLE_DEBUGGER_SUPPORT
+  // Install the debugger object in the utility scope
+  i::Debug* debug = i::Isolate::Current()->debug();
+  debug->Load();
+  i::Handle<i::JSObject> js_debug
+      = i::Handle<i::JSObject>(debug->debug_context()->global());
+  utility_context_->Global()->Set(String::New("$debug"),
+                                  Utils::ToLocal(js_debug));
+#endif
+

[Yang, 2011/06/21 02:25:55]

This method is called only when using interactive shell, therefore expose debug
as $debug object in the utility context here.

On a side note: how do you access an object with an identifier such as "$debug"?

[Søren Thygesen Gjesse, 2011/06/21 07:31:06]

$debug is a legal identifier, see d8.js where it is used.

   // Run the d8 shell utility script in the utility context
   int source_index = i::NativesCollection<i::D8>::GetIndex("d8");
   i::Vector<const char> shell_source =
       i::NativesCollection<i::D8>::GetRawScriptSource(source_index);
   i::Vector<const char> shell_source_name =
       i::NativesCollection<i::D8>::GetScriptName(source_index);
   Handle<String> source = String::New(shell_source.start(),
       shell_source.length());
   Handle<String> name = String::New(shell_source_name.start(),
       shell_source_name.length());
@@ skipping 75 matching lines @@
   global_template->Set(String::New("lol_is_enabled"), Boolean::New(false));
 #endif
 
   Handle<ObjectTemplate> os_templ = ObjectTemplate::New();
   AddOSMethods(os_templ);
   global_template->Set(String::New("os"), os_templ);
 
   return global_template;
 }
 
-void Shell::Initialize() {
+void Shell::Initialize(bool shell) {

[Søren Thygesen Gjesse, 2011/06/21 07:31:06]

Rename shell to interactive?

 #ifdef COMPRESS_STARTUP_DATA_BZ2
   BZip2Decompressor startup_data_decompressor;
   int bz2_result = startup_data_decompressor.Decompress();
   if (bz2_result != BZ_OK) {
     fprintf(stderr, "bzip error code: %d\n", bz2_result);
     exit(1);
   }
 #endif
 
   Shell::counter_map_ = new CounterMap();
   // Set up counters
   if (i::StrLength(i::FLAG_map_counters) != 0)
     MapCounters(i::FLAG_map_counters);
   if (i::FLAG_dump_counters) {
     V8::SetCounterFunction(LookupCounter);
     V8::SetCreateHistogramFunction(CreateHistogram);
     V8::SetAddHistogramSampleFunction(AddHistogramSample);
   }
-
-  // Initialize the global objects
-  HandleScope scope;
-  Handle<ObjectTemplate> global_template = CreateGlobalTemplate();
-
-  utility_context_ = Context::New(NULL, global_template);
-  utility_context_->SetSecurityToken(Undefined());
-  Context::Scope utility_scope(utility_context_);
-
-#ifdef ENABLE_DEBUGGER_SUPPORT
-  // Install the debugger object in the utility scope
-  i::Debug* debug = i::Isolate::Current()->debug();
-  debug->Load();
-  i::Handle<i::JSObject> js_debug
-      = i::Handle<i::JSObject>(debug->debug_context()->global());
-  utility_context_->Global()->Set(String::New("$debug"),
-                                  Utils::ToLocal(js_debug));
-#endif
+  if (shell) {
+    Locker lock;
+    HandleScope scope;
+    Handle<ObjectTemplate> global_template = CreateGlobalTemplate();
+    utility_context_ = Context::New(NULL, global_template);
+    utility_context_->SetSecurityToken(Undefined());
+  }

[Yang, 2011/06/21 02:25:55]

Only initialize utility context if an interactive shell is expected.

 }
 
 
 void Shell::RenewEvaluationContext() {
   // Initialize the global objects
   HandleScope scope;
   Handle<ObjectTemplate> global_template = CreateGlobalTemplate();
 
   // (Re-)create the evaluation context
   if (!evaluation_context_.IsEmpty()) {
     evaluation_context_.Dispose();
   }
   evaluation_context_ = Context::New(NULL, global_template);
   evaluation_context_->SetSecurityToken(Undefined());

[Søren Thygesen Gjesse, 2011/06/21 07:31:06]

If we don't set the security token for the evaluation context can't we then
avoid checking for flag --expose-debug-as below and changing the security
context of the debugger - at lease in the case of running non-interactively?

For the interactive case we might need to do something to set the security token
to the same value in all the contexts.

 
-  Context::Scope utility_scope(utility_context_);
+  Context::Scope utility_scope(evaluation_context_);
+
   i::JSArguments js_args = i::FLAG_js_arguments;
   i::Handle<i::FixedArray> arguments_array =
       FACTORY->NewFixedArray(js_args.argc());
   for (int j = 0; j < js_args.argc(); j++) {
     i::Handle<i::String> arg =
         FACTORY->NewStringFromUtf8(i::CStrVector(js_args[j]));
     arguments_array->set(j, *arg);
   }
   i::Handle<i::JSArray> arguments_jsarray =
       FACTORY->NewJSArrayWithElements(arguments_array);
   evaluation_context_->Global()->Set(String::New("arguments"),
                                      Utils::ToLocal(arguments_jsarray));
 
 #ifdef ENABLE_DEBUGGER_SUPPORT
-  i::Debug* debug = i::Isolate::Current()->debug();
-  debug->Load();
-
-  // Set the security token of the debug context to allow access.
-  debug->debug_context()->set_security_token(HEAP->undefined_value());
+  if (i::FLAG_expose_debug_as != NULL) {

[Yang, 2011/06/21 02:25:55]

If the debug object is not exposed, there is no point allowing access. The
premature debug->Load() is hurting d8's initialization time the most. In the
majority of the test scripts the debug object is not needed, yet this line
always loads the debug object, which takes a comparatively long time.

+    i::Debug* debug = i::Isolate::Current()->debug();
+    debug->Load();

[Søren Thygesen Gjesse, 2011/06/21 07:31:06]

If --expose-debug-as is specified the debugger is already loaded - you could
just assert that the debugger context is there.

+    // Set the security token of the debug context to allow access.
+    debug->debug_context()->set_security_token(HEAP->undefined_value());
+  }
 
   // Start the debugger agent if requested.
   if (i::FLAG_debugger_agent) {
     v8::Debug::EnableAgent("d8 shell", i::FLAG_debugger_port, true);
   }
 
   // Start the in-process debugger if requested.
   if (i::FLAG_debugger && !i::FLAG_debugger_agent) {
     v8::Debug::SetDebugEventListener(HandleDebugEvent);
   }
@@ skipping 266 matching lines @@
       FLAG_stress_opt = false;
       FLAG_stress_deopt = false;
     } else if (strcmp(argv[i], "--shell") == 0) {
       run_shell = true;
       argv[i] = NULL;
     }
   }
 
   v8::V8::SetFlagsFromCommandLine(&argc, argv, true);
 
-  Initialize();
+  Initialize(run_shell);

[Søren Thygesen Gjesse, 2011/06/21 07:31:06]

I think it will be better to have a flag for running tests (e.g. --test-shell)
instead of relying on the --shell flag. You might otherwise want to run scripts
which relies on the utility context being loaded.

 
   int result = 0;
   if (FLAG_stress_opt || FLAG_stress_deopt) {
     v8::Testing::SetStressRunType(
         FLAG_stress_opt ? v8::Testing::kStressTypeOpt
             : v8::Testing::kStressTypeDeopt);
     int stress_runs = v8::Testing::GetStressRuns();
     for (int i = 0; i < stress_runs && result == 0; i++) {
       printf("============ Stress %d/%d ============\n", i + 1, stress_runs);
       v8::Testing::PrepareStressRun(i);
@@ skipping 23 matching lines @@
 }
 
 }  // namespace v8
 
 
 #ifndef GOOGLE3
 int main(int argc, char* argv[]) {
   return v8::Shell::Main(argc, argv);
 }
 #endif