Browse Source

Excluded binary and LevelDB based SCV TXR backends

Eyck Jentzsch 11 months ago
parent
commit
0f5b5f68e7
4 changed files with 8 additions and 12 deletions
  1. 2
    0
      incl/scc/scv_tr_db.h
  2. 1
    1
      incl/scc/tracer.h
  3. 5
    3
      src/CMakeLists.txt
  4. 0
    8
      src/tracer.cpp

+ 2
- 0
incl/scc/scv_tr_db.h View File

@@ -26,6 +26,7 @@ void scv_tr_sqlite_init();
26 26
  */
27 27
 void scv_tr_compressed_init();
28 28
 
29
+#ifdef USE_EXTENDED_DB
29 30
 /**
30 31
  *initializes the infrastructure to use a binary transaction recording database
31 32
  */
@@ -34,5 +35,6 @@ void scv_tr_binary_init();
34 35
  * initializes the infrastructure to use a LevelDB based transaction recording database
35 36
  */
36 37
 void scv_tr_ldb_init();
38
+#endif
37 39
 
38 40
 #endif /* _SCC_SCV_TR_DB_H_ */

+ 1
- 1
incl/scc/tracer.h View File

@@ -42,7 +42,7 @@ public:
42 42
     /**
43 43
      *
44 44
      */
45
-    enum file_type { NONE, TEXT, COMPRESSED, BINARY, SQLITE, LEVEL };
45
+    enum file_type { NONE, TEXT, COMPRESSED, SQLITE/*, BINARY, LEVEL*/ };
46 46
     /**
47 47
      *
48 48
      * @param name basename of the trace file(s)

+ 5
- 3
src/CMakeLists.txt View File

@@ -9,15 +9,17 @@ set(LIB_SOURCES
9 9
     jsoncpp.cpp
10 10
     configurer.cpp
11 11
     perf_estimator.cpp
12
-    scv_tr_binary/scv_tr_binary.cpp
13 12
 )
14 13
 
15 14
 if(SCV_FOUND)
16 15
     if(ZLIB_FOUND)
17 16
         set(LIB_SOURCES ${LIB_SOURCES} scv_tr_compressed.cpp)
18 17
     endif(ZLIB_FOUND)
19
-    if(CONAN_LEVELDB_ROOT)
20
-	    set(LIB_SOURCES ${LIB_SOURCES} scv_tr_ldb/scv_tr_ldb.cpp )
18
+    if(FALSE)
19
+    	set(LIB_SOURCES ${LIB_SOURCES} scv_tr_binary/scv_tr_binary.cpp)
20
+	    if(CONAN_LEVELDB_ROOT)
21
+		    set(LIB_SOURCES ${LIB_SOURCES} scv_tr_ldb/scv_tr_ldb.cpp )
22
+	    endif()
21 23
     endif()
22 24
     set(LIB_SOURCES ${LIB_SOURCES} scv_tr_sqlite/scv_tr_sqlite.cpp scv_tr_sqlite/sqlite3.c )
23 25
 endif(SCV_FOUND)

+ 0
- 8
src/tracer.cpp View File

@@ -58,18 +58,10 @@ tracer::tracer(const std::string &&name, file_type type, bool enable)
58 58
             scv_tr_compressed_init();
59 59
             ss << ".txlog";
60 60
             break;
61
-        case BINARY:
62
-            scv_tr_binary_init();
63
-            ss << ".txb";
64
-            break;
65 61
         case SQLITE:
66 62
             scv_tr_sqlite_init();
67 63
             ss << ".txdb";
68 64
             break;
69
-        case LEVEL:
70
-            scv_tr_ldb_init();
71
-            ss << ".txldb";
72
-            break;
73 65
         }
74 66
         txdb = new scv_tr_db(ss.str().c_str());
75 67
         scv_tr_db::set_default_db(txdb);