Skip to content

Commit 661dbd3

Browse files
authored
Revert "Remove superfluous INFO logs from //flutter/runtime. (flutter#16280)"
This reverts commit aa78c13.
1 parent a697d8b commit 661dbd3

File tree

3 files changed

+22
-0
lines changed

3 files changed

+22
-0
lines changed

runtime/dart_isolate.cc

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -508,6 +508,7 @@ bool DartIsolate::Run(const std::string& entrypoint_name,
508508
}
509509

510510
phase_ = Phase::Running;
511+
FML_DLOG(INFO) << "New isolate is in the running state.";
511512

512513
if (on_run) {
513514
on_run();
@@ -539,6 +540,7 @@ bool DartIsolate::RunFromLibrary(const std::string& library_name,
539540
}
540541

541542
phase_ = Phase::Running;
543+
FML_DLOG(INFO) << "New isolate is in the running state.";
542544

543545
if (on_run) {
544546
on_run();
@@ -586,6 +588,7 @@ Dart_Isolate DartIsolate::DartCreateAndStartServiceIsolate(
586588
const auto& settings = vm_data->GetSettings();
587589

588590
if (!settings.enable_observatory) {
591+
FML_DLOG(INFO) << "Observatory is disabled.";
589592
return nullptr;
590593
}
591594

@@ -831,13 +834,19 @@ void DartIsolate::DartIsolateShutdownCallback(
831834
std::shared_ptr<DartIsolateGroupData>* isolate_group_data,
832835
std::shared_ptr<DartIsolate>* isolate_data) {
833836
TRACE_EVENT0("flutter", "DartIsolate::DartIsolateShutdownCallback");
837+
FML_DLOG(INFO) << "DartIsolateShutdownCallback"
838+
<< " isolate_group_data " << isolate_group_data
839+
<< " isolate_data " << isolate_data;
834840
isolate_data->get()->OnShutdownCallback();
835841
}
836842

837843
// |Dart_IsolateGroupCleanupCallback|
838844
void DartIsolate::DartIsolateGroupCleanupCallback(
839845
std::shared_ptr<DartIsolateGroupData>* isolate_data) {
840846
TRACE_EVENT0("flutter", "DartIsolate::DartIsolateGroupCleanupCallback");
847+
FML_DLOG(INFO) << "DartIsolateGroupCleanupCallback isolate_data "
848+
<< isolate_data;
849+
841850
delete isolate_data;
842851
}
843852

@@ -846,6 +855,9 @@ void DartIsolate::DartIsolateCleanupCallback(
846855
std::shared_ptr<DartIsolateGroupData>* isolate_group_data,
847856
std::shared_ptr<DartIsolate>* isolate_data) {
848857
TRACE_EVENT0("flutter", "DartIsolate::DartIsolateCleanupCallback");
858+
859+
FML_DLOG(INFO) << "DartIsolateCleanupCallback cleaned up isolate_data "
860+
<< isolate_data;
849861
delete isolate_data;
850862
}
851863

runtime/dart_isolate_unittests.cc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,7 @@ class AutoIsolateShutdown {
111111
fml::AutoResetWaitableEvent latch;
112112
fml::TaskRunner::RunNowOrPostTask(
113113
runner_, [isolate = std::move(isolate_), &latch]() {
114+
FML_LOG(INFO) << "Shutting down isolate.";
114115
if (!isolate->Shutdown()) {
115116
FML_LOG(ERROR) << "Could not shutdown isolate.";
116117
FML_CHECK(false);

runtime/dart_vm.cc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,9 @@ DartVM::DartVM(std::shared_ptr<const DartVMData> vm_data,
282282
FML_DCHECK(isolate_name_server_);
283283
FML_DCHECK(service_protocol_);
284284

285+
FML_DLOG(INFO) << "Attempting Dart VM launch for mode: "
286+
<< (IsRunningPrecompiledCode() ? "AOT" : "Interpreter");
287+
285288
{
286289
TRACE_EVENT0("flutter", "dart::bin::BootstrapDartIo");
287290
dart::bin::BootstrapDartIo();
@@ -453,6 +456,9 @@ DartVM::DartVM(std::shared_ptr<const DartVMData> vm_data,
453456
Dart_SetDartLibrarySourcesKernel(dart_library_sources->GetMapping(),
454457
dart_library_sources->GetSize());
455458
}
459+
460+
FML_DLOG(INFO) << "New Dart VM instance created. Instance count: "
461+
<< gVMLaunchCount;
456462
}
457463

458464
DartVM::~DartVM() {
@@ -472,6 +478,9 @@ DartVM::~DartVM() {
472478
<< "Could not cleanly shut down the Dart VM. Error: \"" << result
473479
<< "\".";
474480
free(result);
481+
482+
FML_DLOG(INFO) << "Dart VM instance destroyed. Instance count: "
483+
<< gVMLaunchCount;
475484
}
476485

477486
std::shared_ptr<const DartVMData> DartVM::GetVMData() const {

0 commit comments

Comments
 (0)