cli: Rename replay -> retrace.

For consistency with the current terminology.

diff --git a/cli/cli_dump.cpp b/cli/cli_dump.cpp
index f9595683e77663b5d10fa44a41b1de24745fee5a..e30f6cc2b49574a00d58a111b38c82b59ca0982f 100644 (file)
--- a/cli/cli_dump.cpp
+++ b/cli/cli_dump.cpp
@@ -171,7 +171,6 @@ command(int argc, char *argv[])
         trace::Parser p;
 
         if (!p.open(argv[i])) {
-            std::cerr << "error: failed to open " << argv[i] << "\n";
             return 1;
         }
 

diff --git a/cli/cli_pickle.cpp b/cli/cli_pickle.cpp
index ffea40b7596b38acc536ad0d3520e05b56e869a9..3a9129f8782d0f4a1dc7b2d81616c37c0654e273 100644 (file)
--- a/cli/cli_pickle.cpp
+++ b/cli/cli_pickle.cpp
@@ -255,7 +255,6 @@ command(int argc, char *argv[])
         trace::Parser parser;
 
         if (!parser.open(argv[i])) {
-            std::cerr << "error: failed to open " << argv[i] << "\n";
             return 1;
         }
 

diff --git a/cli/cli_trim.cpp b/cli/cli_trim.cpp
index d9446822748e07913e13416aac8629a30eb97e90..eea55535e95395f8707afd7f6d1090e6edc873ec 100644 (file)
--- a/cli/cli_trim.cpp
+++ b/cli/cli_trim.cpp
@@ -110,7 +110,6 @@ command(int argc, char *argv[])
     for (i = optind; i < argc; ++i) {
         trace::Parser p;
         if (!p.open(argv[i])) {
-            std::cerr << "error: failed to open " << argv[i] << "\n";
             return 1;
         }
 

diff --git a/common/trace_file.hpp b/common/trace_file.hpp
index 411eccb644aff7c9d7a8209dfcdc696d137f8f3d..0c176aabe652c4699a707da6f475ba9973c34372 100644 (file)
--- a/common/trace_file.hpp
+++ b/common/trace_file.hpp
@@ -31,6 +31,11 @@
 #include <fstream>
 #include <stdint.h>
 
+
+#define SNAPPY_BYTE1 'a'
+#define SNAPPY_BYTE2 't'
+
+
 namespace trace {
 
 class File {
@@ -49,8 +54,6 @@ public:
     };
 
 public:
-    static bool isZLibCompressed(const std::string &filename);
-    static bool isSnappyCompressed(const std::string &filename);
     static File *createZLib(void);
     static File *createSnappy(void);
     static File *createForRead(const char *filename);
@@ -201,6 +204,6 @@ operator<=(const File::Offset &one, const File::Offset &two)
 }
 
 
-}
+} /* namespace trace */
 
 #endif

diff --git a/common/trace_file_read.cpp b/common/trace_file_read.cpp
index 68bc74a4978f6dc24a2d82c396def987bdae366d..46c83ff2171894053d9fd8df10a6bc4a4f49364b 100644 (file)
--- a/common/trace_file_read.cpp
+++ b/common/trace_file_read.cpp
@@ -24,6 +24,8 @@
  **************************************************************************/
 
 
+#include <fstream>
+
 #include "os.hpp"
 #include "trace_file.hpp"
 
@@ -34,17 +36,25 @@ using namespace trace;
 File *
 File::createForRead(const char *filename)
 {
-    File *file;
+    std::ifstream stream(filename, std::ifstream::binary | std::ifstream::in);
+    if (!stream.is_open()) {
+        os::log("error: failed to open %s\n", filename);
+        return NULL;
+    }
+    unsigned char byte1, byte2;
+    stream >> byte1;
+    stream >> byte2;
+    stream.close();
 
-    if (File::isSnappyCompressed(filename)) {
+    File *file;
+    if (byte1 == SNAPPY_BYTE1 && byte2 == SNAPPY_BYTE2) {
         file = File::createSnappy();
-    } else if (File::isZLibCompressed(filename)) {
+    } else if (byte1 == 0x1f && byte2 == 0x8b) {
         file = File::createZLib();
     } else  {
-        os::log("error: could not determine %s compression type\n", filename);
+        os::log("error: %s: unkwnown compression\n", filename);
         return NULL;
     }
-
     if (!file) {
         return NULL;
     }

diff --git a/common/trace_file_snappy.cpp b/common/trace_file_snappy.cpp
index c0727cd28e86df4e54573e7094e7125cd91053a2..f47c89b046c37fe282478a9ca6a014bb108df553 100644 (file)
--- a/common/trace_file_snappy.cpp
+++ b/common/trace_file_snappy.cpp
@@ -63,8 +63,6 @@
 
 #define SNAPPY_CHUNK_SIZE (1 * 1024 * 1024)
 
-#define SNAPPY_BYTE1 'a'
-#define SNAPPY_BYTE2 't'
 
 
 using namespace trace;
@@ -406,18 +404,3 @@ int SnappyFile::rawPercentRead()
 File* File::createSnappy(void) {
     return new SnappyFile;
 }
-
-bool File::isSnappyCompressed(const std::string &filename)
-{
-    std::fstream stream(filename.c_str(),
-                        std::fstream::binary | std::fstream::in);
-    if (!stream.is_open())
-        return false;
-
-    unsigned char byte1, byte2;
-    stream >> byte1;
-    stream >> byte2;
-    stream.close();
-
-    return (byte1 == SNAPPY_BYTE1 && byte2 == SNAPPY_BYTE2);
-}

diff --git a/common/trace_file_zlib.cpp b/common/trace_file_zlib.cpp
index 5e5d5deb9561acf4e33de20c99390cbbc2aa4708..c4eed33dd2df650d9f63826981999b3498a500ad 100644 (file)
--- a/common/trace_file_zlib.cpp
+++ b/common/trace_file_zlib.cpp
@@ -157,19 +157,3 @@ int ZLibFile::rawPercentRead()
 File * File::createZLib(void) {
     return new ZLibFile;
 }
-
-bool File::isZLibCompressed(const std::string &filename)
-{
-    std::fstream stream(filename.c_str(),
-                        std::fstream::binary | std::fstream::in);
-    if (!stream.is_open())
-        return false;
-
-    unsigned char byte1, byte2;
-    stream >> byte1;
-    stream >> byte2;
-    stream.close();
-
-    return (byte1 == 0x1f && byte2 == 0x8b);
-}
-

diff --git a/retrace/retrace_main.cpp b/retrace/retrace_main.cpp
index bc23bc4a4bea7b02a576943eaca9dabf6b910511..27ff2b4d705c73526c46db95a72a16d6003e8e8f 100644 (file)
--- a/retrace/retrace_main.cpp
+++ b/retrace/retrace_main.cpp
@@ -647,7 +647,6 @@ int main(int argc, char **argv)
 
     for (i = optind; i < argc; ++i) {
         if (!retrace::parser.open(argv[i])) {
-            std::cerr << "error: failed to open " << argv[i] << "\n";
             return 1;
         }