Merge dev and bombomby master

bombomby · Oct 17, 2016 · 466ca93 · 466ca93
1 parent 199c08c
commit 466ca93
Show file tree

Hide file tree

Showing 25 changed files with 3,818 additions and 3,695 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,6 @@ Brofiler/obj/
 Build/
 *.suo
 *.user
-Publish/
+Publish/
+*.rej
+*.orig
diff --git a/BrofilerCore/Brofiler.h b/BrofilerCore/Brofiler.h
@@ -37,9 +37,10 @@
 
 #if defined(BRO_WINDOWS)
 	#define USE_BROFILER_SAMPLING (USE_BROFILER && !BRO_UWP)
-	#define USE_BROFILER_ETW	  (USE_BROFILER /*&& !BRO_UWP*/)
 #endif
 
+
+
 #if USE_BROFILER
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 // EXPORTS 

diff --git a/BrofilerCore/Core.cpp b/BrofilerCore/Core.cpp
@@ -189,6 +189,7 @@ void Core::CleanupThreads()
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 Core::Core() : progressReportedLastTimestampMS(0), isActive(false)
 {
+	schedulerTracer = ISchedulerTracer::Get();
 }
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 void Core::Update()
@@ -222,6 +223,38 @@ void Core::UpdateEvents()
 
 	Server::Get().Update();
 }
+
+
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+void Core::ReportSwitchContext(const SwitchContextDesc& desc)
+{
+	BRO_UNUSED(desc.reason);
+
+	for (size_t i = 0; i < threads.size(); ++i)
+	{
+		ThreadEntry* entry = threads[i];
+
+		if (entry->description.threadID.AsUInt64() == desc.oldThreadId)
+		{
+			if (SyncData* time = entry->storage.synchronizationBuffer.Back())
+			{
+				time->finish = desc.timestamp;
+			}
+		}
+
+		if (entry->description.threadID.AsUInt64() == desc.newThreadId)
+		{
+			SyncData& time = entry->storage.synchronizationBuffer.Add();
+			time.start = desc.timestamp;
+			time.finish = time.start;
+			time.core = desc.cpuId;
+		}
+	}
+
+
+}
+
+
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 void Core::StartSampling()
 {
@@ -250,18 +283,12 @@ void Core::Activate( bool active )
 
 		if (active)
 		{
-#if USE_BROFILER_ETW
-			EtwStatus status = etw.Start();
-#else
-			EtwStatus status = ETW_OK;
-#endif
+			SchedulerTraceStatus::Type status = schedulerTracer->Start();
 			SendHandshakeResponse(status);
 		}
 		else
 		{
-#if USE_BROFILER_ETW
-			etw.Stop();
-#endif
+			schedulerTracer->Stop();
 		}
 	}
 
@@ -287,7 +314,7 @@ bool Core::IsTimeToReportProgress() const
 	return MT::GetTimeMilliSeconds() > progressReportedLastTimestampMS + 200;
 }
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-void Core::SendHandshakeResponse(EtwStatus status)
+void Core::SendHandshakeResponse(SchedulerTraceStatus::Type status)
 {
 	OutputDataStream stream;
 	stream << (uint32)status;

diff --git a/BrofilerCore/Core.h b/BrofilerCore/Core.h
@@ -5,7 +5,7 @@
 #include "Serialization.h"
 #include "MemoryPool.h"
 #include "Sampler.h"
-#include "Tracer.h"
+#include "SchedulerTrace/ISchedulerTrace.h"
 //#include "Graphics.h"
 #include <map>
 
@@ -109,6 +109,16 @@ struct ThreadEntry
 	void Activate(bool isActive);
 };
 
+////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+struct SwitchContextDesc
+{
+	int64_t timestamp;
+	uint64 oldThreadId;
+	uint64 newThreadId;
+	uint8 cpuId;
+	uint8 reason;
+};
+
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 typedef std::vector<ThreadEntry*> ThreadList;
@@ -136,7 +146,7 @@ class Core
 	static Core notThreadSafeInstance;
 
 	void DumpCapturingProgress();
-	void SendHandshakeResponse(EtwStatus status);
+	void SendHandshakeResponse(SchedulerTraceStatus::Type status);
 
 	void DumpThread(const ThreadEntry& entry, const EventTime& timeSlice, ScopeData& scope);
 
@@ -156,14 +166,15 @@ class Core
 	// Controls GPU activity
 	// Graphics graphics;
 
-#if USE_BROFILER_ETW
-	// Event Trace for Windows interface
-	ETW etw;
-#endif
+	// System scheduler trace
+	ISchedulerTracer* schedulerTracer;
 
 	// Returns thread collection
 	const std::vector<ThreadEntry*>& GetThreads() const;
 
+	// Report switch context event
+	void ReportSwitchContext(const SwitchContextDesc& desc);
+
 	// Starts sampling process
 	void StartSampling();
 

diff --git a/BrofilerCore/EtwStatus.h b/BrofilerCore/EtwStatus.h
diff --git a/BrofilerCore/SchedulerTrace/ISchedulerTrace.h b/BrofilerCore/SchedulerTrace/ISchedulerTrace.h
@@ -0,0 +1,28 @@
+#pragma once
+
+namespace Brofiler
+{
+
+	namespace SchedulerTraceStatus
+	{
+		enum Type 
+		{
+			OK = 0,
+			ERR_ALREADY_EXISTS = 1,
+			ERR_ACCESS_DENIED = 2,
+			FAILED = 3,
+		};
+	}
+
+
+	struct ISchedulerTracer
+	{
+		virtual ~ISchedulerTracer() {};
+
+		virtual SchedulerTraceStatus::Type Start() = 0;
+		virtual bool Stop() = 0;
+
+		static ISchedulerTracer* Get();
+	};
+
+}
diff --git a/BrofilerCore/ETW.h → BrofilerCore/SchedulerTrace/Windows/ETW.h b/BrofilerCore/ETW.h → BrofilerCore/SchedulerTrace/Windows/ETW.h
@@ -1,6 +1,6 @@
 #pragma once
+#ifdef _WIN32
 
-#if USE_BROFILER_ETW
 
 #define INITGUID  // Causes definition of SystemTraceControlGuid in evntrace.h.
 #include <strsafe.h>
@@ -94,5 +94,6 @@ typedef struct _EVENT_RECORD {
 #endif
 ///////////////////////////////////////////////////////////////////////////////
 
-#endif
 
+
+#endif