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

Unified Diff: runtime/vm/isolate.cc

Issue 867113003: Revert r43217, r43215, r43208, r43207, and r43202. (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Created 5 years, 11 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 | « runtime/vm/isolate.h ('k') | runtime/vm/service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: runtime/vm/isolate.cc
diff --git a/runtime/vm/isolate.cc b/runtime/vm/isolate.cc
index b5bb318f1d61bbb1e2492ab31f5224a5a798dc0e..583bdec5aa14a29a3d85de954f8570f2f712f71b 100644
--- a/runtime/vm/isolate.cc
+++ b/runtime/vm/isolate.cc
@@ -554,7 +554,7 @@ Isolate::Isolate(Isolate* original)
#undef REUSABLE_HANDLE_INITIALIZERS
Isolate::~Isolate() {
- free(name_);
+ delete [] name_;
delete heap_;
delete object_store_;
delete api_state_;
@@ -682,13 +682,9 @@ void Isolate::BuildName(const char* name_prefix) {
if (name_prefix == NULL) {
name_prefix = "isolate";
}
- if (Service::IsServiceIsolateName(name_prefix)) {
- name_ = strdup(name_prefix);
- return;
- }
const char* kFormat = "%s-%lld";
intptr_t len = OS::SNPrint(NULL, 0, kFormat, name_prefix, main_port()) + 1;
- name_ = reinterpret_cast<char*>(malloc(len));
+ name_ = new char[len];
OS::SNPrint(name_, len, kFormat, name_prefix, main_port());
}
@@ -1147,6 +1143,7 @@ Dart_FileWriteCallback Isolate::file_write_callback_ = NULL;
Dart_FileCloseCallback Isolate::file_close_callback_ = NULL;
Dart_EntropySource Isolate::entropy_source_callback_ = NULL;
Dart_IsolateInterruptCallback Isolate::vmstats_callback_ = NULL;
+Dart_ServiceIsolateCreateCalback Isolate::service_create_callback_ = NULL;
Monitor* Isolate::isolates_list_monitor_ = NULL;
Isolate* Isolate::isolates_list_head_ = NULL;
« no previous file with comments | « runtime/vm/isolate.h ('k') | runtime/vm/service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698