Remove trace.cpp/h and all traces of usage

8 files changed, 6 insertions, 151 deletions

diff --git a/zencore/compactbinary.cpp b/zencore/compactbinary.cpp
index b759e219e..065d6309b 100644
--- a/zencore/compactbinary.cpp
+++ b/zencore/compactbinary.cpp
@@ -4,7 +4,6 @@
 
 #include <zencore/endian.h>
 #include <zencore/stream.h>
-#include <zencore/trace.h>
 #include "zencore/compactbinaryvalidation.h"
 
 #include <doctest/doctest.h>
diff --git a/zencore/compactbinarypackage.cpp b/zencore/compactbinarypackage.cpp
index b0dbd2918..074be79b3 100644
--- a/zencore/compactbinarypackage.cpp
+++ b/zencore/compactbinarypackage.cpp
@@ -5,7 +5,6 @@
 #include <zencore/compactbinaryvalidation.h>
 #include <zencore/endian.h>
 #include <zencore/stream.h>
-#include <zencore/trace.h>
 
 #include <doctest/doctest.h>
 
diff --git a/zencore/include/zencore/trace.h b/zencore/include/zencore/trace.h
deleted file mode 100644
index 191ce4a3a..000000000
--- a/zencore/include/zencore/trace.h
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright Epic Games, Inc. All Rights Reserved.
-
-#pragma once
-
-#include <inttypes.h>
-#include "zencore.h"
-
-#pragma section("trace_events", read)
-#define U_TRACE_DECL __declspec(allocate("trace_events"))
-
-//////////////////////////////////////////////////////////////////////////
-
-namespace zen {
-
-struct TraceSite
-{
-	const char*	   sourceFile;
-	const uint32_t sourceLine;
-	const uint32_t flags;
-};
-
-struct TraceEvent
-{
-	const TraceSite* site;
-	ThreadId_t		 threadId;
-	const char*		 message;
-};
-
-enum TraceFlags
-{
-	kTrace_Debug = 1 << 0,
-	kTrace_Info	 = 1 << 1,
-	kTrace_Warn	 = 1 << 2,
-	kTrace_Error = 1 << 3,
-	kTrace_Fatal = 1 << 4,
-
-	kTrace_Trace = 1 << 7,
-};
-
-class Tracer
-{
-public:
-	void Log(const TraceEvent& e);
-
-	__forceinline uint32_t Accept(const TraceSite& e) const { return (m_acceptFlags & e.flags); }
-
-private:
-	uint32_t m_acceptFlags = ~0u;
-};
-
-ZENCORE_API extern Tracer g_globalTracer;
-
-/** Trace event handler
- */
-class TraceHandler
-{
-public:
-	virtual void Trace(const TraceEvent& e) = 0;
-
-private:
-};
-
-ZENCORE_API static void TraceBroadcast(const TraceEvent& e);
-
-void trace_forcelink();	 // internal
-
-}  // namespace zen
-
-__forceinline zen::Tracer&
-CurrentTracer()
-{
-	return zen::g_globalTracer;
-}
-
-#define U_LOG_GENERIC(msg, flags)                                                          \
-	do                                                                                     \
-	{                                                                                      \
-		zen::Tracer&								 t = CurrentTracer();                  \
-		static U_TRACE_DECL constexpr zen::TraceSite traceSite{__FILE__, __LINE__, flags}; \
-		const zen::TraceEvent						 traceEvent = {&traceSite, 0u, msg};   \
-		if (t.Accept(traceSite))                                                           \
-			t.Log(traceEvent);                                                             \
-	} while (false)
-
-//////////////////////////////////////////////////////////////////////////
-
-#define U_LOG_DEBUG(msg) U_LOG_GENERIC(msg, zen::kTrace_Debug)
-#define U_LOG_INFO(msg)	 U_LOG_GENERIC(msg, zen::kTrace_Info)
-#define U_LOG_WARN(msg)	 U_LOG_GENERIC(msg, zen::kTrace_Warn)
-#define U_LOG_ERROR(msg) U_LOG_GENERIC(msg, zen::kTrace_Error)
-#define U_LOG_FATAL(msg) U_LOG_GENERIC(msg, zen::kTrace_Fatal)
diff --git a/zencore/trace.cpp b/zencore/trace.cpp
deleted file mode 100644
index 8313b3b66..000000000
--- a/zencore/trace.cpp
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright Epic Games, Inc. All Rights Reserved.
-
-#include "zencore/trace.h"
-#include <doctest/doctest.h>
-#include <zencore/windows.h>
-
-namespace zen {
-
-void
-Tracer::Log(const TraceEvent& e)
-{
-	TraceBroadcast(e);
-}
-
-Tracer g_globalTracer;
-
-struct alignas(64) TraceHandlerList
-{
-	enum
-	{
-		kMaxHandlers = 7
-	};
-
-	uint8_t		  handlerCount = 0;
-	TraceHandler* handlers[kMaxHandlers];
-};
-
-static TraceHandlerList g_traceHandlers;
-
-void
-TraceBroadcast(const TraceEvent& e)
-{
-	for (size_t i = 0; i < g_traceHandlers.handlerCount; ++i)
-	{
-		g_traceHandlers.handlers[i]->Trace(e);
-	}
-}
-
-void
-trace_forcelink()
-{
-}
-
-//////////////////////////////////////////////////////////////////////////
-
-TEST_CASE("Tracer")
-{
-	SUBCASE("Simple") { U_LOG_INFO("bajs"); }
-}
-
-}  // namespace zen
diff --git a/zencore/zencore.cpp b/zencore/zencore.cpp
index ec8d84c0e..bd3379c1c 100644
--- a/zencore/zencore.cpp
+++ b/zencore/zencore.cpp
@@ -20,7 +20,6 @@
 #include <zencore/string.h>
 #include <zencore/thread.h>
 #include <zencore/timer.h>
