From 0c0a8ec5535f5dc9e7af3e3e79e1b43c573d45e9 Mon Sep 17 00:00:00 2001
From: Hansung Kim <hansung_kim@berkeley.edu>
Date: Sun, 23 Apr 2023 11:27:06 -0700
Subject: [PATCH] SimMemTraceLogger: store handle in class

---
 src/main/resources/csrc/SimMemTrace.h        | 1 +
 src/main/resources/csrc/SimMemTraceLogger.cc | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/csrc/SimMemTrace.h b/src/main/resources/csrc/SimMemTrace.h
index adc5ef0..a857b5b 100644
--- a/src/main/resources/csrc/SimMemTrace.h
+++ b/src/main/resources/csrc/SimMemTrace.h
@@ -33,6 +33,7 @@ public:
   ~MemTraceWriter();
   void write_line_to_trace(const MemTraceLine line);
 
+  size_t handle;
   bool is_response;
   FILE *outfile;
 };
diff --git a/src/main/resources/csrc/SimMemTraceLogger.cc b/src/main/resources/csrc/SimMemTraceLogger.cc
index 1226143..647aeb5 100644
--- a/src/main/resources/csrc/SimMemTraceLogger.cc
+++ b/src/main/resources/csrc/SimMemTraceLogger.cc
@@ -31,7 +31,7 @@ MemTraceWriter::MemTraceWriter(const bool is_response,
 
 MemTraceWriter::~MemTraceWriter() {
   fclose(outfile);
-  printf("MemTraceWriter destroyed\n");
+  printf("MemTraceWriter(handle=%zu) destroyed\n", handle);
 }
 
 void MemTraceWriter::write_line_to_trace(const MemTraceLine line) {
@@ -61,6 +61,7 @@ extern "C" int memtracelogger_init(int is_response, const char *filename) {
 
   int handle = loggers.size();
   loggers.emplace_back(std::make_unique<MemTraceWriter>(is_response, filename));
+  loggers.back()->handle = handle;
 
   printf("memtracelogger_init: handle=%d, is_response=%d, filename=[%s]\n",
          handle, is_response, filename);