---

yaml
---
r: 347123
b: refs/heads/master
c: 88d1183
h: refs/heads/master
i:
  347121: b6f1f00
  347119: 556d8a9

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: d8d21e792ce98b73b8267590ac592af2f504858c
+refs/heads/master: 88d1183e589363a9722c7db5090a55a5d1ec187b
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/validation-test/stdlib/StringMemoryTest.swift

@@ -12,6 +12,14 @@ import Foundation
 let str = "abcdefg\u{A758}hijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz\u{A759}"
 let str2 = "abcdefg\u{A759}hijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz\u{A758}"
 
+
+@inline(never)
+func getMemoryUsage() -> Int {
+  var usage = rusage()
+  getrusage(RUSAGE_SELF, &usage)
+  return usage.ru_maxrss
+}
+
 @inline(never)
 func lookup(_ str: String, _ dict: [String: Int]) -> Bool {
   if let _ = dict[str] {
@@ -30,35 +38,44 @@ func lowercase(_ str: String) -> String {
       return str.lowercased()
 }
 
+@inline(never)
+func runTest() {
+  for _ in 0 ..< 10_0000 {
+    if lookup("\u{1F1E7}\u{1F1E7}", dict) {
+      print("Found?!")
+    }
+    if uppercase(str) == "A" {
+      print("Found?!")
+    }
+    if lowercase(str2) == "A" {
+      print("Found?!")
+    }
+  }
+}
+
+
 /// Make sure the hash function does not leak.
 
 let dict = [ "foo" : 1]
-for _ in 0 ..< 10_000_000 {
-  if lookup("\u{1F1E7}\u{1F1E7}", dict) {
-    print("Found?!")
-  }
-  if uppercase(str) == "A" {
-    print("Found?!")
-  }
-  if lowercase(str2) == "A" {
-    print("Found?!")
-  }
-}
+
+let baseUsage = getMemoryUsage()
+runTest()
+let firstRun = getMemoryUsage () - baseUsage
+runTest()
+runTest()
+let secondRun = getMemoryUsage () - baseUsage
 
 // CHECK-NOT: Found?!
 // CHECK: Not found
 
 print("Not found")
 
-var usage = rusage()
-getrusage(RUSAGE_SELF, &usage)
-
 // CHECK: success
 // CHECK-NOT: failure
 
 // We should not need 50MB for this.
-if usage.ru_maxrss > 50 * 1024 * 1024 {
-  print("failure - should not need 50MB!")
+if firstRun * 2 < secondRun  {
+  print("failure - should not linearly increase")
 } else {
   print("success")
 }