Added preemption option to d8

src/d8.cc

 // Copyright 2008 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 15 matching lines @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 
 #include <stdlib.h>
 
 #include "d8.h"
 #include "d8-debug.h"
 #include "debug.h"
 #include "api.h"
 #include "natives.h"
+#include "platform.h"
 
 
 namespace v8 {
 
 
 const char* Shell::kHistoryFileName = ".d8_history";
 const char* Shell::kPrompt = "d8> ";
 
 
 LineEditor *LineEditor::first_ = NULL;
@@ skipping 330 matching lines @@
       Counter* counter = (*i).second;
       ::printf("| %-38s | %11i |\n", (*i).first, counter->value());
     }
     ::printf("+----------------------------------------+-------------+\n");
   }
   if (counters_file_ != NULL)
     delete counters_file_;
 }
 
 
-// Reads a file into a v8 string.
-Handle<String> Shell::ReadFile(const char* name) {
+static char* ReadChars(const char *name, int* size_out) {
   FILE* file = i::OS::FOpen(name, "rb");
-  if (file == NULL) return Handle<String>();
+  if (file == NULL) return NULL;
 
   fseek(file, 0, SEEK_END);
   int size = ftell(file);
   rewind(file);
 
   char* chars = new char[size + 1];
   chars[size] = '\0';
   for (int i = 0; i < size;) {
     int read = fread(&chars[i], 1, size - i, file);
     i += read;
   }
   fclose(file);
-  Handle<String> result = String::New(chars, size);
+  *size_out = size;
+  return chars;
+}
+
+
+// Reads a file into a v8 string.
+Handle<String> Shell::ReadFile(const char* name) {
+  int size = 0;
+  char* chars = ReadChars(name, &size);
+  if (chars == NULL) return Handle<String>();
+  Handle<String> result = String::New(chars);
   delete[] chars;
   return result;
 }
 
 
 void Shell::RunShell() {
   LineEditor* editor = LineEditor::Get();
   printf("V8 version %s [console: %s]\n", V8::GetVersion(), editor->name());
   editor->Open();
   while (true) {
     HandleScope handle_scope;
     i::SmartPointer<char> input = editor->Prompt(Shell::kPrompt);
     if (input.is_empty())
       break;
     editor->AddHistory(*input);
     Handle<String> name = String::New("(d8)");
     ExecuteString(String::New(*input), name, true, true);
   }
   editor->Close();
   printf("\n");
 }
 
 
+class ShellThread : public i::Thread {
+ public:
+  ShellThread(int no, i::Vector<const char> files)
+    : no_(no), files_(files) { }
+  virtual void Run();
+ private:
+  int no_;
+  i::Vector<const char> files_;
+};
+
+
+void ShellThread::Run() {
+  char* ptr = const_cast<char*>(files_.start());
+  while (ptr) {

[Erik Corry, 2009/01/20 13:28:31]

Test against NULL should be explicit.

[Christian Plesner Hansen, 2009/01/20 14:13:46]

Fixed (times 3).

+    // For each newline-separated line.
+    char *filename = ptr;
+    char* next = ::strchr(ptr, '\n');
+    if (next) {

[Erik Corry, 2009/01/20 13:28:31]

Test against NULL should be explicit.

+      *next = '\0';
+      ptr = (next + 1);
+    } else {
+      ptr = next;

[Erik Corry, 2009/01/20 13:28:31]

ptr = NULL would be clearer.

+    }
+    Locker locker;
+    HandleScope scope;
+    Handle<String> str = Shell::ReadFile(filename);
+    Shell::ExecuteString(str, String::New(filename), false, false);
+  }
+}
+
+
 int Shell::Main(int argc, char* argv[]) {
   i::FlagList::SetFlagsFromCommandLine(&argc, argv, true);
   if (i::FLAG_help) {
     return 1;
   }
   Initialize();
   bool run_shell = (argc == 1);
+  i::List<i::Thread*> threads(1);
   Context::Scope context_scope(evaluation_context_);

[Erik Corry, 2009/01/20 13:28:31]

This should be protected by a locker.  Also the place where it goes out of scope
- is there a nontrivial destructor?

[Christian Plesner Hansen, 2009/01/20 14:13:46]

I don't think so -- there can only be one thread during initialization.

   for (int i = 1; i < argc; i++) {
     char* str = argv[i];
     if (strcmp(str, "--shell") == 0) {
       run_shell = true;
     } else if (strcmp(str, "-f") == 0) {
       // Ignore any -f flags for compatibility with other stand-alone
       // JavaScript engines.
       continue;
     } 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) {
       // Execute argument given to -e option directly.
       v8::HandleScope handle_scope;
       v8::Handle<v8::String> file_name = v8::String::New("unnamed");
       v8::Handle<v8::String> source = v8::String::New(argv[i + 1]);
       if (!ExecuteString(source, file_name, false, true))
         return 1;
       i++;
+    } else if (strcmp(str, "-p") == 0 && i + 1 < argc) {
+      Locker locker;
+      Locker::StartPreemption(10);

[Erik Corry, 2009/01/20 13:28:31]

You only need to do this once, not once per file.

[Christian Plesner Hansen, 2009/01/20 14:13:46]

Right, but I don't want to enable it without the -p option, and this way I don't
have to keep track of when I first meet a -p.

+      int size = 0;
+      const char *files = ReadChars(argv[++i], &size);
+      if (files == NULL) return 1;
+      ShellThread *thread =
+        new ShellThread(threads.length(), i::Vector<const char>(files, size));
+      thread->Start();
+      threads.Add(thread);
     } else {
       // Use all other arguments as names of files to load and run.

[Erik Corry, 2009/01/20 13:28:31]

If the user uses both -p files and straight js files on the command line we need
a lock here.

[Christian Plesner Hansen, 2009/01/20 14:13:46]

Fixed

       HandleScope handle_scope;
       Handle<String> file_name = v8::String::New(str);
       Handle<String> source = ReadFile(str);
       if (source.IsEmpty()) {
         printf("Error reading '%s'\n", str);
         return 1;
       }
       if (!ExecuteString(source, file_name, false, true))
         return 1;
     }
   }
   if (i::FLAG_debugger)
     v8::Debug::AddDebugEventListener(HandleDebugEvent);
   if (run_shell)
     RunShell();

[Erik Corry, 2009/01/20 13:28:31]

and here.

[Christian Plesner Hansen, 2009/01/20 14:13:46]

Fixed

+  for (int i = 0; i < threads.length(); i++) {
+    Thread *thread = threads[i];
+    thread->Join();
+    delete thread;
+  }
   OnExit();
   return 0;
 }
 
 
 }  // namespace v8
 
 
 int main(int argc, char* argv[]) {
   return v8::Shell::Main(argc, argv);
 }