From 7c7178598172bdca67b004b928be7ad35568cf61 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Sun, 10 Jun 2018 03:44:56 +0200 Subject: [PATCH] deno.cc clean up --- deno2/deno.cc | 33 ++++++++++++--------------------- deno2/deno.h | 13 ++----------- 2 files changed, 14 insertions(+), 32 deletions(-) diff --git a/deno2/deno.cc b/deno2/deno.cc index 8ef673449b..1513262705 100644 --- a/deno2/deno.cc +++ b/deno2/deno.cc @@ -34,6 +34,18 @@ IN THE SOFTWARE. namespace deno { +// deno_s = Wrapped Isolate. +struct deno_s { + v8::Isolate* isolate; + std::string last_exception; + v8::Persistent recv; + v8::Persistent context; + RecvCallback cb; + void* data; +}; + +void deno_add_isolate(Deno* d, v8::Isolate* isolate); + // Extracts a C string from a v8::V8 Utf8Value. const char* ToCString(const v8::String::Utf8Value& value) { return *value ? *value : ""; @@ -249,18 +261,6 @@ void v8_init() { v8::V8::Initialize(); } -Deno* deno_new(void* data, RecvCallback cb) { - Deno* d = new Deno; - d->cb = cb; - d->data = data; - v8::Isolate::CreateParams params; - params.array_buffer_allocator = - v8::ArrayBuffer::Allocator::NewDefaultAllocator(); - v8::Isolate* isolate = v8::Isolate::New(params); - deno_add_isolate(d, isolate); - return d; -} - Deno* deno_from_snapshot(v8::StartupData* blob, void* data, RecvCallback cb) { Deno* d = new Deno; d->cb = cb; @@ -295,15 +295,6 @@ void deno_add_isolate(Deno* d, v8::Isolate* isolate) { d->isolate->SetData(0, d); } -v8::StartupData SerializeInternalField(v8::Local holder, int index, - void* data) { - printf("SerializeInternalField %d\n", index); - v8::StartupData sd; - sd.data = "a"; - sd.raw_size = 1; - return sd; -} - v8::StartupData deno_make_snapshot(const char* js_filename, const char* js_source) { auto creator = new v8::SnapshotCreator(external_references); diff --git a/deno2/deno.h b/deno2/deno.h index 2fadfd983b..00e4cc5026 100644 --- a/deno2/deno.h +++ b/deno2/deno.h @@ -14,32 +14,23 @@ struct buf_s { size_t len; }; typedef struct buf_s DenoBuf; -// Deno = Wrapped Isolate. + struct deno_s; typedef struct deno_s Deno; + // The callback from V8 when data is sent. typedef DenoBuf (*RecvCallback)(Deno* d, DenoBuf buf); -struct deno_s { - v8::Isolate* isolate; - std::string last_exception; - v8::Persistent recv; - v8::Persistent context; - RecvCallback cb; - void* data; -}; void v8_init(); const char* v8_version(); void v8_set_flags(int* argc, char** argv); // Constructors: -Deno* deno_new(void* data, RecvCallback cb); Deno* deno_from_snapshot(v8::StartupData* blob, void* data, RecvCallback cb); v8::StartupData deno_make_snapshot(const char* js_filename, const char* js_source); -void deno_add_isolate(Deno* d, v8::Isolate* isolate); void* deno_get_data(); // Returns nonzero on error.