Index: include/v8.h |
diff --git a/include/v8.h b/include/v8.h |
index cbe8edd59b59349f1492d68853c21ca79f9f122b..996d551396a81fc76da272da26e10adbb1b3e4b8 100644 |
--- a/include/v8.h |
+++ b/include/v8.h |
@@ -126,6 +126,9 @@ template<typename T> class ReturnValue; |
namespace internal { |
class Arguments; |
+class BackgroundParsingTask; |
+class CompilationInfo; |
+class ExternalStreamingStream; |
class Heap; |
class HeapObject; |
class Isolate; |
@@ -1088,6 +1091,81 @@ class V8_EXPORT ScriptCompiler { |
CachedData* cached_data; |
}; |
+ /** |
+ * For streaming incomplete script data to V8. The embedder should implement a |
+ * subclass of this class. |
+ */ |
+ class V8_EXPORT ExternalSourceStream { |
+ public: |
+ enum Encoding { ONE_BYTE, TWO_BYTE, UTF8, UNKNOWN }; |
+ |
+ ExternalSourceStream() : encoding(UNKNOWN) {} |
+ virtual ~ExternalSourceStream() {} |
+ |
+ /** |
+ * V8 calls this to request the next chunk of data from the embedder. This |
+ * function will be called on a background thread, so it's OK to block and |
+ * wait for the data, if the embedder doesn't have data yet. Returns the |
+ * length of the data returned. The caller takes ownership of the data. |
+ */ |
+ virtual unsigned GetMoreData(const char** src) = 0; |
Sven Panne
2014/09/01 09:07:46
I think size_t is more appropriate than unsigned.
marja
2014/09/01 11:58:17
Done.
|
+ |
+ protected: |
+ /** |
+ * The embedder should call this as soon as it knows the encoding. It must |
+ * be called before the first call to GetMoreData returns. |
+ */ |
+ void SetEncoding(Encoding e) { encoding = e; } |
Sven Panne
2014/09/01 09:07:46
What's the rationale behind this two-stage initial
marja
2014/09/01 11:58:17
The original purpose was to allow the embedder pas
|
+ |
+ private: |
+ friend class internal::ExternalStreamingStream; |
+ Encoding encoding; |
+ }; |
+ |
+ |
+ /** |
+ * Source code which can be streamed into V8 in pieces. It will be parsed |
+ * while streaming. It can be compiled after the streaming is complete. |
+ * StreamedSource must be kept alive while the compilation is ongoing. |
+ */ |
+ class StreamedSource { |
+ public: |
+ V8_INLINE explicit StreamedSource(ExternalSourceStream* source_stream); |
+ ~StreamedSource(); |
Sven Panne
2014/09/01 09:07:46
If we don't allow subclassing, we should mark this
marja
2014/09/01 11:58:17
Added V8_FINAL (subclassing this won't make sense;
marja
2014/09/02 12:43:36
Meanwhile, things seem to progress in bleeding edg
|
+ |
+ // Ownership of the CachedData or its buffers is *not* transferred to the |
+ // caller. The CachedData object is alive as long as the StreamedSource |
+ // object is alive. |
+ V8_INLINE const CachedData* GetCachedData() const; |
+ |
+ private: |
+ friend class ScriptCompiler; |
+ friend class internal::BackgroundParsingTask; |
+ |
+ // Prevent copying. Not implemented. |
+ StreamedSource(const StreamedSource&); |
+ StreamedSource& operator=(const StreamedSource&); |
+ |
+ ExternalSourceStream* source_stream; |
+ |
+ // Cached data generated during compilation (if the generate_cached_data |
+ // flag is passed to ScriptCompiler::StartStreamingScript). Streamed scripts |
+ // cannot utilize already existing cached data. |
+ CachedData* cached_data; |
+ |
+ internal::CompilationInfo* info; |
+ }; |
+ |
+ /** |
+ * A streaming task which the embedder must run on a background thread to |
+ * stream scripts into V8. Returned by ScriptCompiler::StartStreamingScript. |
+ */ |
+ class ScriptStreamingTask { |
+ public: |
+ virtual ~ScriptStreamingTask() {} |
+ virtual void Run() = 0; |
+ }; |
+ |
enum CompileOptions { |
kNoCompileOptions = 0, |
kProduceParserCache, |
@@ -1117,6 +1195,32 @@ class V8_EXPORT ScriptCompiler { |
CompileOptions options = kNoCompileOptions); |
/** |
+ * Returns a task which streams script data into V8, or NULL if the script |
+ * cannot be streamed. The user is responsible of running the task on a |
+ * background thread and deleting it. When ran, the task starts parsing the |
+ * script, and it will request data from the StreamedSource as needed. When |
+ * ScriptStreamingTask::Run exits, all data has been streamed and the script |
+ * can be compiled (see Compile below). |
+ * |
+ * This API allows to start the streaming with as little data as possible, and |
+ * the remaining data (for example, the ScriptOrigin) is passed to Compile. |
+ */ |
+ static ScriptStreamingTask* StartStreamingScript( |
Sven Panne
2014/09/01 09:07:46
It might be nice to move this function and the one
marja
2014/09/01 11:58:17
The other compile functions are below, as static f
|
+ Isolate* isolate, StreamedSource* source, |
+ CompileOptions options = kNoCompileOptions); |
+ |
+ /** |
+ * Compiles a streamed script (bound to current context). |
+ * |
+ * This can only be called after the streaming has finished (the background |
+ * task has been run and completed). V8 doesn't construct the source string |
+ * during streaming, so the embedder needs to pass the full source here. |
+ */ |
+ static Local<Script> Compile(Isolate* isolate, StreamedSource* source, |
+ Handle<String> full_source_string, |
+ const ScriptOrigin& origin); |
+ |
+ /** |
* Compiles the specified script (bound to current context). |
* |
* \param source Script source code. |
@@ -6262,6 +6366,16 @@ const ScriptCompiler::CachedData* ScriptCompiler::Source::GetCachedData() |
} |
+ScriptCompiler::StreamedSource::StreamedSource(ExternalSourceStream* stream) |
+ : source_stream(stream), cached_data(NULL), info(NULL) {} |
+ |
+ |
+const ScriptCompiler::CachedData* |
+ScriptCompiler::StreamedSource::GetCachedData() const { |
+ return cached_data; |
+} |
+ |
+ |
Handle<Boolean> Boolean::New(Isolate* isolate, bool value) { |
return value ? True(isolate) : False(isolate); |
} |