Make sure that the traces are always complete.

[apitrace] / trace_file.cpp

diff --git a/trace_file.cpp b/trace_file.cpp
index 27b3eb18c07d10eb7e0a2fc3e5dc1bdd9e366b26..421120fc4ce568663d1383a9cd8330da085f000c 100644 (file)
--- a/trace_file.cpp
+++ b/trace_file.cpp
@@ -6,13 +6,62 @@
 #include <zlib.h>
 #include <snappy.h>
 
+#include "os.hpp"
+
 #include <iostream>
+#include <set>
 
 using namespace Trace;
 
 #define SNAPPY_BYTE1 'a'
 #define SNAPPY_BYTE2 't'
 
+static void cleanupHandler(int sig);
+
+class FileCleanup
+{
+public:
+    FileCleanup()
+        : m_quitOnFlush(false)
+    {
+        OS::CatchInterrupts(cleanupHandler);
+    }
+
+    ~FileCleanup()
+    {
+    }
+
+    void addFile(Trace::File *file)
+    {
+        m_files.insert(file);
+    }
+    void removeFile(Trace::File *file)
+    {
+        m_files.erase(file);
+        if (m_files.empty() && m_quitOnFlush) {
+            OS::Abort();
+        }
+    }
+
+    void setQuitOnFlush(bool quit) {
+        m_quitOnFlush = quit;
+    }
+    bool quitOnFlush() const
+    {
+        return m_quitOnFlush;
+    }
+
+private:
+    std::set<Trace::File*> m_files;
+    bool m_quitOnFlush;
+};
+static FileCleanup s_cleaner;
+
+static void cleanupHandler(int sig)
+{
+    s_cleaner.setQuitOnFlush(true);
+}
+
 File::File(const std::string &filename,
            File::Mode mode)
     : m_filename(filename),
@@ -52,6 +101,10 @@ bool File::open(const std::string &filename, File::Mode mode)
     }
     m_isOpened = rawOpen(filename, mode);
     m_mode = mode;
+
+    if (m_isOpened) {
+        s_cleaner.addFile(this);
+    }
     return m_isOpened;
 }
 
@@ -76,12 +129,16 @@ void File::close()
     if (m_isOpened) {
         rawClose();
         m_isOpened = false;
+        s_cleaner.removeFile(this);
     }
 }
 
 void File::flush()
 {
     rawFlush();
+    if (s_cleaner.quitOnFlush()) {
+        close();
+    }
 }
 
 int File::getc()