hardcoresushi/libcryfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Code is compatible with gcc 4.8

Browse Source
This commit is contained in:
Sebastian Messmer 2015-11-24 14:39:32 +01:00
parent 8dc31b7a85
commit fb733929d8
3 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
implementations/caching/cache/Cache.h vendored
View File

@ -10,6 +10,7 @@
#include <future> #include <future>
#include <messmer/cpp-utils/assert/assert.h> #include <messmer/cpp-utils/assert/assert.h>
#include <messmer/cpp-utils/lock/MutexPoolLock.h> #include <messmer/cpp-utils/lock/MutexPoolLock.h>
#include <messmer/cpp-utils/pointer/gcc_4_8_compatibility.h>
namespace blockstore { namespace blockstore {
namespace caching { namespace caching {

4
test/implementations/caching/cache/CacheTest_RaceCondition.cpp vendored
View File

@ -5,8 +5,8 @@
#include <future> #include <future>
#include <messmer/cpp-utils/lock/ConditionBarrier.h> #include <messmer/cpp-utils/lock/ConditionBarrier.h>
using namespace std::chrono_literals;
using namespace blockstore::caching; using namespace blockstore::caching;
using std::chrono::seconds;
using std::string; using std::string;
using cpputils::ConditionBarrier; using cpputils::ConditionBarrier;
using std::unique_ptr; using std::unique_ptr;
@ -24,7 +24,7 @@ public:
: _onDestructorStarted(onDestructorStarted), _destructorFinished(destructorFinished) {} : _onDestructorStarted(onDestructorStarted), _destructorFinished(destructorFinished) {}
~ObjectWithLongDestructor() { ~ObjectWithLongDestructor() {
_onDestructorStarted->release(); _onDestructorStarted->release();
std::this_thread::sleep_for(1s); std::this_thread::sleep_for(seconds(1));
*_destructorFinished = true; *_destructorFinished = true;
} }
private: private:

23
test/testutils/BlockStoreTest_Data.h
View File

@ -79,19 +79,22 @@ private:
EXPECT_DATA_READS_AS_OUTSIDE_OF(ZEROES, block, start, count); EXPECT_DATA_READS_AS_OUTSIDE_OF(ZEROES, block, start, count);
} }
}; };
constexpr std::initializer_list<DataRange> DATA_RANGES = {
DataRange{1024, 0, 1024}, // full size leaf, access beginning to end inline std::vector<DataRange> DATA_RANGES() {
DataRange{1024, 100, 1024-200}, // full size leaf, access middle to middle return {
DataRange{1024, 0, 1024-100}, // full size leaf, access beginning to middle DataRange{1024, 0, 1024}, // full size leaf, access beginning to end
DataRange{1024, 100, 1024-100}, // full size leaf, access middle to end DataRange{1024, 100, 1024 - 200}, // full size leaf, access middle to middle
DataRange{1024-100, 0, 1024-100}, // non-full size leaf, access beginning to end DataRange{1024, 0, 1024 - 100}, // full size leaf, access beginning to middle
DataRange{1024-100, 100, 1024-300}, // non-full size leaf, access middle to middle DataRange{1024, 100, 1024 - 100}, // full size leaf, access middle to end
DataRange{1024-100, 0, 1024-200}, // non-full size leaf, access beginning to middle DataRange{1024 - 100, 0, 1024 - 100}, // non-full size leaf, access beginning to end
DataRange{1024-100, 100, 1024-200} // non-full size leaf, access middle to end DataRange{1024 - 100, 100, 1024 - 300}, // non-full size leaf, access middle to middle
DataRange{1024 - 100, 0, 1024 - 200}, // non-full size leaf, access beginning to middle
DataRange{1024 - 100, 100, 1024 - 200} // non-full size leaf, access middle to end
};
}; };
#define TYPED_TEST_P_FOR_ALL_DATA_RANGES(TestName) \ #define TYPED_TEST_P_FOR_ALL_DATA_RANGES(TestName) \
TYPED_TEST_P(BlockStoreTest, TestName) { \ TYPED_TEST_P(BlockStoreTest, TestName) { \
for (auto dataRange: DATA_RANGES) { \ for (auto dataRange: DATA_RANGES()) { \
BlockStoreDataParametrizedTest(this->fixture.createBlockStore(), dataRange) \ BlockStoreDataParametrizedTest(this->fixture.createBlockStore(), dataRange) \
.Test##TestName(); \ .Test##TestName(); \
} \ } \