Move macro test to common area.

eBay · Dec 20, 2023 · 843a22e · 843a22e
1 parent d56a1df
commit 843a22e
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 22 deletions.
diff --git a/src/include/homestore/btree/detail/btree_node.hpp b/src/include/homestore/btree/detail/btree_node.hpp
@@ -24,12 +24,7 @@
 #include <sisl/utility/obj_life_counter.hpp>
 #include "btree_internal.hpp"
 #include <homestore/btree/btree_kv.hpp>
-// #include <iomgr/iomgr_flip.hpp>
-#ifndef NO_ISAL
-#include <isa-l/crc.h>
-#else
 #include "common/crc.h"
-#endif
 
 namespace homestore {
 ENUM(locktype_t, uint8_t, NONE, READ, WRITE)

diff --git a/src/lib/common/crc.h b/src/lib/common/crc.h
@@ -1,5 +1,11 @@
 #pragma once
 
+// Only x86 and x86_64 supported by Intel Storage Acceleration library
+#ifndef NO_ISAL
+#include <isa-l/crc.h>
+
+#else
+
 #define MAX_ITER 8
 
 extern "C" {
@@ -37,3 +43,4 @@ static inline uint32_t crc32_ieee(uint32_t seed, const unsigned char* buf, uint6
     return ~rem;
 }
 }
+#endif
diff --git a/src/lib/device/device.h b/src/lib/device/device.h
@@ -17,11 +17,7 @@
 #include <map>
 #include <vector>
 
-#ifndef NO_ISAL
-#include <isa-l/crc.h>
-#else
 #include "common/crc.h"
-#endif
 #include <iomgr/iomgr.hpp>
 #include <sisl/fds/sparse_vector.hpp>
 #include <homestore/homestore_decl.hpp>

diff --git a/src/lib/device/device_manager.cpp b/src/lib/device/device_manager.cpp
@@ -15,11 +15,7 @@
 #include <vector>
 
 #include <iomgr/iomgr.hpp>
-#ifndef NO_ISAL
-#include <isa-l/crc.h>
-#else
 #include "common/crc.h"
-#endif
 #include <sisl/logging/logging.h>
 
 #include <boost/uuid/random_generator.hpp>

diff --git a/src/lib/device/physical_dev.hpp b/src/lib/device/physical_dev.hpp
@@ -25,11 +25,7 @@
 
 #include <boost/icl/split_interval_set.hpp>
 #include <nlohmann/json.hpp>
-#ifndef NO_ISAL
-#include <isa-l/crc.h>
-#else
 #include "common/crc.h"
-#endif
 #include <sisl/metrics/metrics.hpp>
 #include <sisl/logging/logging.h>
 #include <homestore/homestore_decl.hpp>

diff --git a/src/lib/logstore/log_group.cpp b/src/lib/logstore/log_group.cpp
@@ -15,11 +15,6 @@
  *********************************************************************************/
 #include <cstring>
 
-#ifndef NO_ISAL
-#include <isa-l/crc.h>
-#else
-#endif
-
 #include <homestore/logstore/log_store.hpp>
 #include "common/homestore_assert.hpp"
 #include "log_dev.hpp"