echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Mac OSX Launcher: Cancel stream that can cause high cpu load on router stop.

Browse Source
This commit is contained in:
meeh
2018-09-30 11:02:28 +00:00
parent 2233f7f47b
commit b5497ef72e
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
launchers/macosx/I2PLauncher/userinterface/LogViewController.swift
View File

@ -36,17 +36,23 @@ class LogViewerViewController : NSTabViewItem {
let output = self.outputPipe?.fileHandleForReading.availableData let output = self.outputPipe?.fileHandleForReading.availableData
let outputString = String(data: output!, encoding: String.Encoding.utf8) ?? "" let outputString = String(data: output!, encoding: String.Encoding.utf8) ?? ""
let workTask = DispatchWorkItem {
DispatchQueue.main.async(execute: {
let previousOutput = self.textFieldView?.string ?? "" let previousOutput = self.textFieldView?.string ?? ""
let nextOutput = previousOutput + "\n" + outputString let nextOutput = previousOutput + "\n" + outputString
self.textFieldView?.string = nextOutput self.textFieldView?.string = nextOutput
let range = NSRange(location:nextOutput.characters.count,length:0) let range = NSRange(location:nextOutput.characters.count,length:0)
self.textFieldView?.scrollRangeToVisible(range) self.textFieldView?.scrollRangeToVisible(range)
}
DispatchQueue.main.async(execute: workTask)
// When router stop, stop the stream as well. If not it will go wild and create high cpu load
RouterManager.shared().eventManager.listenTo(eventName: "router_stop", action: {
NSLog("Time to cancel stream!")
workTask.cancel()
}) })
self.outputPipe?.fileHandleForReading.waitForDataInBackgroundAndNotify() self.outputPipe?.fileHandleForReading.waitForDataInBackgroundAndNotify()
} }