From c5b850be35d1e96a7dd3a3419b74551798cd8d93 Mon Sep 17 00:00:00 2001
From: Bill Zissimopoulos <billziss@navimatics.com>
Date: Mon, 25 Jan 2021 13:11:10 -0800
Subject: [PATCH] sys: improve trace functionality

---
 src/sys/driver.h | 4 ++--
 src/sys/trace.c  | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/sys/driver.h b/src/sys/driver.h
index 6a28394c..93b826fe 100644
--- a/src/sys/driver.h
+++ b/src/sys/driver.h
@@ -154,9 +154,9 @@ VOID FspTraceFinalize(VOID);
 VOID FspTrace(const char *file, int line, const char *func);
 VOID FspTraceNtStatus(const char *file, int line, const char *func, NTSTATUS Status);
 #define FSP_TRACE_INIT()                \
-    (FspTraceInitialize(), FSP_TRACE())
+    FspTraceInitialize()
 #define FSP_TRACE_FINI()                \
-    (FSP_TRACE(), FspTraceFinalize())
+    FspTraceFinalize()
 #define FSP_TRACE()                     \
     FspTrace(                           \
         __FILE__,                       \
diff --git a/src/sys/trace.c b/src/sys/trace.c
index a7b3671f..147169f5 100644
--- a/src/sys/trace.c
+++ b/src/sys/trace.c
@@ -126,10 +126,14 @@ VOID FspTraceInitialize(VOID)
     OPEN_EVENT(LowPagedPoolCondition);
 
 #undef OPEN_EVENT
+
+    FSP_TRACE();
 }
 
 VOID FspTraceFinalize(VOID)
 {
+    FSP_TRACE();
+
 #define CLOSE_EVENT(NAME)               \
     (FspCloseEvent(Fsp ## NAME.Event, Fsp ## NAME.Handle), Fsp ## NAME.Event = 0, Fsp ## NAME.Handle = 0)