Fix long startup problem without CPU thrashing (#79)

* Fix 4 second pause on startup * Remove debug * Fix long startup problem * Rename queue * Avoid asyncAfter (CPU thrashing) * merge * merge
RuntimeTools · Mar 16, 2017 · 02b65a1 · 02b65a1
1 parent 090c8f5
commit 02b65a1
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 16 deletions.
diff --git a/Sources/SwiftMetrics/SwiftMetrics.swift b/Sources/SwiftMetrics/SwiftMetrics.swift
@@ -107,15 +107,16 @@ open class SwiftMetrics {
   private func testLatency() {
     if(latencyEnabled) {
       // Run every two seconds
-      jobsQueue.asyncAfter(deadline: .now() + .seconds(2), execute: {
+     jobsQueue.async {
+        sleep(2)
         let preDispatchTime = Date().timeIntervalSince1970 * 1000;
         DispatchQueue.global().async {
           let timeNow = Date().timeIntervalSince1970 * 1000
           let latencyTime = timeNow - preDispatchTime
           self.emitData(LatencyData(timeOfSample: Int(preDispatchTime), duration:latencyTime))
           self.testLatency()
         }
-      })
+      }
     }
   }
 

diff --git a/Sources/SwiftMetricsDash/SwiftMetricsDash.swift b/Sources/SwiftMetricsDash/SwiftMetricsDash.swift
@@ -119,7 +119,6 @@ class SwiftMetricsService: WebSocketService {
         monitor.on(sendMEM)
         monitor.on(storeHTTP)
         sendhttpData()
-        sendhttpURLData()
     }
 
 
@@ -264,20 +263,14 @@ class SwiftMetricsService: WebSocketService {
                     "average":"\(localCopy.average)",
                     "total":"\(localCopy.total)"]])
 
-                    for (_,connection) in self.connections {
-                        if let messageToSend = httpLine.rawString() {
-                            connection.send(message: messageToSend)
-                        }
+                for (_,connection) in self.connections {
+                    if let messageToSend = httpLine.rawString() {
+                        connection.send(message: messageToSend)
                     }
+                }
                 self.httpAggregateData = HTTPAggregateData()
             }
-            jobsQueue.asyncAfter(deadline: .now() + .seconds(2), execute: {
-                self.sendhttpData()
-            })
         }
-    }
-
-    func sendhttpURLData() {
         httpURLsQueue.sync {
             var responseData:[JSON] = []
             let localCopy = self.httpURLData
@@ -301,9 +294,11 @@ class SwiftMetricsService: WebSocketService {
                   connection.send(message: messageToSend2)
               }
             }
-            jobsQueue.asyncAfter(deadline: .now() + .seconds(2), execute: {
-                self.sendhttpURLData()
-            })
+            jobsQueue.async {
+                // re-run this function after 2 seconds
+                sleep(2)
+                self.sendhttpData()
+            }
         }
     }