Merge branch 'master' into compression

[apitrace] / trace_writer.hpp

diff --git a/trace_writer.hpp b/trace_writer.hpp
index 4d46f739f8f231fcdee4e39de053b21949193448..dfb76b2508a4bac02f455b9d570cc733c5492f9a 100644 (file)
--- a/trace_writer.hpp
+++ b/trace_writer.hpp
@@ -116,7 +116,15 @@ namespace Trace {
      */
     class LocalWriter : public Writer {
     protected:
+        int acquired;
+
     public:
+        /**
+         * Should never called directly -- use localWriter singleton below instead.
+         */
+        LocalWriter();
+        ~LocalWriter();
+
         void open(void);
 
         unsigned beginEnter(const FunctionSig *sig);
@@ -124,7 +132,14 @@ namespace Trace {
 
         void beginLeave(unsigned call);
         void endLeave(void);
+
+        void flush(void);
     };
+
+    /**
+     * Singleton.
+     */
+    extern LocalWriter localWriter;
 }
 
 #endif /* _TRACE_WRITER_HPP_ */