Put trace interfaces in separate file

flow/CMakeLists.txt

@@ -28,6 +28,7 @@ set(FLOW_SRCS
   IRandom.h
   IThreadPool.cpp
   IThreadPool.h
+  ITrace.h
   IndexedSet.actor.h
   IndexedSet.cpp
   IndexedSet.h

flow/ITrace.h

@@ -0,0 +1,61 @@
+/*
+ * ITrace.h
+ *
+ * This source file is part of the FoundationDB open source project
+ *
+ * Copyright 2018 Apple Inc. and the FoundationDB project authors
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#pragma once
+
+#include <string>
+#include <set>
+
+class StringRef;
+
+struct ITraceLogWriter {
+	virtual void open() = 0;
+	virtual void roll() = 0;
+	virtual void close() = 0;
+	virtual void write(const std::string&) = 0;
+	virtual void write(const StringRef&) = 0;
+	virtual void sync() = 0;
+
+	virtual void addref() = 0;
+	virtual void delref() = 0;
+};
+
+class TraceEventFields;
+
+struct ITraceLogFormatter {
+	virtual const char* getExtension() = 0;
+	virtual const char* getHeader() = 0; // Called when starting a new file
+	virtual const char* getFooter() = 0; // Called when ending a file
+	virtual std::string formatEvent(const TraceEventFields&) = 0; // Called for each event
+
+	virtual void addref() = 0;
+	virtual void delref() = 0;
+};
+
+struct ITraceLogIssuesReporter {
+	virtual ~ITraceLogIssuesReporter();
+	virtual void addIssue(std::string issue) = 0;
+	virtual void resolveIssue(std::string issue) = 0;
+
+	virtual void retrieveIssues(std::set<std::string>& out) = 0;
+
+	virtual void addref() = 0;
+	virtual void delref() = 0;
+};

flow/Trace.h

@@ -31,6 +31,7 @@
 #include <type_traits>
 #include "flow/IRandom.h"
 #include "flow/Error.h"
+#include "flow/ITrace.h"
 
 #define TRACE_DEFAULT_ROLL_SIZE (10 << 20)
 #define TRACE_DEFAULT_MAX_LOGS_SIZE (10 * TRACE_DEFAULT_ROLL_SIZE)
@@ -518,39 +519,6 @@ private:
 
 class StringRef;
 
-struct ITraceLogWriter {
-	virtual void open() = 0;
-	virtual void roll() = 0;
-	virtual void close() = 0;
-	virtual void write(const std::string&) = 0;
-	virtual void write(const StringRef&) = 0;
-	virtual void sync() = 0;
-
-	virtual void addref() = 0;
-	virtual void delref() = 0;
-};
-
-struct ITraceLogFormatter {
-	virtual const char* getExtension() = 0;
-	virtual const char* getHeader() = 0; // Called when starting a new file
-	virtual const char* getFooter() = 0; // Called when ending a file
-	virtual std::string formatEvent(const TraceEventFields&) = 0; // Called for each event
-
-	virtual void addref() = 0;
-	virtual void delref() = 0;
-};
-
-struct ITraceLogIssuesReporter {
-	virtual ~ITraceLogIssuesReporter();
-	virtual void addIssue(std::string issue) = 0;
-	virtual void resolveIssue(std::string issue) = 0;
-
-	virtual void retrieveIssues(std::set<std::string>& out) = 0;
-
-	virtual void addref() = 0;
-	virtual void delref() = 0;
-};
-
 struct TraceInterval {
 	TraceInterval( const char* type ) : count(-1), type(type), severity(SevInfo) {}