Merge branch 'master' into compression

[apitrace] / trace_writer.cpp

diff --git a/trace_writer.cpp b/trace_writer.cpp
index 7fcd0e6762b24acd247d536e670a5d36b99ef8ac..057e3957be289a63b9598c3c4344ae75171cb71e 100644 (file)
--- a/trace_writer.cpp
+++ b/trace_writer.cpp
@@ -30,10 +30,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <zlib.h>
-
 #include "os.hpp"
 #include "trace_writer.hpp"
+#include "trace_file.hpp"
 #include "trace_format.hpp"
 
 
@@ -41,30 +40,29 @@ namespace Trace {
 
 
 Writer::Writer() :
-    g_gzFile(NULL),
     call_no(0)
 {
+    m_file = new Trace::SnappyFile;
     close();
-};
+}
 
-Writer::~Writer() {
+Writer::~Writer()
+{
     close();
-};
+    delete m_file;
+    m_file = NULL;
+}
 
 void
 Writer::close(void) {
-    if (g_gzFile != NULL) {
-        gzclose(g_gzFile);
-        g_gzFile = NULL;
-    }
+    m_file->close();
 }
 
 bool
 Writer::open(const char *filename) {
     close();
 
-    g_gzFile = gzopen(filename, "wb");
-    if (!g_gzFile) {
+    if (!m_file->open(filename, File::Write)) {
         return false;
     }
 
@@ -81,10 +79,7 @@ Writer::open(const char *filename) {
 
 void inline
 Writer::_write(const void *sBuffer, size_t dwBytesToWrite) {
-    if (g_gzFile == NULL)
-        return;
-
-    gzwrite(g_gzFile, sBuffer, dwBytesToWrite);
+    m_file->write(sBuffer, dwBytesToWrite);
 }
 
 void inline
@@ -349,7 +344,7 @@ LocalWriter::open(void) {
 unsigned LocalWriter::beginEnter(const FunctionSig *sig) {
     OS::AcquireMutex();
 
-    if (!g_gzFile) {
+    if (!m_file->isOpened()) {
         open();
     }
 
@@ -358,7 +353,6 @@ unsigned LocalWriter::beginEnter(const FunctionSig *sig) {
 
 void LocalWriter::endEnter(void) {
     Writer::endEnter();
-    gzflush(g_gzFile, Z_SYNC_FLUSH);
     OS::ReleaseMutex();
 }
 
@@ -369,7 +363,7 @@ void LocalWriter::beginLeave(unsigned call) {
 
 void LocalWriter::endLeave(void) {
     Writer::endLeave();
-    gzflush(g_gzFile, Z_SYNC_FLUSH);
+    m_file->flush();
     OS::ReleaseMutex();
 }