Make V8 build with the chromium shared library build

samples/shell.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 15 matching lines @@
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <v8.h>
 #include <v8-testing.h>
 #include <assert.h>
 #include <fcntl.h>
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 
+// When building with V8 in a shared library we cannot use functions which
+// is not explicitly a part of the public V8 API. This extensive use of
+// #ifndef USING_V8_SHARED/#endif is a hack until we can resolve whether to
+// still use the shell sample for testing or change to use the  and the

[Mads Ager (chromium), 2011/03/24 10:59:03]

the and the -> the

+// developer shell d8 TODO(1272).
+#ifndef USING_V8_SHARED
 #include "../src/v8.h"
+#endif  // USING_V8_SHARED
 
 #if !defined(_WIN32) && !defined(_WIN64)
 #include <unistd.h>  // NOLINT
 #endif
 
 static void ExitShell(int exit_code) {
   // Use _exit instead of exit to avoid races between isolate
   // threads and static destructors.
   fflush(stdout);
   fflush(stderr);
@@ skipping 12 matching lines @@
 v8::Handle<v8::Value> Quit(const v8::Arguments& args);
 v8::Handle<v8::Value> Version(const v8::Arguments& args);
 v8::Handle<v8::String> ReadFile(const char* name);
 void ReportException(v8::TryCatch* handler);
 
 
 static bool last_run = true;
 
 class SourceGroup {
  public:
-  SourceGroup() : argv_(NULL),
-                  begin_offset_(0),
-                  end_offset_(0),
+  SourceGroup() : 
+#ifndef USING_V8_SHARED
                   next_semaphore_(v8::internal::OS::CreateSemaphore(0)),
                   done_semaphore_(v8::internal::OS::CreateSemaphore(0)),
-                  thread_(NULL) { }
+                  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() {
     for (int i = begin_offset_; i < end_offset_; ++i) {
@@ skipping 19 matching lines @@
           printf("Error reading '%s'\n", arg);
         }
         if (!ExecuteString(source, file_name, false, true)) {
           ExitShell(1);
           return;
         }
       }
     }
   }
 
+#ifndef USING_V8_SHARED
   void StartExecuteInThread() {
     if (thread_ == NULL) {
       thread_ = new IsolateThread(this);
       thread_->Start();
     }
     next_semaphore_->Signal();
   }
 
   void WaitForThread() {
     if (thread_ == NULL) return;
     if (last_run) {
       thread_->Join();
       thread_ = NULL;
     } else {
       done_semaphore_->Wait();
     }
   }
+#endif  // USING_V8_SHARED
 
  private:
+#ifndef USING_V8_SHARED
   static v8::internal::Thread::Options GetThreadOptions() {
     v8::internal::Thread::Options options;
     options.name = "IsolateThread";
     // On some systems (OSX 10.6) the stack size default is 0.5Mb or less
     // which is not enough to parse the big literal expressions used in tests.
     // The stack size should be at least StackGuard::kLimitSize + some
     // OS-specific padding for thread startup code.
     options.stack_size = 2 << 20;  // 2 Mb seems to be enough
     return options;
   }
@@ skipping 23 matching lines @@
           v8::Context::Scope cscope(context);
           Execute();
         }
         context.Dispose();
       }
       if (done_semaphore_ != NULL) done_semaphore_->Signal();
     } while (!last_run);
     isolate->Dispose();
   }
 
+  v8::internal::Semaphore* next_semaphore_;
+  v8::internal::Semaphore* done_semaphore_;
+  v8::internal::Thread* thread_;
+#endif  // USING_V8_SHARED
+
   const char** argv_;
   int begin_offset_;
   int end_offset_;
-  v8::internal::Semaphore* next_semaphore_;
-  v8::internal::Semaphore* done_semaphore_;
-  v8::internal::Thread* thread_;
 };
 
 
 static SourceGroup* isolate_sources = NULL;
 
 
 int RunMain(int argc, char* argv[]) {
   v8::V8::SetFlagsFromCommandLine(&argc, argv, true);
   v8::HandleScope handle_scope;
   v8::Persistent<v8::Context> context = CreateShellContext();
   // Enter the newly created execution environment.
   context->Enter();
   if (context.IsEmpty()) {
     printf("Error creating context\n");
     return 1;
   }
 
   bool run_shell = (argc == 1);
   int num_isolates = 1;
   for (int i = 1; i < argc; i++) {
-    if (strcmp(argv[i], "--isolate") == 0) ++num_isolates;
+    if (strcmp(argv[i], "--isolate") == 0) {
+#ifndef USING_V8_SHARED
+      ++num_isolates;
+#else  // USING_V8_SHARED
+      printf("Error: --isolate not supported when linked with shared "
+             "library\n");
+      ExitShell(1);
+#endif  // USING_V8_SHARED
+    }
   }
   if (isolate_sources == NULL) {
     isolate_sources = new SourceGroup[num_isolates];
     SourceGroup* current = isolate_sources;
     current->Begin(argv, 1);
     for (int i = 1; i < argc; i++) {
       const char* str = argv[i];
       if (strcmp(str, "--isolate") == 0) {
         current->End(i);
         current++;
         current->Begin(argv, i + 1);
       } else if (strcmp(str, "--shell") == 0) {
         run_shell = true;
       } else if (strcmp(str, "-f") == 0) {
         // Ignore any -f flags for compatibility with the other stand-
         // alone JavaScript engines.
         continue;
       } else if (strncmp(str, "--", 2) == 0) {
         printf("Warning: unknown flag %s.\nTry --help for options\n", str);
       }
     }
     current->End(argc);
   }
+#ifndef USING_V8_SHARED
   for (int i = 1; i < num_isolates; ++i) {
     isolate_sources[i].StartExecuteInThread();
   }
+#endif  // USING_V8_SHARED
   isolate_sources[0].Execute();
   if (run_shell) RunShell(context);
+#ifndef USING_V8_SHARED
   for (int i = 1; i < num_isolates; ++i) {
     isolate_sources[i].WaitForThread();
   }
+#endif  // USING_V8_SHARED
   if (last_run) {
     delete[] isolate_sources;
     isolate_sources = NULL;
   }
   context->Exit();
   context.Dispose();
   return 0;
 }
 
 
@@ skipping 254 matching lines @@
       printf("^");
     }
     printf("\n");
     v8::String::Utf8Value stack_trace(try_catch->StackTrace());
     if (stack_trace.length() > 0) {
       const char* stack_trace_string = ToCString(stack_trace);
       printf("%s\n", stack_trace_string);
     }
   }
 }