Skip to content

fix: high cpu usage during livesync #4322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 30, 2019
+91 −62
Merged

fix: high cpu usage during livesync #4322

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 48 additions & 33 deletions lib/common/mobile/mobile-core/devices-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import { performanceLog } from "../../decorators";

export class DevicesService extends EventEmitter implements Mobile.IDevicesService {
private static DEVICE_LOOKING_INTERVAL = 200;
private static EMULATOR_IMAGES_DETECTION_INTERVAL = 60 * 1000;
private _devices: IDictionary<Mobile.IDevice> = {};
private _availableEmulators: IDictionary<Mobile.IDeviceInfo> = {};
private _platform: string;
Expand All @@ -21,8 +22,7 @@ export class DevicesService extends EventEmitter implements Mobile.IDevicesServi
private _data: Mobile.IDevicesServicesInitializationOptions;
private _otherDeviceDiscoveries: Mobile.IDeviceDiscovery[] = [];
private _allDeviceDiscoveries: Mobile.IDeviceDiscovery[] = [];
private deviceDetectionInterval: any;
private isDeviceDetectionIntervalInProgress: boolean;
private deviceDetectionIntervals: NodeJS.Timer[] = [];

constructor(private $logger: ILogger,
private $errors: IErrors,
Expand Down Expand Up @@ -287,43 +287,51 @@ export class DevicesService extends EventEmitter implements Mobile.IDevicesServi
}
}