-#include <zencore/trace.h>
 #include <zencore/uid.h>
 
 bool
@@ -66,7 +65,6 @@ zencore_forcelinktests()
 	zen::string_forcelink();
 	zen::thread_forcelink();
 	zen::timer_forcelink();
-	zen::trace_forcelink();
 	zen::uid_forcelink();
 	zen::uson_forcelink();
 	zen::usonbuilder_forcelink();
diff --git a/zencore/zencore.vcxproj b/zencore/zencore.vcxproj
index 84593a12f..6bb83ebfd 100644
--- a/zencore/zencore.vcxproj
+++ b/zencore/zencore.vcxproj
@@ -124,9 +124,12 @@
     <ClInclude Include="include\zencore\httpserver.h" />
     <ClInclude Include="include\zencore\intmath.h" />
     <ClInclude Include="include\zencore\iohash.h" />
+    <ClInclude Include="include\zencore\logging.h" />
     <ClInclude Include="include\zencore\md5.h" />
     <ClInclude Include="include\zencore\memory.h" />
     <ClInclude Include="include\zencore\meta.h" />
+    <ClInclude Include="include\zencore\postwindows.h" />
+    <ClInclude Include="include\zencore\prewindows.h" />
     <ClInclude Include="include\zencore\refcount.h" />
     <ClInclude Include="include\zencore\scopeguard.h" />
     <ClInclude Include="include\zencore\sha1.h" />
@@ -140,7 +143,6 @@
     <ClInclude Include="include\zencore\targetver.h" />
     <ClInclude Include="include\zencore\thread.h" />
     <ClInclude Include="include\zencore\timer.h" />
-    <ClInclude Include="include\zencore\trace.h" />
     <ClInclude Include="include\zencore\uid.h" />
     <ClInclude Include="include\zencore\compactbinary.h" />
     <ClInclude Include="include\zencore\compactbinarybuilder.h" />
@@ -181,7 +183,6 @@
     <ClCompile Include="string.cpp" />
     <ClCompile Include="thread.cpp" />
     <ClCompile Include="timer.cpp" />
-    <ClCompile Include="trace.cpp" />
     <ClCompile Include="uid.cpp" />
     <ClCompile Include="compactbinary.cpp" />
     <ClCompile Include="compactbinarybuilder.cpp" />
diff --git a/zencore/zencore.vcxproj.filters b/zencore/zencore.vcxproj.filters
index 01d37994c..8b105fc31 100644
--- a/zencore/zencore.vcxproj.filters
+++ b/zencore/zencore.vcxproj.filters
@@ -9,7 +9,6 @@
     <ClInclude Include="include\zencore\zencore.h" />
     <ClInclude Include="include\zencore\compactbinary.h" />
     <ClInclude Include="include\zencore\uid.h" />
-    <ClInclude Include="include\zencore\trace.h" />
     <ClInclude Include="include\zencore\compress.h" />
     <ClInclude Include="include\zencore\timer.h" />
     <ClInclude Include="include\zencore\thread.h" />
@@ -42,6 +41,9 @@
     <ClInclude Include="include\zencore\compositebuffer.h" />
     <ClInclude Include="include\zencore\crc32.h" />
     <ClInclude Include="include\zencore\meta.h" />
+    <ClInclude Include="include\zencore\prewindows.h" />
+    <ClInclude Include="include\zencore\postwindows.h" />
+    <ClInclude Include="include\zencore\logging.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="snapshot_manifest.cpp" />
@@ -60,7 +62,6 @@
     <ClCompile Include="string.cpp" />
     <ClCompile Include="thread.cpp" />
     <ClCompile Include="timer.cpp" />
-    <ClCompile Include="trace.cpp" />
     <ClCompile Include="iobuffer.cpp" />
     <ClCompile Include="sharedbuffer.cpp" />
     <ClCompile Include="iohash.cpp" />
diff --git a/zenserver-test/zenserver-test.cpp b/zenserver-test/zenserver-test.cpp
index 8ac486d05..67d4e95cd 100644
--- a/zenserver-test/zenserver-test.cpp
+++ b/zenserver-test/zenserver-test.cpp
@@ -12,7 +12,6 @@
 #include <zencore/string.h>
 #include <zencore/thread.h>
 #include <zencore/timer.h>
-#include <zencore/trace.h>
 #include <zenserverprocess.h>
 
 #include <mimalloc.h>