ported --isolate option to d8 and refactored to group together option parsing

src/d8.h

 // 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 94 matching lines @@
     i::HashMap::Entry* entry_;
   };
 
  private:
   static int Hash(const char* name);
   static bool Match(void* key1, void* key2);
   i::HashMap hash_map_;
 };
 
 
+class SourceGroup {

[Yang, 2011/07/07 16:04:49]

class necessary for the --isolate option

+ public:
+  SourceGroup() :
+#if !(defined(USING_V8_SHARED) || defined(V8_SHARED))
+                  next_semaphore_(v8::internal::OS::CreateSemaphore(0)),
+                  done_semaphore_(v8::internal::OS::CreateSemaphore(0)),
+                  thread_(NULL),
+#endif  // USING_V8_SHARED
+                  argv_(NULL),
+                  begin_offset_(0),
+                  end_offset_(0) { }
+
+  void Begin(char** argv, int offset) {
+    argv_ = const_cast<const char**>(argv);
+    begin_offset_ = offset;
+  }
+
+  void End(int offset) { end_offset_ = offset; }
+
+  void Execute();
+
+#if !(defined(USING_V8_SHARED) || defined(V8_SHARED))
+  void StartExecuteInThread();
+  void WaitForThread();
+#endif  // USING_V8_SHARED
+
+ private:
+#if !(defined(USING_V8_SHARED) || defined(V8_SHARED))
+  class IsolateThread : public i::Thread {
+   public:
+    explicit IsolateThread(SourceGroup* group)
+        : i::Thread(GetThreadOptions()), group_(group) {}
+
+    virtual void Run() {
+      group_->ExecuteInThread();
+    }
+
+   private:
+    SourceGroup* group_;
+  };
+
+  static i::Thread::Options GetThreadOptions();
+
+  void ExecuteInThread();
+  void ExitShell(int exit_code);
+  Handle<String> ReadFile(const char* name);
+
+  i::Semaphore* next_semaphore_;
+  i::Semaphore* done_semaphore_;
+  i::Thread* thread_;
+#endif  // USING_V8_SHARED
+
+  const char** argv_;
+  int begin_offset_;
+  int end_offset_;
+};
+
+
+class ShellOptions {

[Yang, 2011/07/07 16:04:49]

grouped all the options for the shell in here.

+ public:
+  ShellOptions() :
+    script_executed(false),
+    last_run(true),
+    FLAG_stress_opt(false),
+    FLAG_stress_deopt(false),
+    FLAG_interactive_shell(false),
+    FLAG_test_shell(false),
+    FLAG_preemption(true),
+    preemption_interval(10),
+    num_isolates(1),
+    isolate_sources(NULL),
+    parallel_files(NULL) { }
+
+  bool script_executed;
+  bool last_run;
+  bool FLAG_stress_opt;
+  bool FLAG_stress_deopt;
+  bool FLAG_interactive_shell;
+  bool FLAG_test_shell;
+  bool FLAG_preemption;
+  int preemption_interval;
+  int num_isolates;
+  SourceGroup* isolate_sources;
+  i::List< i::Vector<const char> >* parallel_files;
+};
+
+
 class Shell: public i::AllStatic {
  public:
   static bool ExecuteString(Handle<String> source,
                             Handle<Value> name,
                             bool print_result,
                             bool report_exceptions);
   static const char* ToCString(const v8::String::Utf8Value& value);
   static void ReportException(TryCatch* try_catch);
   static void OnExit();
   static int* LookupCounter(const char* name);
   static void* CreateHistogram(const char* name,
                                int min,
                                int max,
                                size_t buckets);
   static void AddHistogramSample(void* histogram, int sample);
   static void MapCounters(const char* name);
   static Handle<String> ReadFile(const char* name);
-  static void Initialize(bool test_shell);
-  static void RenewEvaluationContext();
+  static void Initialize();
+  static Persistent<Context> CreateEvaluationContext();
   static void InstallUtilityScript();
   static void RunShell();
+  static bool SetOptions(int argc, char* argv[]);
   static int RunScript(char* filename);
-  static int RunMain(int argc, char* argv[], bool* executed);
+  static int RunMain(int argc, char* argv[]);
   static int Main(int argc, char* argv[]);
   static Handle<ObjectTemplate> CreateGlobalTemplate();
   static Handle<Array> GetCompletions(Handle<String> text,
                                       Handle<String> full);
 #ifdef ENABLE_DEBUGGER_SUPPORT
   static Handle<Object> DebugMessageDetails(Handle<String> message);
   static Handle<Value> DebugCommandToJSONRequest(Handle<String> command);
 #endif
 
 #ifdef WIN32
@@ skipping 50 matching lines @@
   static Handle<Value> UnsetEnvironment(const Arguments& args);
   static Handle<Value> SetUMask(const Arguments& args);
   static Handle<Value> MakeDirectory(const Arguments& args);
   static Handle<Value> RemoveDirectory(const Arguments& args);
 
   static void AddOSMethods(Handle<ObjectTemplate> os_template);
 
   static const char* kHistoryFileName;
   static const char* kPrompt;
 
+  static ShellOptions options;
+
  private:
   static Persistent<Context> utility_context_;
   static Persistent<Context> evaluation_context_;
   static CounterMap* counter_map_;
   // We statically allocate a set of local counters to be used if we
   // don't want to store the stats in a memory-mapped file
   static CounterCollection local_counters_;
   static CounterCollection* counters_;
   static i::OS::MemoryMappedFile* counters_file_;
+  static i::Mutex* context_mutex_;
   static Counter* GetCounter(const char* name, bool is_histogram);
   static Handle<Value> CreateExternalArray(const Arguments& args,
                                            ExternalArrayType type,
                                            size_t element_size);
   static void ExternalArrayWeakCallback(Persistent<Value> object, void* data);
 };
 
 
 class LineEditor {
  public:
@@ skipping 13 matching lines @@
   const char* name_;
   LineEditor* next_;
   static LineEditor* first_;
 };
 
 
 }  // namespace v8
 
 
 #endif  // V8_D8_H_