languages/dart-sdk
languages/dart-sdk
1
0
Fork 0
mirror of https://github.com/dart-lang/sdk synced 2024-10-14 11:42:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Undo rename of LoadExtensionLibrary to LoadLibrary since mangling on Windows seems to create a conflict with LoadLibraryW.

Browse source 
Update use of IsolateData in Dartium's vm service.

R=zra@google.com

Review-Url: https://codereview.chromium.org/2695403003 .
This commit is contained in:
Ryan Macnak 2017-02-16 14:22:23 -08:00
parent 7d0b31e323
commit ab212fedb3
9 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
runtime/bin/extensions.cc
View file

@ -38,7 +38,7 @@ void* Extensions::MakePathAndResolve(const char* dir, const char* name) {
NULL,
};
const char* library_file = Concatenate(path_components);
void* library_handle = LoadLibrary(library_file);
void* library_handle = LoadExtensionLibrary(library_file);
if (library_handle != NULL) {
return library_handle;
}
@ -55,7 +55,7 @@ void* Extensions::MakePathAndResolve(const char* dir, const char* name) {
NULL,
};
const char* library_file = Concatenate(path_components);
return LoadLibrary(library_file);
return LoadExtensionLibrary(library_file);
}
}

4
runtime/bin/extensions.h
View file

@ -20,7 +20,9 @@ class Extensions {
Dart_Handle parent_library);
// Platform-specific implementations.
static void* LoadLibrary(const char* library_file);
// Don't rename LoadExtensionLibrary to LoadLibrary since on Windows it
// conflicts with LoadLibraryW after mangling.
static void* LoadExtensionLibrary(const char* library_file);
static void* ResolveSymbol(void* lib_handle, const char* symbol);
static void UnloadLibrary(void* lib_handle);

2
runtime/bin/extensions_android.cc
View file

@ -19,7 +19,7 @@ const char* kIsolateSnapshotDataSymbolName = "_kDartIsolateSnapshotData";
const char* kIsolateSnapshotInstructionsSymbolName =
"_kDartIsolateSnapshotInstructions";
void* Extensions::LoadLibrary(const char* library_file) {
void* Extensions::LoadExtensionLibrary(const char* library_file) {
return dlopen(library_file, RTLD_LAZY);
}

2
runtime/bin/extensions_fuchsia.cc
View file

@ -19,7 +19,7 @@ const char* kIsolateSnapshotDataSymbolName = "_kDartIsolateSnapshotData";
const char* kIsolateSnapshotInstructionsSymbolName =
"_kDartIsolateSnapshotInstructions";
void* Extensions::LoadLibrary(const char* library_file) {
void* Extensions::LoadExtensionLibrary(const char* library_file) {
return dlopen(library_file, RTLD_LAZY);
}

2
runtime/bin/extensions_linux.cc
View file

@ -19,7 +19,7 @@ const char* kIsolateSnapshotDataSymbolName = "_kDartIsolateSnapshotData";
const char* kIsolateSnapshotInstructionsSymbolName =
"_kDartIsolateSnapshotInstructions";
void* Extensions::LoadLibrary(const char* library_file) {
void* Extensions::LoadExtensionLibrary(const char* library_file) {
return dlopen(library_file, RTLD_LAZY);
}

2
runtime/bin/extensions_macos.cc
View file

@ -19,7 +19,7 @@ const char* kIsolateSnapshotDataSymbolName = "kDartIsolateSnapshotData";
const char* kIsolateSnapshotInstructionsSymbolName =
"kDartIsolateSnapshotInstructions";
void* Extensions::LoadLibrary(const char* library_file) {
void* Extensions::LoadExtensionLibrary(const char* library_file) {
return dlopen(library_file, RTLD_LAZY);
}

2
runtime/bin/extensions_win.cc
View file

@ -19,7 +19,7 @@ const char* kIsolateSnapshotDataSymbolName = "_kDartIsolateSnapshotData";
const char* kIsolateSnapshotInstructionsSymbolName =
"_kDartIsolateSnapshotInstructions";
void* Extensions::LoadLibrary(const char* library_file) {
void* Extensions::LoadExtensionLibrary(const char* library_file) {
SetLastError(0);
// Convert to wchar_t string.

2
runtime/bin/snapshot_utils.cc
View file

@ -191,7 +191,7 @@ class DylibAppSnapshot : public AppSnapshot {
static AppSnapshot* TryReadAppSnapshotDynamicLibrary(const char* script_name) {
void* library = Extensions::LoadLibrary(script_name);
void* library = Extensions::LoadExtensionLibrary(script_name);
if (library == NULL) {
return NULL;
}

2
runtime/bin/vmservice_dartium.cc
View file

@ -43,7 +43,7 @@ Dart_Isolate VmServiceServer::CreateIsolate(const uint8_t* snapshot_buffer) {
ASSERT(snapshot_buffer != NULL);
// Create the isolate.
IsolateData* isolate_data =
new IsolateData(DART_VM_SERVICE_ISOLATE_NAME, NULL, NULL);
new IsolateData(DART_VM_SERVICE_ISOLATE_NAME, NULL, NULL, NULL);
char* error = 0;
Dart_Isolate isolate =
Dart_CreateIsolate(DART_VM_SERVICE_ISOLATE_NAME, "main", snapshot_buffer,