Introduce a v8::Platform class that bundles embedder callbacks

src/api.cc

 // Copyright 2012 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 22 matching lines @@
 #include "../include/v8-profiler.h"
 #include "../include/v8-testing.h"
 #include "assert-scope.h"
 #include "bootstrapper.h"
 #include "code-stubs.h"
 #include "compiler.h"
 #include "conversions-inl.h"
 #include "counters.h"
 #include "cpu-profiler.h"
 #include "debug.h"
+#ifdef V8_USE_DEFAULT_PLATFORM
+#include "default-platform.h"
+#endif
 #include "deoptimizer.h"
 #include "execution.h"
 #include "global-handles.h"
 #include "heap-profiler.h"
 #include "heap-snapshot-generator-inl.h"
 #include "icu_util.h"
 #include "json-parser.h"
 #include "messages.h"
 #ifdef COMPRESS_STARTUP_DATA_BZ2
 #include "natives.h"
@@ skipping 4982 matching lines @@
   // Obscure semantics for undefined, but somehow checked in our unit tests...
   if (obj->IsUndefined()) return NULL;
   i::Object* foreign = i::JSObject::cast(obj)->GetInternalField(0);
   return i::Foreign::cast(foreign)->foreign_address();
 }
 
 
 // --- E n v i r o n m e n t ---
 
 
+namespace {
+
+Platform* g_platform = NULL;
+
+}  // namespace
+
+
+void Platform::Initialize(Platform* platform) {
+#ifdef V8_USE_DEFAULT_PLATFORM
+  FATAL("Can't override v8::Platform when using default implementation");
+#else
+  ASSERT(!g_platform);
+  g_platform = platform;
+#endif
+}
+
+
+void Platform::Shutdown() {
+#ifdef V8_USE_DEFAULT_PLATFORM
+  FATAL("Can't override v8::Platform when using default implementation");
+#else
+  ASSERT(g_platform);
+  g_platform = NULL;
+#endif
+}
+
+
+Platform* Platform::GetCurrent() {
+  ASSERT(g_platform);
+  return g_platform;
+}
+
+
 bool v8::V8::Initialize() {
   i::Isolate* isolate = i::Isolate::UncheckedCurrent();
   if (isolate != NULL && isolate->IsInitialized()) {
     return true;
   }
+#ifdef V8_USE_DEFAULT_PLATFORM
+  g_platform = new i::DefaultPlatform;

[Benedikt Meurer, 2013/11/18 15:34:44]

I think platform initialization should be first in V8::Initialize(). If we
really want to be able to move all the platform stuff to the Platform class at
some point, then we will need an initialized Platform to use even basic stuff
such as TLS. So, please do:

if (!g_platform) g_platform = new i::DefaultPlatform;

at the beginning.

[jochen (gone - plz use gerrit), 2013/11/18 16:27:56]

Done (except for the default magic)

+#endif
   return InitializeHelper(isolate);
 }
 
 
 void v8::V8::SetEntropySource(EntropySource entropy_source) {
   i::RandomNumberGenerator::SetEntropySource(entropy_source);
 }
 
 
 void v8::V8::SetReturnAddressLocationResolver(
@@ skipping 44 matching lines @@
 
 
 bool v8::V8::Dispose() {
   i::Isolate* isolate = i::Isolate::Current();
   if (!ApiCheck(isolate != NULL && isolate->IsDefaultIsolate(),
                 "v8::V8::Dispose()",
                 "Use v8::Isolate::Dispose() for a non-default isolate.")) {
     return false;
   }
   i::V8::TearDown();
+#ifdef V8_USE_DEFAULT_PLATFORM
+  i::DefaultPlatform* platform = static_cast<i::DefaultPlatform*>(g_platform);
+  g_platform = NULL;
+  delete platform;
+#endif
   return true;
 }
 
 
 HeapStatistics::HeapStatistics(): total_heap_size_(0),
                                   total_heap_size_executable_(0),
                                   total_physical_size_(0),
                                   used_heap_size_(0),
                                   heap_size_limit_(0) { }
 
@@ skipping 2533 matching lines @@
   Isolate* isolate = reinterpret_cast<Isolate*>(info.GetIsolate());
   Address callback_address =
       reinterpret_cast<Address>(reinterpret_cast<intptr_t>(callback));
   VMState<EXTERNAL> state(isolate);
   ExternalCallbackScope call_scope(isolate, callback_address);
   callback(info);
 }
 
 
 } }  // namespace v8::internal