From 95387dd2201dcc21d9977e03f85b8483c2f94b56 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Tue, 2 Oct 2018 14:57:00 -0400
Subject: [PATCH] Fix rebase breakage.
---
.../migrations/OWS111UDAttributesMigration.swift | 3 ++-
.../migrations/OWSDatabaseMigrationRunner.m | 2 +-
SignalMessaging/utils/Bench.swift | 11 ++++++++++-
3 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/SignalMessaging/environment/migrations/OWS111UDAttributesMigration.swift b/SignalMessaging/environment/migrations/OWS111UDAttributesMigration.swift
index ae94b22d2..a9a0c99ba 100644
--- a/SignalMessaging/environment/migrations/OWS111UDAttributesMigration.swift
+++ b/SignalMessaging/environment/migrations/OWS111UDAttributesMigration.swift
@@ -4,7 +4,8 @@
import Foundation
-class OWS111UDAttributesMigration: OWSDatabaseMigration {
+@objc
+public class OWS111UDAttributesMigration: OWSDatabaseMigration {
// MARK: - Singletons
diff --git a/SignalMessaging/environment/migrations/OWSDatabaseMigrationRunner.m b/SignalMessaging/environment/migrations/OWSDatabaseMigrationRunner.m
index c47aa6c7b..82cfdd0ec 100644
--- a/SignalMessaging/environment/migrations/OWSDatabaseMigrationRunner.m
+++ b/SignalMessaging/environment/migrations/OWSDatabaseMigrationRunner.m
@@ -44,7 +44,7 @@ NS_ASSUME_NONNULL_BEGIN
[[OWS106EnsureProfileComplete alloc] initWithPrimaryStorage:primaryStorage],
[[OWS107LegacySounds alloc] initWithPrimaryStorage:primaryStorage],
[[OWS108CallLoggingPreference alloc] initWithPrimaryStorage:primaryStorage],
- [[OWS109OutgoingMessageState alloc] initWithPrimaryStorage:primaryStorage]
+ [[OWS109OutgoingMessageState alloc] initWithPrimaryStorage:primaryStorage],
[[OWS111UDAttributesMigration alloc] initWithPrimaryStorage:primaryStorage],
];
}
diff --git a/SignalMessaging/utils/Bench.swift b/SignalMessaging/utils/Bench.swift
index e11e4622b..06829833a 100644
--- a/SignalMessaging/utils/Bench.swift
+++ b/SignalMessaging/utils/Bench.swift
@@ -4,7 +4,16 @@
import Foundation
-public func BenchAsync(title: String, block: (() -> Void) -> Void) {
+/// Benchmark async code by calling the passed in block parameter when the work
+/// is done.
+///
+/// BenchAsync(title: "my benchmark") { completeBenchmark in
+/// foo {
+/// completeBenchmark()
+/// fooCompletion()
+/// }
+/// }
+public func BenchAsync(title: String, block: (@escaping () -> Void) -> Void) {
let startTime = CFAbsoluteTimeGetCurrent()
block {