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

Side by Side Diff: runtime/vm/service_isolate.cc

Issue 1406013004: Fixes shutdown crashes. (Closed) Base URL: git@github.com:dart-lang/sdk.git@master
Patch Set: address comments Created 5 years, 1 month 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/vm/debugger.cc ('k') | runtime/vm/virtual_memory.h » ('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) 2015, the Dart project authors. Please see the AUTHORS file 1 // Copyright (c) 2015, 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 "vm/service_isolate.h" 5 #include "vm/service_isolate.h"
6 6
7 #include "vm/compiler.h" 7 #include "vm/compiler.h"
8 #include "vm/dart_api_impl.h" 8 #include "vm/dart_api_impl.h"
9 #include "vm/dart_entry.h" 9 #include "vm/dart_entry.h"
10 #include "vm/isolate.h" 10 #include "vm/isolate.h"
(...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after
312 isolate = 312 isolate =
313 reinterpret_cast<Isolate*>(create_callback(ServiceIsolate::kName, 313 reinterpret_cast<Isolate*>(create_callback(ServiceIsolate::kName,
314 NULL, 314 NULL,
315 NULL, 315 NULL,
316 NULL, 316 NULL,
317 &api_flags, 317 &api_flags,
318 NULL, 318 NULL,
319 &error)); 319 &error));
320 if (isolate == NULL) { 320 if (isolate == NULL) {
321 OS::PrintErr("vm-service: Isolate creation error: %s\n", error); 321 OS::PrintErr("vm-service: Isolate creation error: %s\n", error);
322 ServiceIsolate::SetServiceIsolate(NULL);
322 ServiceIsolate::FinishedInitializing(); 323 ServiceIsolate::FinishedInitializing();
323 return; 324 return;
324 } 325 }
325 326
326 327
327 Thread::ExitIsolate(); 328 Thread::ExitIsolate();
328 329
329 ServiceIsolate::ConstructExitMessageAndCache(isolate); 330 ServiceIsolate::ConstructExitMessageAndCache(isolate);
330 331
331 RunMain(isolate); 332 RunMain(isolate);
(...skipping 160 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 ASSERT(!result.IsNull()); 493 ASSERT(!result.IsNull());
493 Dart_Port port = ILLEGAL_PORT; 494 Dart_Port port = ILLEGAL_PORT;
494 if (result.IsReceivePort()) { 495 if (result.IsReceivePort()) {
495 port = ReceivePort::Cast(result).Id(); 496 port = ReceivePort::Cast(result).Id();
496 } 497 }
497 ASSERT(port != ILLEGAL_PORT); 498 ASSERT(port != ILLEGAL_PORT);
498 ServiceIsolate::SetServicePort(port); 499 ServiceIsolate::SetServicePort(port);
499 } 500 }
500 501
501 } // namespace dart 502 } // namespace dart
OLDNEW
« no previous file with comments | « runtime/vm/debugger.cc ('k') | runtime/vm/virtual_memory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698