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

Side by Side Diff: runtime/bin/extensions_macos.cc

Issue 2695403003: Undo rename of LoadExtensionLibrary to LoadLibrary since mangling on Windows seems to create a conf… (Closed)
Patch Set: comment Created 3 years, 10 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 unified diff | Download patch
« no previous file with comments | « runtime/bin/extensions_linux.cc ('k') | runtime/bin/extensions_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file
2 // for details. All rights reserved. Use of this source code is governed by a 2 // for details. All rights reserved. Use of this source code is governed by a
3 // BSD-style license that can be found in the LICENSE file. 3 // BSD-style license that can be found in the LICENSE file.
4 4
5 #include "platform/globals.h" 5 #include "platform/globals.h"
6 #if defined(TARGET_OS_MACOS) 6 #if defined(TARGET_OS_MACOS)
7 7
8 #include "bin/extensions.h" 8 #include "bin/extensions.h"
9 #include <dlfcn.h> // NOLINT 9 #include <dlfcn.h> // NOLINT
10 10
11 #include "platform/assert.h" 11 #include "platform/assert.h"
12 12
13 namespace dart { 13 namespace dart {
14 namespace bin { 14 namespace bin {
15 15
16 const char* kVmSnapshotDataSymbolName = "kDartVmSnapshotData"; 16 const char* kVmSnapshotDataSymbolName = "kDartVmSnapshotData";
17 const char* kVmSnapshotInstructionsSymbolName = "kDartVmSnapshotInstructions"; 17 const char* kVmSnapshotInstructionsSymbolName = "kDartVmSnapshotInstructions";
18 const char* kIsolateSnapshotDataSymbolName = "kDartIsolateSnapshotData"; 18 const char* kIsolateSnapshotDataSymbolName = "kDartIsolateSnapshotData";
19 const char* kIsolateSnapshotInstructionsSymbolName = 19 const char* kIsolateSnapshotInstructionsSymbolName =
20 "kDartIsolateSnapshotInstructions"; 20 "kDartIsolateSnapshotInstructions";
21 21
22 void* Extensions::LoadLibrary(const char* library_file) { 22 void* Extensions::LoadExtensionLibrary(const char* library_file) {
23 return dlopen(library_file, RTLD_LAZY); 23 return dlopen(library_file, RTLD_LAZY);
24 } 24 }
25 25
26 26
27 void* Extensions::ResolveSymbol(void* lib_handle, const char* symbol) { 27 void* Extensions::ResolveSymbol(void* lib_handle, const char* symbol) {
28 dlerror(); 28 dlerror();
29 return dlsym(lib_handle, symbol); 29 return dlsym(lib_handle, symbol);
30 } 30 }
31 31
32 32
33 void Extensions::UnloadLibrary(void* lib_handle) { 33 void Extensions::UnloadLibrary(void* lib_handle) {
34 dlerror(); 34 dlerror();
35 int result = dlclose(lib_handle); 35 int result = dlclose(lib_handle);
36 ASSERT(result == 0); 36 ASSERT(result == 0);
37 } 37 }
38 38
39 39
40 Dart_Handle Extensions::GetError() { 40 Dart_Handle Extensions::GetError() {
41 const char* err_str = dlerror(); 41 const char* err_str = dlerror();
42 if (err_str != NULL) { 42 if (err_str != NULL) {
43 return Dart_NewApiError(err_str); 43 return Dart_NewApiError(err_str);
44 } 44 }
45 return Dart_Null(); 45 return Dart_Null();
46 } 46 }
47 47
48 } // namespace bin 48 } // namespace bin
49 } // namespace dart 49 } // namespace dart
50 50
51 #endif // defined(TARGET_OS_MACOS) 51 #endif // defined(TARGET_OS_MACOS)
OLDNEW
« no previous file with comments | « runtime/bin/extensions_linux.cc ('k') | runtime/bin/extensions_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698