Skip to content

F
Front-End
Commit ba5bb57a authored by Devon Carew's avatar Devon Carew Committed by GitHub
Browse files
Options

Revert "fire service protocol extension events for frames (#10966)" (#11430) 

This reverts commit 4b4cabb7.
parent 4b4cabb7
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 155 deletions
dev/devicelab/bin/tasks/service_extensions_test.dart deleted 100644 → 0
View file @ 4b4cabb7
// Copyright (c) 2017 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:async';
import 'dart:convert';
import 'dart:io';
import 'package:path/path.dart' as path;
import 'package:vm_service_client/vm_service_client.dart';
import 'package:flutter_devicelab/framework/adb.dart';
import 'package:flutter_devicelab/framework/framework.dart';
import 'package:flutter_devicelab/framework/utils.dart';
const int kObservatoryPort = 8888;
void main() {
task(() async {
final Device device = await devices.workingDevice;
await device.unlock();
final Directory appDir = dir(path.join(flutterDirectory.path, 'dev/integration_tests/ui'));
await inDirectory(appDir, () async {
final Completer<Null> ready = new Completer<Null>();
bool ok;
print('run: starting...');
final Process run = await startProcess(
path.join(flutterDirectory.path, 'bin', 'flutter'),
<String>['run', '--verbose', '--observatory-port=$kObservatoryPort', '-d', device.deviceId, 'lib/main.dart'],
);
run.stdout
.transform(UTF8.decoder)
.transform(const LineSplitter())
.listen((String line) {
print('run:stdout: $line');
if (line.contains(new RegExp(r'^\[\s+\] For a more detailed help message, press "h"\. To quit, press "q"\.'))) {
print('run: ready!');
ready.complete();
ok ??= true;
}
});
run.stderr
.transform(UTF8.decoder)
.transform(const LineSplitter())
.listen((String line) {
stderr.writeln('run:stderr: $line');
});
run.exitCode.then((int exitCode) { ok = false; });
await Future.any<dynamic>(<Future<dynamic>>[ ready.future, run.exitCode ]);
if (!ok)
throw 'Failed to run test app.';
final VMServiceClient client = new VMServiceClient.connect('ws://localhost:$kObservatoryPort/ws');
final VM vm = await client.getVM();
final VMIsolateRef isolate = vm.isolates.first;
final Stream<VMExtensionEvent> frameEvents = isolate.onExtensionEvent.where(
(VMExtensionEvent e) => e.kind == 'Flutter.Frame');
print('reassembling app...');
final Future<VMExtensionEvent> frameFuture = frameEvents.first;
await isolate.invokeExtension('ext.flutter.reassemble');
// ensure we get an event
final VMExtensionEvent event = await frameFuture;
print('${event.kind}: ${event.data}');
// validate the fields
// {number: 8, startTime: 0, elapsed: 1437}
expect(event.data['number'] is int);
expect(event.data['number'] >= 0);
expect(event.data['startTime'] is int);
expect(event.data['startTime'] >= 0);
expect(event.data['elapsed'] is int);
expect(event.data['elapsed'] >= 0);
run.stdin.write('q');
final int result = await run.exitCode;
if (result != 0)
throw 'Received unexpected exit code $result from run process.';
});
return new TaskResult.success(null);
});
}
void expect(bool value) {
if (!value)
throw 'failed assertion in service extensions test';
}
dev/devicelab/manifest.yaml
View file @ ba5bb57a
......@@ -121,13 +121,6 @@ tasks:
required_agent_capabilities: ["has-android-device"]
flaky: true
service_extensions_test:
description: >
Validates our service protocol extensions.
stage: devicelab
required_agent_capabilities: ["has-android-device"]
flaky: true
android_sample_catalog_generator:
description: >
Builds sample catalog markdown pages and Android screenshots
......
packages/flutter/lib/foundation.dart
View file @ ba5bb57a
......@@ -40,7 +40,6 @@ export 'src/foundation/licenses.dart';
export 'src/foundation/observer_list.dart';
export 'src/foundation/platform.dart';
export 'src/foundation/print.dart';
export 'src/foundation/profile.dart';
export 'src/foundation/serialization.dart';
export 'src/foundation/synchronous_future.dart';
export 'src/foundation/tree_diagnostics_mixin.dart';
packages/flutter/lib/src/foundation/profile.dart deleted 100644 → 0
View file @ 4b4cabb7
// Copyright 2017 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'dart:ui';
/// Whether we've been built in release mode.
const bool _kReleaseMode = const bool.fromEnvironment("dart.vm.product");
/// When running in profile mode (or debug mode), invoke the given function.
///
/// In release mode, the function is not invoked.
// TODO(devoncarew): Going forward, we'll want the call to profile() to be tree-shaken out.
void profile(VoidCallback function) {
if (_kReleaseMode)
return;
function();
}
packages/flutter/lib/src/scheduler/binding.dart
View file @ ba5bb57a
......@@ -4,7 +4,7 @@
import 'dart:async';
import 'dart:collection';
import 'dart:developer' as developer;
import 'dart:developer';
import 'dart:ui' as ui show window;
import 'dart:ui' show VoidCallback;
......@@ -550,8 +550,7 @@ abstract class SchedulerBinding extends BindingBase {
}
Duration _currentFrameTimeStamp;
int _profileFrameNumber = 0;
final Stopwatch _profileFrameStopwatch = new Stopwatch();
int _debugFrameNumber = 0;
String _debugBanner;
/// Called by the engine to prepare the framework to produce a new frame.
......@@ -578,19 +577,14 @@ abstract class SchedulerBinding extends BindingBase {
/// statements printed during a frame from those printed between frames (e.g.
/// in response to events or timers).
void handleBeginFrame(Duration rawTimeStamp) {
developer.Timeline.startSync('Frame');
Timeline.startSync('Frame');
_firstRawTimeStampInEpoch ??= rawTimeStamp;
_currentFrameTimeStamp = _adjustForEpoch(rawTimeStamp ?? _lastRawTimeStamp);
if (rawTimeStamp != null)
_lastRawTimeStamp = rawTimeStamp;
profile(() {
_profileFrameNumber += 1;
_profileFrameStopwatch.reset();
_profileFrameStopwatch.start();
});
assert(() {
_debugFrameNumber += 1;
if (debugPrintBeginFrameBanner || debugPrintEndFrameBanner) {
final StringBuffer frameTimeStampDescription = new StringBuffer();
if (rawTimeStamp != null) {
......@@ -598,7 +592,7 @@ abstract class SchedulerBinding extends BindingBase {
} else {
frameTimeStampDescription.write('(warm-up frame)');
}
_debugBanner = '▄▄▄▄▄▄▄▄ Frame ${_profileFrameNumber.toString().padRight(7)} ${frameTimeStampDescription.toString().padLeft(18)} ▄▄▄▄▄▄▄▄';
_debugBanner = '▄▄▄▄▄▄▄▄ Frame ${_debugFrameNumber.toString().padRight(7)} ${frameTimeStampDescription.toString().padLeft(18)} ▄▄▄▄▄▄▄▄';
if (debugPrintBeginFrameBanner)
debugPrint(_debugBanner);
}
......@@ -609,7 +603,7 @@ abstract class SchedulerBinding extends BindingBase {
_hasScheduledFrame = false;
try {
// TRANSIENT FRAME CALLBACKS
developer.Timeline.startSync('Animate');
Timeline.startSync('Animate');
_schedulerPhase = SchedulerPhase.transientCallbacks;
final Map<int, _FrameCallbackEntry> callbacks = _transientCallbacks;
_transientCallbacks = <int, _FrameCallbackEntry>{};
......@@ -634,7 +628,7 @@ abstract class SchedulerBinding extends BindingBase {
/// useful when working with frame callbacks.
void handleDrawFrame() {
assert(_schedulerPhase == SchedulerPhase.midFrameMicrotasks);
developer.Timeline.finishSync(); // end the "Animate" phase
Timeline.finishSync(); // end the "Animate" phase
try {
// PERSISTENT FRAME CALLBACKS
_schedulerPhase = SchedulerPhase.persistentCallbacks;
......@@ -650,22 +644,14 @@ abstract class SchedulerBinding extends BindingBase {
_invokeFrameCallback(callback, _currentFrameTimeStamp);
} finally {
_schedulerPhase = SchedulerPhase.idle;
developer.Timeline.finishSync(); // end the Frame
profile(() {
_profileFrameStopwatch.stop();
developer.postEvent('Flutter.Frame', <String, dynamic>{
'number': _profileFrameNumber,
'startTime': _currentFrameTimeStamp.inMicroseconds,
'elapsed': _profileFrameStopwatch.elapsedMicroseconds
});
});
_currentFrameTimeStamp = null;
Timeline.finishSync();
assert(() {
if (debugPrintEndFrameBanner)
debugPrint('▀' * _debugBanner.length);
_debugBanner = null;
return true;
});
_currentFrameTimeStamp = null;
}
// All frame-related callbacks have been executed. Run lower-priority tasks.
......
packages/flutter/test/foundation/profile_test.dart deleted 100644 → 0
View file @ 4b4cabb7
// Copyright 2017 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'package:flutter/foundation.dart';
import 'package:test/test.dart';
const bool isReleaseMode = const bool.fromEnvironment("dart.vm.product");
void main() {
test("profile invokes its closure in debug or profile mode", () {
int count = 0;
profile(() {
count++;
});
expect(count, isReleaseMode ? 0 : 1);
});
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab