Merge pull request #425 from NativeScript/jasssonpet/snapshot-data-memory

Keep snapshot data just after debugger is initialized

Author: jasssonpet

src/jni/Runtime.cpp

@@ -58,6 +58,7 @@ Runtime::Runtime(JNIEnv *env, jobject runtime, int id)
 {
 	m_runtime = m_env.NewGlobalRef(runtime);
 	m_objectManager = new ObjectManager(m_runtime);
+	m_startupData = nullptr;
 	s_id2RuntimeCache.insert(make_pair(id, this));
 }
 
@@ -335,26 +336,38 @@ void Runtime::PassUncaughtExceptionToJsNative(JNIEnv *env, jobject obj, jthrowab
 	}
 }
 
+void Runtime::ClearStartupData(JNIEnv *env, jobject obj) {
+	if (m_startupData) {
+		delete m_startupData->data;
+		delete m_startupData;
+	}
+}
+
 Isolate* Runtime::PrepareV8Runtime(const string& filesPath, jstring packageName, jobject jsDebugger, jstring profilerOutputDir)
 {
 	auto platform = v8::platform::CreateDefaultPlatform();
 	V8::InitializePlatform(platform);
 	V8::Initialize();
 
 	Isolate::CreateParams create_params;
-	StartupData startup_data;
 	string customScript;
 
 	create_params.array_buffer_allocator = &g_allocator;
 	// prepare the snapshot blob
 	if (Constants::V8_HEAP_SNAPSHOT)
 	{
+		DEBUG_WRITE_FORCE("Snapshot enabled.");
+
+		m_startupData = new StartupData();
+
 		auto snapshotPath = filesPath + "/internal/snapshot.blob";
 		if( File::Exists(snapshotPath))
 		{
 			int length;
-			startup_data.data = reinterpret_cast<char*>(File::ReadBinary(snapshotPath, length));
-			startup_data.raw_size = length;
+			m_startupData->data = reinterpret_cast<char*>(File::ReadBinary(snapshotPath, length));
+			m_startupData->raw_size = length;
+
+			DEBUG_WRITE_FORCE("Snapshot read %s (%dB).", snapshotPath.c_str(), length);
 		}
 		else
 		{
@@ -364,11 +377,25 @@ Isolate* Runtime::PrepareV8Runtime(const string& filesPath, jstring packageName,
 				customScript = File::ReadText(Constants::V8_HEAP_SNAPSHOT_SCRIPT);
 			}
 
-			startup_data = V8::CreateSnapshotDataBlob(customScript.c_str());
-			File::WriteBinary(snapshotPath, startup_data.data, startup_data.raw_size);
+			DEBUG_WRITE_FORCE("Creating heap snapshot");
+			*m_startupData = V8::CreateSnapshotDataBlob(customScript.c_str());
+
+			if (m_startupData->raw_size == 0) {
+				DEBUG_WRITE_FORCE("Failed to create heap snapshot.");
+			} else {
+				bool writeSuccess = File::WriteBinary(snapshotPath, m_startupData->data, m_startupData->raw_size);
+
+				if (!writeSuccess) {
+					DEBUG_WRITE_FORCE("Failed to save created snapshot.");
+				} else {
+					DEBUG_WRITE_FORCE("Saved snapshot of %s (%dB) in %s (%dB)",
+							Constants::V8_HEAP_SNAPSHOT_SCRIPT.c_str(), customScript.size(),
+							snapshotPath.c_str(), m_startupData->raw_size);
+				}
+			}
 		}
 
-		create_params.snapshot_blob = &startup_data;
+		create_params.snapshot_blob = m_startupData;
 	}
 
 	auto isolate = Isolate::New(create_params);
@@ -402,12 +429,6 @@ Isolate* Runtime::PrepareV8Runtime(const string& filesPath, jstring packageName,
 	Local<Context> context = Context::New(isolate, nullptr, globalTemplate);
 	PrimaryContext = new Persistent<Context>(isolate, context);
 
-	if (Constants::V8_HEAP_SNAPSHOT)
-	{
-		// we own the snapshot buffer, delete it
-		delete[] startup_data.data;
-	}
-
 	context_scope = new Context::Scope(context);
 
 	m_objectManager->Init(isolate);

src/jni/Runtime.h

@@ -39,6 +39,7 @@ namespace tns
 			jint GenerateNewObjectId(JNIEnv *env, jobject obj);
 			void AdjustAmountOfExternalAllocatedMemoryNative(JNIEnv *env, jobject obj, jlong usedMemory);
 			void PassUncaughtExceptionToJsNative(JNIEnv *env, jobject obj, jthrowable exception, jstring stackTrace);
+			void ClearStartupData(JNIEnv *env, jobject obj);
 
 		private:
 			Runtime(JNIEnv *env, jobject runtime, int id);
@@ -57,6 +58,8 @@ namespace tns
 
 			Profiler m_profiler;
 
+			v8::StartupData *m_startupData;
+
 			static void PrepareExtendFunction(v8::Isolate *isolate, jstring filesPath);
 			v8::Isolate* PrepareV8Runtime(const std::string& filesPath, jstring packageName, jobject jsDebugger, jstring profilerOutputDir);
 			jobject ConvertJsValueToJavaObject(JEnv& env, const v8::Local<v8::Value>& value, int classReturnType);

src/jni/com_tns_Runtime.cpp

@@ -301,3 +301,14 @@ extern "C" void Java_com_tns_Runtime_passUncaughtExceptionToJsNative(JNIEnv *env
 		nsEx.ReThrowToJava();
 	}
 }
+
+extern "C" void Java_com_tns_Runtime_ClearStartupData(JNIEnv *env, jobject obj, jint runtimeId)
+{
+	auto runtime = TryGetRuntime(runtimeId);
+	if (runtime == nullptr)
+	{
+		return;
+	}
+
+	runtime->ClearStartupData(env, obj);
+}

src/src/com/tns/Runtime.java

@@ -41,6 +41,8 @@ public class Runtime
 
 	private native void passUncaughtExceptionToJsNative(int runtimeId, Throwable ex, String stackTrace);
 
+	private native void ClearStartupData(int runtimeId);
+	
 	void passUncaughtExceptionToJs(Throwable ex, String stackTrace)
 	{
 		passUncaughtExceptionToJsNative(getRuntimeId(), ex, stackTrace);
@@ -199,6 +201,7 @@ private void init(Application application, ThreadScheduler threadScheduler, Logg
 		{
 			jsDebugger.start();
 		}
+		ClearStartupData(getRuntimeId()); // It's safe to delete the data after the V8 debugger is initialized
 
 		if (logger.isEnabled())
 		{