Changeset b5497ef

Timestamp:

Sep 30, 2018 11:02:28 AM (2 years ago)

Author:

meeh <meeh@…>

Branches:

master

Children:

410f9df

Parents:

2233f7f

Message:

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

File:

• launchers/macosx/I2PLauncher/userinterface/LogViewController.swift (modified) (2 diffs)

launchers/macosx/I2PLauncher/userinterface/LogViewController.swift

@@ -37 +37 @@
       let output = self.outputPipe?.fileHandleForReading.availableData
       let outputString = String(data: output!, encoding: String.Encoding.utf8) ?? ""
-      
-      DispatchQueue.main.async(execute: {
+      let workTask = DispatchWorkItem {
         let previousOutput = self.textFieldView?.string ?? ""
         let nextOutput = previousOutput + "\n" + outputString
@@ -45 +44 @@
         let range = NSRange(location:nextOutput.characters.count,length:0)
         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()