Skip to content
This repository has been archived by the owner on Feb 2, 2021. It is now read-only.

Fixed: CLI crashes/stops responding after ~80 console.logs #847

Merged
merged 1 commit into from
Dec 9, 2016
Merged

Fixed: CLI crashes/stops responding after ~80 console.logs #847

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
2 changes: 1 addition & 1 deletion mobile/device-log-provider.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ export class DeviceLogProvider extends DeviceLogProviderBase {

let data = this.$logFilter.filterData(platform, lineText, applicationPid);
if (data) {
this.$logger.out(data);
this.$logger.write(data);
}
}

Expand Down
39 changes: 22 additions & 17 deletions mobile/ios/device/ios-core.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1083,18 +1083,16 @@ function getCharacterCodePoint(ch: string) {
class GDBStandardOutputAdapter extends stream.Transform {
private utf8StringDecoder = new string_decoder.StringDecoder("utf8");

constructor(private deviceIdentifier: string,
private $deviceLogProvider: Mobile.IDeviceLogProvider,
private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants) {
super();
constructor(opts?:stream.TransformOptions) {
super(opts);
}

public _transform(packet: any, encoding: string, done: Function): void {
public _transform(packet:any, encoding:string, done:Function):void {
try {
let result = "";

for (let i = 0; i < packet.length; i++) {
if (packet[i] === getCharacterCodePoint("$")) {
if(packet[i] === getCharacterCodePoint("$")) {
let start = ++i;

while (packet[i] !== getCharacterCodePoint("#")) {
Expand All @@ -1106,7 +1104,7 @@ class GDBStandardOutputAdapter extends stream.Transform {
i++;
i++;

if (!(packet[start] === getCharacterCodePoint("O") && packet[start + 1] !== getCharacterCodePoint("K"))) {
if(!(packet[start] === getCharacterCodePoint("O") && packet[start + 1] !== getCharacterCodePoint("K"))) {
continue;
}
start++;
Expand All @@ -1116,13 +1114,6 @@ class GDBStandardOutputAdapter extends stream.Transform {
result += this.utf8StringDecoder.write(hex);
}
}

if (this.$deviceLogProvider) {
fiberBootstrap.run(() =>
this.$deviceLogProvider.logData(result, this.$devicePlatformsConstants.iOS, this.deviceIdentifier)
);
}

done(null, result);
} catch (e) {
done(e);
Expand Down Expand Up @@ -1159,11 +1150,26 @@ class GDBSignalWatcher extends stream.Writable {
}
}
}
class GDBEchoStream extends stream.Writable {
constructor(private deviceIdentifier: string,
private $deviceLogProvider: Mobile.IDeviceLogProvider,
private $devicePlatformsConstants: Mobile.IDevicePlatformsConstants) {
super();
}

_write(chunk:any, enc:string, done:Function) {
if (this.$deviceLogProvider) {
fiberBootstrap.run(() => {
this.$deviceLogProvider.logData(chunk.toString(), this.$devicePlatformsConstants.iOS, this.deviceIdentifier);
});
}
done();
}
}

export class GDBServer implements Mobile.IGDBServer {
private okResponse = "$OK#";
private isInitilized = false;

constructor(private socket: any, // socket is fd on Windows and net.Socket on mac
private deviceIdentifier: string,
private $injector: IInjector,
Expand Down Expand Up @@ -1192,7 +1198,6 @@ export class GDBServer implements Mobile.IGDBServer {
this.awaitResponse("QSetDisableASLR:1").wait();
let encodedArguments = _.map(argv, (arg, index) => util.format("%d,%d,%s", arg.length * 2, index, this.toHex(arg))).join(",");
this.awaitResponse("A" + encodedArguments).wait();

this.isInitilized = true;
}
}).future<void>()();
Expand All @@ -1215,7 +1220,7 @@ export class GDBServer implements Mobile.IGDBServer {
this.sendCore(this.encodeData("D"));
}
} else {
this.socket.pipe(this.$injector.resolve(GDBStandardOutputAdapter, { deviceIdentifier: this.deviceIdentifier }));
this.socket.pipe(new GDBStandardOutputAdapter()).pipe(this.$injector.resolve(GDBEchoStream, { deviceIdentifier: this.deviceIdentifier }));
this.socket.pipe(new GDBSignalWatcher());
this.sendCore(this.encodeData("vCont;c"));
}
Expand Down