Ryan Macnak
407872b9e5
This reverts commit 2998c32951.
Reason for revert: Failures with kernel + simulators
Original change's description:
> [vm] Remove Dart_ReadKernelBinary.
>
> - Fix const-ness of Dart_FileReadCallback and callers.
> - Fix leak on read error in DartUtils::FileRead.
>
> This is progress towards sharing kernel memory on Fuchsia.
>
> Bug: https://github.com/dart-lang/sdk/issues/32618
> Change-Id: I47f8b224905d6a105a5ca0ab2ee4ab6a42b5e342
> Reviewed-on: https://dart-review.googlesource.com/47102
> Commit-Queue: Ryan Macnak <rmacnak@google.com>
> Reviewed-by: Siva Annamalai <asiva@google.com>
TBR=aam@google.com,rmacnak@google.com,asiva@google.com
Change-Id: Ibb636b817de1629a062fe0a6ef9462a2fef669ef
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: https://github.com/dart-lang/sdk/issues/32618
Reviewed-on: https://dart-review.googlesource.com/54560
Reviewed-by: Ryan Macnak <rmacnak@google.com>
Commit-Queue: Ryan Macnak <rmacnak@google.com>
58 lines
1.5 KiB
C++
58 lines
1.5 KiB
C++
// Copyright (c) 2017, the Dart project authors. Please see the AUTHORS file
|
|
// for details. All rights reserved. Use of this source code is governed by a
|
|
// BSD-style license that can be found in the LICENSE file.
|
|
|
|
#include "bin/isolate_data.h"
|
|
#include "bin/snapshot_utils.h"
|
|
|
|
#include "vm/kernel.h"
|
|
|
|
namespace dart {
|
|
namespace bin {
|
|
|
|
IsolateData::IsolateData(const char* url,
|
|
const char* package_root,
|
|
const char* packages_file,
|
|
AppSnapshot* app_snapshot)
|
|
: script_url((url != NULL) ? strdup(url) : NULL),
|
|
package_root(NULL),
|
|
packages_file(NULL),
|
|
kernel_program(NULL),
|
|
builtin_lib_(NULL),
|
|
loader_(NULL),
|
|
app_snapshot_(app_snapshot),
|
|
dependencies_(NULL),
|
|
create_isolate_from_kernel_(false) {
|
|
if (package_root != NULL) {
|
|
ASSERT(packages_file == NULL);
|
|
this->package_root = strdup(package_root);
|
|
} else if (packages_file != NULL) {
|
|
this->packages_file = strdup(packages_file);
|
|
}
|
|
}
|
|
|
|
void IsolateData::OnIsolateShutdown() {
|
|
if (builtin_lib_ != NULL) {
|
|
Dart_DeletePersistentHandle(builtin_lib_);
|
|
builtin_lib_ = NULL;
|
|
}
|
|
}
|
|
|
|
IsolateData::~IsolateData() {
|
|
free(script_url);
|
|
script_url = NULL;
|
|
free(package_root);
|
|
package_root = NULL;
|
|
free(packages_file);
|
|
packages_file = NULL;
|
|
if (kernel_program != NULL) {
|
|
delete reinterpret_cast<kernel::Program*>(kernel_program);
|
|
kernel_program = NULL;
|
|
}
|
|
delete app_snapshot_;
|
|
app_snapshot_ = NULL;
|
|
}
|
|
|
|
} // namespace bin
|
|
} // namespace dart
|