Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(219)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: src/api.cc

Issue 1069883002: WIP SharedArrayBuffer implementation (Closed) Base URL: https://chromium.googlesource.com/v8/v8.git@master
Patch Set: merge master Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/api.h ('k') | src/bootstrapper.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/api.cc
diff --git a/src/api.cc b/src/api.cc
index e247eb2c41c387509bb0777df3d5ace0c7f302ef..751169698bc67550e6fb47907c6426056e08b3ee 100644
--- a/src/api.cc
+++ b/src/api.cc
@@ -339,6 +339,7 @@ StartupData V8::CreateSnapshotDataBlob(const char* custom_source) {
i::Isolate* internal_isolate = new i::Isolate(true);
ArrayBufferAllocator allocator;
internal_isolate->set_array_buffer_allocator(&allocator);
+ internal_isolate->set_shared_array_buffer_allocator(&allocator);
Isolate* isolate = reinterpret_cast<Isolate*>(internal_isolate);
StartupData result = {NULL, 0};
{
@@ -2680,27 +2681,34 @@ bool Value::IsArray() const {
bool Value::IsArrayBuffer() const {
- return Utils::OpenHandle(this)->IsJSArrayBuffer();
+ i::Handle<i::Object> obj = Utils::OpenHandle(this);
+ return obj->IsJSArrayBuffer() && !i::JSArrayBuffer::cast(*obj)->is_shared();
}
bool Value::IsArrayBufferView() const {
- return Utils::OpenHandle(this)->IsJSArrayBufferView();
+ i::Handle<i::Object> obj = Utils::OpenHandle(this);
+ return obj->IsJSArrayBufferView() &&
+ !i::JSArrayBufferView::cast(*obj)->is_shared();
}
bool Value::IsTypedArray() const {
- return Utils::OpenHandle(this)->IsJSTypedArray();
+ i::Handle<i::Object> obj = Utils::OpenHandle(this);
+ return obj->IsJSTypedArray() && !i::JSTypedArray::cast(*obj)->is_shared();
}
-#define VALUE_IS_TYPED_ARRAY(Type, typeName, TYPE, ctype, size) \
- bool Value::Is##Type##Array() const { \
- i::Handle<i::Object> obj = Utils::OpenHandle(this); \
- return obj->IsJSTypedArray() && \
- i::JSTypedArray::cast(*obj)->type() == i::kExternal##Type##Array; \
+#define VALUE_IS_TYPED_ARRAY(Type, typeName, TYPE, ctype, size) \
+ bool Value::Is##Type##Array() const { \
+ i::Handle<i::Object> obj = Utils::OpenHandle(this); \
+ if (!obj->IsJSTypedArray()) return false; \
+ i::JSTypedArray* typed_array = i::JSTypedArray::cast(*obj); \
+ return typed_array->type() == i::kExternal##Type##Array && \
+ !typed_array->is_shared(); \
}
+
TYPED_ARRAYS(VALUE_IS_TYPED_ARRAY)
#undef VALUE_IS_TYPED_ARRAY
@@ -2711,6 +2719,33 @@ bool Value::IsDataView() const {
}
+bool Value::IsSharedArrayBuffer() const {
+ i::Handle<i::Object> obj = Utils::OpenHandle(this);
+ return obj->IsJSArrayBuffer() && i::JSArrayBuffer::cast(*obj)->is_shared();
+}
+
+
+bool Value::IsSharedTypedArray() const {
+ i::Handle<i::Object> obj = Utils::OpenHandle(this);
+ return obj->IsJSTypedArray() && i::JSTypedArray::cast(*obj)->is_shared();
+}
+
+
+#define VALUE_IS_SHARED_TYPED_ARRAY(Type, typeName, TYPE, ctype, size) \
+ bool Value::IsShared##Type##Array() const { \
+ i::Handle<i::Object> obj = Utils::OpenHandle(this); \
+ if (!obj->IsJSTypedArray()) return false; \
+ i::JSTypedArray* typed_array = i::JSTypedArray::cast(*obj); \
+ return typed_array->type() == v8::internal::kExternal##Type##Array && \
+ typed_array->is_shared(); \
+ }
+
+
+TYPED_ARRAYS(VALUE_IS_SHARED_TYPED_ARRAY)
+
+#undef VALUE_IS_SHARED_TYPED_ARRAY
+
+
bool Value::IsObject() const {
return Utils::OpenHandle(this)->IsJSObject();
}
@@ -3087,9 +3122,9 @@ void v8::Promise::Resolver::CheckCast(Value* that) {
void v8::ArrayBuffer::CheckCast(Value* that) {
i::Handle<i::Object> obj = Utils::OpenHandle(that);
- Utils::ApiCheck(obj->IsJSArrayBuffer(),
- "v8::ArrayBuffer::Cast()",
- "Could not convert to ArrayBuffer");
+ Utils::ApiCheck(
+ obj->IsJSArrayBuffer() && !i::JSArrayBuffer::cast(*obj)->is_shared(),
+ "v8::ArrayBuffer::Cast()", "Could not convert to ArrayBuffer");
}
@@ -3103,19 +3138,21 @@ void v8::ArrayBufferView::CheckCast(Value* that) {
void v8::TypedArray::CheckCast(Value* that) {
i::Handle<i::Object> obj = Utils::OpenHandle(that);
- Utils::ApiCheck(obj->IsJSTypedArray(),
- "v8::TypedArray::Cast()",
- "Could not convert to TypedArray");
+ Utils::ApiCheck(
+ obj->IsJSTypedArray() && !i::JSTypedArray::cast(*obj)->is_shared(),
+ "v8::TypedArray::Cast()", "Could not convert to TypedArray");
}
-#define CHECK_TYPED_ARRAY_CAST(Type, typeName, TYPE, ctype, size) \
- void v8::Type##Array::CheckCast(Value* that) { \
- i::Handle<i::Object> obj = Utils::OpenHandle(that); \
- Utils::ApiCheck( \
- obj->IsJSTypedArray() && \
- i::JSTypedArray::cast(*obj)->type() == i::kExternal##Type##Array, \
- "v8::" #Type "Array::Cast()", "Could not convert to " #Type "Array"); \
+#define CHECK_TYPED_ARRAY_CAST(Type, typeName, TYPE, ctype, size) \
+ void v8::Type##Array::CheckCast(Value* that) { \
+ i::Handle<i::Object> obj = Utils::OpenHandle(that); \
+ Utils::ApiCheck(obj->IsJSTypedArray() && \
+ i::JSTypedArray::cast(*obj)->type() == \
+ i::kExternal##Type##Array && \
+ !i::JSTypedArray::cast(*obj)->is_shared(), \
+ "v8::" #Type "Array::Cast()", \
+ "Could not convert to " #Type "Array"); \
}
@@ -3132,6 +3169,40 @@ void v8::DataView::CheckCast(Value* that) {
}
+void v8::SharedArrayBuffer::CheckCast(Value* that) {
+ i::Handle<i::Object> obj = Utils::OpenHandle(that);
+ Utils::ApiCheck(
+ obj->IsJSArrayBuffer() && i::JSArrayBuffer::cast(*obj)->is_shared(),
+ "v8::SharedArrayBuffer::Cast()",
+ "Could not convert to SharedArrayBuffer");
+}
+
+
+void v8::SharedTypedArray::CheckCast(Value* that) {
+ i::Handle<i::Object> obj = Utils::OpenHandle(that);
+ Utils::ApiCheck(
+ obj->IsJSTypedArray() && i::JSTypedArray::cast(*obj)->is_shared(),
+ "v8::SharedTypedArray::Cast()", "Could not convert to SharedTypedArray");
+}
+
+
+#define CHECK_SHARED_TYPED_ARRAY_CAST(Type, typeName, TYPE, ctype, size) \
+ void v8::Shared##Type##Array::CheckCast(Value* that) { \
+ i::Handle<i::Object> obj = Utils::OpenHandle(that); \
+ Utils::ApiCheck(obj->IsJSTypedArray() && \
+ i::JSTypedArray::cast(*obj)->type() == \
+ i::kExternal##Type##Array && \
+ i::JSTypedArray::cast(*obj)->is_shared(), \
+ "v8::Shared" #Type "Array::Cast()", \
+ "Could not convert to Shared" #Type "Array"); \
+ }
+
+
+TYPED_ARRAYS(CHECK_SHARED_TYPED_ARRAY_CAST)
+
+#undef CHECK_SHARED_TYPED_ARRAY_CAST
+
+
void v8::Date::CheckCast(v8::Value* that) {
i::Handle<i::Object> obj = Utils::OpenHandle(that);
i::Isolate* isolate = NULL;
@@ -5325,7 +5396,6 @@ void v8::V8::SetArrayBufferAllocator(
i::V8::SetArrayBufferAllocator(allocator);
}
-
bool v8::V8::Dispose() {
i::V8::TearDown();
#ifdef V8_USE_EXTERNAL_STARTUP_DATA
@@ -6291,7 +6361,7 @@ Local<ArrayBuffer> v8::ArrayBuffer::New(Isolate* isolate, size_t byte_length) {
LOG_API(i_isolate, "v8::ArrayBuffer::New(size_t)");
ENTER_V8(i_isolate);
i::Handle<i::JSArrayBuffer> obj =
- i_isolate->factory()->NewJSArrayBuffer();
+ i_isolate->factory()->NewJSArrayBuffer(i::NOT_SHARED);
i::Runtime::SetupArrayBufferAllocatingData(i_isolate, obj, byte_length);
return Utils::ToLocal(obj);
}
@@ -6304,7 +6374,7 @@ Local<ArrayBuffer> v8::ArrayBuffer::New(Isolate* isolate, void* data,
LOG_API(i_isolate, "v8::ArrayBuffer::New(void*, size_t)");
ENTER_V8(i_isolate);
i::Handle<i::JSArrayBuffer> obj =
- i_isolate->factory()->NewJSArrayBuffer();
+ i_isolate->factory()->NewJSArrayBuffer(i::NOT_SHARED);
i::Runtime::SetupArrayBuffer(i_isolate, obj,
mode == ArrayBufferCreationMode::kExternalized,
data, byte_length);
@@ -6390,7 +6460,8 @@ size_t v8::TypedArray::Length() {
} \
i::Handle<i::JSArrayBuffer> buffer = Utils::OpenHandle(*array_buffer); \
i::Handle<i::JSTypedArray> obj = isolate->factory()->NewJSTypedArray( \
- i::kExternal##Type##Array, buffer, byte_offset, length); \
+ i::kExternal##Type##Array, buffer, byte_offset, length, \
+ i::NOT_SHARED); \
return Utils::ToLocal##Type##Array(obj); \
}
@@ -6410,6 +6481,116 @@ Local<DataView> DataView::New(Handle<ArrayBuffer> array_buffer,
}
+bool v8::SharedArrayBuffer::IsExternal() const {
+ return Utils::OpenHandle(this)->is_external();
+}
+
+
+v8::SharedArrayBuffer::Contents v8::SharedArrayBuffer::Externalize() {
+ i::Handle<i::JSArrayBuffer> self = Utils::OpenHandle(this);
+ i::Isolate* isolate = self->GetIsolate();
+ Utils::ApiCheck(!self->is_external(), "v8::SharedArrayBuffer::Externalize",
+ "SharedArrayBuffer already externalized");
+ self->set_is_external(true);
+ isolate->heap()->UnregisterArrayBuffer(self->backing_store());
+ return GetContents();
+}
+
+
+v8::SharedArrayBuffer::Contents v8::SharedArrayBuffer::GetContents() {
+ i::Handle<i::JSArrayBuffer> self = Utils::OpenHandle(this);
+ size_t byte_length = static_cast<size_t>(self->byte_length()->Number());
+ Contents contents;
+ contents.data_ = self->backing_store();
+ contents.byte_length_ = byte_length;
+ return contents;
+}
+
+
+size_t v8::SharedArrayBuffer::ByteLength() const {
+ i::Handle<i::JSArrayBuffer> obj = Utils::OpenHandle(this);
+ return static_cast<size_t>(obj->byte_length()->Number());
+}
+
+
+Local<SharedArrayBuffer> v8::SharedArrayBuffer::New(Isolate* isolate,
+ size_t byte_length) {
+ i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate);
+ LOG_API(i_isolate, "v8::SharedArrayBuffer::New(size_t)");
+ ENTER_V8(i_isolate);
+ i::Handle<i::JSArrayBuffer> obj =
+ i_isolate->factory()->NewJSArrayBuffer(i::SHARED);
+ i::Runtime::SetupArrayBufferAllocatingData(i_isolate, obj, byte_length);
+ return Utils::ToLocalShared(obj);
+}
+
+
+Local<SharedArrayBuffer> v8::SharedArrayBuffer::New(
+ Isolate* isolate, void* data, size_t byte_length,
+ ArrayBufferCreationMode mode) {
+ i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate);
+ LOG_API(i_isolate, "v8::SharedArrayBuffer::New(void*, size_t)");
+ ENTER_V8(i_isolate);
+ i::Handle<i::JSArrayBuffer> obj =
+ i_isolate->factory()->NewJSArrayBuffer(i::SHARED);
+ i::Runtime::SetupArrayBuffer(i_isolate, obj,
+ mode == ArrayBufferCreationMode::kExternalized,
+ data, byte_length);
+ return Utils::ToLocalShared(obj);
+}
+
+
+Local<SharedArrayBuffer> v8::SharedTypedArray::Buffer() {
+ i::Handle<i::JSTypedArray> obj = Utils::OpenHandle(this);
+ i::Handle<i::JSArrayBuffer> buffer = i::JSTypedArray::cast(*obj)->GetBuffer();
+ return Utils::ToLocalShared(buffer);
+}
+
+
+size_t v8::SharedTypedArray::ByteOffset() {
+ i::Handle<i::JSTypedArray> obj = Utils::OpenHandle(this);
+ return static_cast<size_t>(obj->byte_offset()->Number());
+}
+
+
+size_t v8::SharedTypedArray::ByteLength() {
+ i::Handle<i::JSTypedArray> obj = Utils::OpenHandle(this);
+ return static_cast<size_t>(obj->byte_length()->Number());
+}
+
+
+size_t v8::SharedTypedArray::Length() {
+ i::Handle<i::JSTypedArray> obj = Utils::OpenHandle(this);
+ return static_cast<size_t>(obj->length()->Number());
+}
+
+
+#define SHARED_TYPED_ARRAY_NEW(Type, type, TYPE, ctype, size) \
+ Local<Shared##Type##Array> Shared##Type##Array::New( \
+ Handle<SharedArrayBuffer> array_buffer, size_t byte_offset, \
+ size_t length) { \
+ i::Isolate* isolate = Utils::OpenHandle(*array_buffer)->GetIsolate(); \
+ LOG_API(isolate, "v8::Shared" #Type \
+ "Array::New(Handle<SharedArrayBuffer>, size_t, size_t)"); \
+ ENTER_V8(isolate); \
+ if (!Utils::ApiCheck( \
+ length <= static_cast<size_t>(i::Smi::kMaxValue), \
+ "v8::Shared" #Type \
+ "Array::New(Handle<SharedArrayBuffer>, size_t, size_t)", \
+ "length exceeds max allowed value")) { \
+ return Local<Shared##Type##Array>(); \
+ } \
+ i::Handle<i::JSArrayBuffer> buffer = Utils::OpenHandle(*array_buffer); \
+ i::Handle<i::JSTypedArray> obj = isolate->factory()->NewJSTypedArray( \
+ i::kExternal##Type##Array, buffer, byte_offset, length, i::SHARED); \
+ return Utils::ToLocalShared##Type##Array(obj); \
+ }
+
+
+TYPED_ARRAYS(SHARED_TYPED_ARRAY_NEW)
+#undef SHARED_TYPED_ARRAY_NEW
+
+
Local<Symbol> v8::Symbol::New(Isolate* isolate, Local<String> name) {
i::Isolate* i_isolate = reinterpret_cast<i::Isolate*>(isolate);
LOG_API(i_isolate, "Symbol::New()");
@@ -6756,6 +6937,14 @@ Isolate* Isolate::New(const Isolate::CreateParams& params) {
} else {
isolate->set_array_buffer_allocator(i::V8::ArrayBufferAllocator());
}
+ if (params.shared_array_buffer_allocator) {
+ isolate->set_shared_array_buffer_allocator(
+ params.shared_array_buffer_allocator);
+ } else {
+ // Default to using the same allocator as the array_buffer_allocator.
+ isolate->set_shared_array_buffer_allocator(
+ isolate->array_buffer_allocator());
+ }
if (params.snapshot_blob != NULL) {
isolate->set_snapshot_blob(params.snapshot_blob);
} else {
« no previous file with comments | « src/api.h ('k') | src/bootstrapper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698