protected async startDeviceDetectionInterval(deviceInitOpts: Mobile.IDevicesServicesInitializationOptions = {}): Promise<void> {
protected async startDeviceDetectionIntervals(deviceInitOpts: Mobile.IDevicesServicesInitializationOptions = {}): Promise<void> {
this.$processService.attachToProcessExitSignals(this, this.clearDeviceDetectionInterval);

if (this.deviceDetectionInterval) {
this.$logger.trace("Device detection interval is already started. New Interval will not be started.");
if (this.deviceDetectionIntervals.length) {
this.$logger.trace("Device detection intervals are already started. New intervals will not be started.");
return;
}
let isFirstExecution = true;

return new Promise<void>((resolve, reject) => {
this.deviceDetectionInterval = setInterval(async () => {
if (this.isDeviceDetectionIntervalInProgress) {
return;
}
let isDeviceDetectionIntervalInProgress = false;
const deviceDetectionInterval = setInterval(async () => {
if (isDeviceDetectionIntervalInProgress) {
return;
}

this.isDeviceDetectionIntervalInProgress = true;
isDeviceDetectionIntervalInProgress = true;

await this.detectCurrentlyAttachedDevices(deviceInitOpts);
await this.detectCurrentlyAvailableEmulators();
await this.detectCurrentlyAttachedDevices(deviceInitOpts);

try {
const trustedDevices = _.filter(this._devices, device => device.deviceInfo.status === constants.CONNECTED_STATUS);
await settlePromises(_.map(trustedDevices, device => device.applicationManager.checkForApplicationUpdates()));
} catch (err) {
this.$logger.trace("Error checking for application updates on devices.", err);
}
try {
const trustedDevices = _.filter(this._devices, device => device.deviceInfo.status === constants.CONNECTED_STATUS);
await settlePromises(_.map(trustedDevices, device => device.applicationManager.checkForApplicationUpdates()));
} catch (err) {
this.$logger.trace("Error checking for application updates on devices.", err);
}

if (isFirstExecution) {
isFirstExecution = false;
resolve();
this.deviceDetectionInterval.unref();
}
isDeviceDetectionIntervalInProgress = false;

this.isDeviceDetectionIntervalInProgress = false;
}, DevicesService.DEVICE_LOOKING_INTERVAL);

}, DevicesService.DEVICE_LOOKING_INTERVAL);
});
deviceDetectionInterval.unref();
this.deviceDetectionIntervals.push(deviceDetectionInterval);

let isEmulatorDetectionIntervalRunning = false;
const emulatorDetectionInterval = setInterval(async () => {
if (isEmulatorDetectionIntervalRunning) {
return;
}

isEmulatorDetectionIntervalRunning = true;
await this.detectCurrentlyAvailableEmulators();
isEmulatorDetectionIntervalRunning = false;
}, DevicesService.EMULATOR_IMAGES_DETECTION_INTERVAL);

emulatorDetectionInterval.unref();
this.deviceDetectionIntervals.push(emulatorDetectionInterval);
}

/**
Expand All @@ -348,14 +356,17 @@ export class DevicesService extends EventEmitter implements Mobile.IDevicesServi
/**
* Starts looking for running devices. All found devices are pushed to _devices variable.
*/
private startLookingForDevices(deviceInitOpts?: Mobile.IDevicesServicesInitializationOptions): Promise<void> {
private async startLookingForDevices(deviceInitOpts?: Mobile.IDevicesServicesInitializationOptions): Promise<void> {
this.$logger.trace("startLookingForDevices; platform is %s", this._platform);

if (this._platform) {
return this.detectCurrentlyAttachedDevices(deviceInitOpts);
}

return this.startDeviceDetectionInterval(deviceInitOpts);
await this.detectCurrentlyAttachedDevices(deviceInitOpts);
await this.detectCurrentlyAvailableEmulators();

await this.startDeviceDetectionIntervals(deviceInitOpts);
}

/**
Expand Down Expand Up @@ -690,10 +701,14 @@ export class DevicesService extends EventEmitter implements Mobile.IDevicesServi
}

private clearDeviceDetectionInterval(): void {
if (this.deviceDetectionInterval) {
clearInterval(this.deviceDetectionInterval);
if (this.deviceDetectionIntervals.length) {
for (const interval of this.deviceDetectionIntervals) {
clearInterval(interval);
}

this.deviceDetectionIntervals.splice(0, this.deviceDetectionIntervals.length);
} else {
this.$logger.trace("Device detection interval is not started, so it cannot be stopped.");
this.$logger.trace("Device detection intervals are not started, so it cannot be stopped.");
}
}

Expand Down
72 changes: 43 additions & 29 deletions lib/common/test/unit-tests/mobile/devices-service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ class DevicesServiceInheritor extends DevicesService {
return super.startEmulatorIfNecessary(data);
}

public startDeviceDetectionInterval(deviceInitOpts: Mobile.IDevicesServicesInitializationOptions = {}): Promise<void> {
return super.startDeviceDetectionInterval(deviceInitOpts);
public startDeviceDetectionIntervals(deviceInitOpts: Mobile.IDevicesServicesInitializationOptions = {}): Promise<void> {
return super.startDeviceDetectionIntervals(deviceInitOpts);
}

public detectCurrentlyAttachedDevices(options?: Mobile.IDevicesServicesInitializationOptions): Promise<void> {
Expand Down Expand Up @@ -236,6 +236,15 @@ function resetDefaultSetInterval(): void {
global.setInterval = originalSetInterval;
}

async function assertOnNextTick(assertionFunction: Function): Promise<void> {
await new Promise(resolve => {
process.nextTick(() => {
assertionFunction();
resolve();
});
});
}

describe("devicesService", () => {
let counter = 0;
const iOSDevice = {
Expand Down Expand Up @@ -1184,7 +1193,7 @@ describe("devicesService", () => {
});
});

describe("startDeviceDetectionInterval", () => {
describe("startDeviceDetectionIntervals", () => {
let setIntervalsCalledCount: number;

beforeEach(() => {
Expand All @@ -1203,7 +1212,7 @@ describe("devicesService", () => {
hasStartedDeviceDetectionInterval = true;
});

await devicesService.startDeviceDetectionInterval();
await devicesService.startDeviceDetectionIntervals();

assert.isTrue(hasStartedDeviceDetectionInterval);
});
Expand All @@ -1227,11 +1236,11 @@ describe("devicesService", () => {
};
};

await devicesService.startDeviceDetectionInterval();
await devicesService.startDeviceDetectionInterval();
await devicesService.startDeviceDetectionInterval();
await devicesService.startDeviceDetectionIntervals();
await devicesService.startDeviceDetectionIntervals();
await devicesService.startDeviceDetectionIntervals();

assert.deepEqual(setIntervalsCalledCount, 1);
assert.deepEqual(setIntervalsCalledCount, 2);
});

describe("ios devices check", () => {
Expand All @@ -1248,15 +1257,15 @@ describe("devicesService", () => {
hasCheckedForIosDevices = true;
};

await devicesService.startDeviceDetectionInterval();
await devicesService.startDeviceDetectionIntervals();

assert.isTrue(hasCheckedForIosDevices);
});

it("should not throw if ios device check fails throws an exception.", async () => {
(<any>$iOSDeviceDiscovery).checkForDevices = throwErrorFunction;

await assert.isFulfilled(devicesService.startDeviceDetectionInterval());
await assert.isFulfilled(devicesService.startDeviceDetectionIntervals());
});
});

Expand All @@ -1267,22 +1276,22 @@ describe("devicesService", () => {
$androidDeviceDiscovery = testInjector.resolve("androidDeviceDiscovery");
});

it("should check for android devices.", async () => {
it("should start interval that will check for android devices.", async () => {
let hasCheckedForAndroidDevices = false;

$androidDeviceDiscovery.startLookingForDevices = async (): Promise<void> => {
hasCheckedForAndroidDevices = true;
};

await devicesService.startDeviceDetectionInterval();

assert.isTrue(hasCheckedForAndroidDevices);
mockSetInterval();
await devicesService.startDeviceDetectionIntervals();
await assertOnNextTick(() => assert.isTrue(hasCheckedForAndroidDevices));
});

it("should not throw if android device check fails throws an exception.", async () => {
$androidDeviceDiscovery.startLookingForDevices = throwErrorFunction;

await assert.isFulfilled(devicesService.startDeviceDetectionInterval());
await assert.isFulfilled(devicesService.startDeviceDetectionIntervals());
});
});

Expand All @@ -1305,7 +1314,7 @@ describe("devicesService", () => {
it("should not throw if ios simulator check fails throws an exception.", async () => {
(<any>$iOSSimulatorDiscovery).checkForDevices = throwErrorFunction;

await assert.isFulfilled(devicesService.startDeviceDetectionInterval());
await assert.isFulfilled(devicesService.startDeviceDetectionIntervals());
});
});

Expand All @@ -1317,22 +1326,23 @@ describe("devicesService", () => {
devicesService.addDeviceDiscovery(customDeviceDiscovery);
});

it("should check for devices.", async () => {
it("should check for devices in interval", async () => {
let hasCheckedForDevices = false;

customDeviceDiscovery.startLookingForDevices = async (): Promise<void> => {
hasCheckedForDevices = true;
};

await devicesService.startDeviceDetectionInterval();
mockSetInterval();
await devicesService.startDeviceDetectionIntervals();

assert.isTrue(hasCheckedForDevices);
await assertOnNextTick(() => assert.isTrue(hasCheckedForDevices));
});

it("should not throw if device check fails throws an exception.", async () => {
customDeviceDiscovery.startLookingForDevices = throwErrorFunction;

await assert.isFulfilled(devicesService.startDeviceDetectionInterval());
await assert.isFulfilled(devicesService.startDeviceDetectionIntervals());
});
});

Expand Down Expand Up @@ -1361,34 +1371,38 @@ describe("devicesService", () => {
});

it("should check for application updates for all connected devices.", async () => {
await devicesService.startDeviceDetectionInterval();
await devicesService.startDeviceDetectionIntervals();

assert.isTrue(hasCheckedForAndroidAppUpdates);
assert.isTrue(hasCheckedForIosAppUpdates);
await assertOnNextTick(() => {
assert.isTrue(hasCheckedForAndroidAppUpdates);
assert.isTrue(hasCheckedForIosAppUpdates);
});
});

it("should check for application updates if the check on one device throws an exception.", async () => {
iOSDevice.applicationManager.checkForApplicationUpdates = throwErrorFunction;

await devicesService.startDeviceDetectionInterval();
await devicesService.startDeviceDetectionIntervals();

assert.isTrue(hasCheckedForAndroidAppUpdates);
await assertOnNextTick(() => assert.isTrue(hasCheckedForAndroidAppUpdates));
});

it("should check for application updates only on devices with status Connected", async () => {
androidDevice.deviceInfo.status = constants.UNREACHABLE_STATUS;
await devicesService.startDeviceDetectionInterval();
await devicesService.startDeviceDetectionIntervals();

assert.isFalse(hasCheckedForAndroidAppUpdates);
assert.isTrue(hasCheckedForIosAppUpdates);
await assertOnNextTick(() => {
assert.isFalse(hasCheckedForAndroidAppUpdates);
assert.isTrue(hasCheckedForIosAppUpdates);
});
});

it("should not throw if all checks for application updates on all devices throw exceptions.", () => {
iOSDevice.applicationManager.checkForApplicationUpdates = throwErrorFunction;
androidDevice.applicationManager.checkForApplicationUpdates = throwErrorFunction;

const callback = () => {
devicesService.startDeviceDetectionInterval.call(devicesService);
devicesService.startDeviceDetectionIntervals.call(devicesService);
};

assert.doesNotThrow(callback);
Expand Down