project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Header refactoring: unify and de-catchall witness code.

Browse Source
This commit is contained in:
David Goldblatt
2017-05-22 19:32:04 -07:00
committed by David Goldblatt
parent 36195c8f4d
commit 9f822a1fd7
18 changed files with 602 additions and 538 deletions
Download Patch File Download Diff File Expand all files Collapse all files

168
test/unit/witness.c
View File

@@ -55,95 +55,91 @@ witness_comp_reverse(const witness_t *a, void *oa, const witness_t *b,
TEST_BEGIN(test_witness) {
witness_t a, b;
tsdn_t *tsdn;
witness_tsdn_t witness_tsdn = { WITNESS_TSD_INITIALIZER };
test_skip_if(!config_debug);
tsdn = tsdn_fetch();
witness_assert_lockless(tsdn);
witness_assert_depth(tsdn, 0);
witness_assert_depth_to_rank(tsdn, (witness_rank_t)1U, 0);
witness_assert_lockless(&witness_tsdn);
witness_assert_depth(&witness_tsdn, 0);
witness_assert_depth_to_rank(&witness_tsdn, (witness_rank_t)1U, 0);
witness_init(&a, "a", 1, NULL, NULL);
witness_assert_not_owner(tsdn, &a);
witness_lock(tsdn, &a);
witness_assert_owner(tsdn, &a);
witness_assert_depth(tsdn, 1);
witness_assert_depth_to_rank(tsdn, (witness_rank_t)1U, 1);
witness_assert_depth_to_rank(tsdn, (witness_rank_t)2U, 0);
witness_assert_not_owner(&witness_tsdn, &a);
witness_lock(&witness_tsdn, &a);
witness_assert_owner(&witness_tsdn, &a);
witness_assert_depth(&witness_tsdn, 1);
witness_assert_depth_to_rank(&witness_tsdn, (witness_rank_t)1U, 1);
witness_assert_depth_to_rank(&witness_tsdn, (witness_rank_t)2U, 0);
witness_init(&b, "b", 2, NULL, NULL);
witness_assert_not_owner(tsdn, &b);
witness_lock(tsdn, &b);
witness_assert_owner(tsdn, &b);
witness_assert_depth(tsdn, 2);
witness_assert_depth_to_rank(tsdn, (witness_rank_t)1U, 2);
witness_assert_depth_to_rank(tsdn, (witness_rank_t)2U, 1);
witness_assert_depth_to_rank(tsdn, (witness_rank_t)3U, 0);
witness_assert_not_owner(&witness_tsdn, &b);
witness_lock(&witness_tsdn, &b);
witness_assert_owner(&witness_tsdn, &b);
witness_assert_depth(&witness_tsdn, 2);
witness_assert_depth_to_rank(&witness_tsdn, (witness_rank_t)1U, 2);
witness_assert_depth_to_rank(&witness_tsdn, (witness_rank_t)2U, 1);
witness_assert_depth_to_rank(&witness_tsdn, (witness_rank_t)3U, 0);
witness_unlock(tsdn, &a);
witness_assert_depth(tsdn, 1);
witness_assert_depth_to_rank(tsdn, (witness_rank_t)1U, 1);
witness_assert_depth_to_rank(tsdn, (witness_rank_t)2U, 1);
witness_assert_depth_to_rank(tsdn, (witness_rank_t)3U, 0);
witness_unlock(tsdn, &b);
witness_unlock(&witness_tsdn, &a);
witness_assert_depth(&witness_tsdn, 1);
witness_assert_depth_to_rank(&witness_tsdn, (witness_rank_t)1U, 1);
witness_assert_depth_to_rank(&witness_tsdn, (witness_rank_t)2U, 1);
witness_assert_depth_to_rank(&witness_tsdn, (witness_rank_t)3U, 0);
witness_unlock(&witness_tsdn, &b);
witness_assert_lockless(tsdn);
witness_assert_depth(tsdn, 0);
witness_assert_depth_to_rank(tsdn, (witness_rank_t)1U, 0);
witness_assert_lockless(&witness_tsdn);
witness_assert_depth(&witness_tsdn, 0);
witness_assert_depth_to_rank(&witness_tsdn, (witness_rank_t)1U, 0);
}
TEST_END
TEST_BEGIN(test_witness_comp) {
witness_t a, b, c, d;
tsdn_t *tsdn;
witness_tsdn_t witness_tsdn = { WITNESS_TSD_INITIALIZER };
test_skip_if(!config_debug);
tsdn = tsdn_fetch();
witness_assert_lockless(tsdn);
witness_assert_lockless(&witness_tsdn);
witness_init(&a, "a", 1, witness_comp, &a);
witness_assert_not_owner(tsdn, &a);
witness_lock(tsdn, &a);
witness_assert_owner(tsdn, &a);
witness_assert_depth(tsdn, 1);
witness_assert_not_owner(&witness_tsdn, &a);
witness_lock(&witness_tsdn, &a);
witness_assert_owner(&witness_tsdn, &a);
witness_assert_depth(&witness_tsdn, 1);
witness_init(&b, "b", 1, witness_comp, &b);
witness_assert_not_owner(tsdn, &b);
witness_lock(tsdn, &b);
witness_assert_owner(tsdn, &b);
witness_assert_depth(tsdn, 2);
witness_unlock(tsdn, &b);
witness_assert_depth(tsdn, 1);
witness_assert_not_owner(&witness_tsdn, &b);
witness_lock(&witness_tsdn, &b);
witness_assert_owner(&witness_tsdn, &b);
witness_assert_depth(&witness_tsdn, 2);
witness_unlock(&witness_tsdn, &b);
witness_assert_depth(&witness_tsdn, 1);
witness_lock_error_orig = witness_lock_error;
witness_lock_error = witness_lock_error_intercept;
saw_lock_error = false;
witness_init(&c, "c", 1, witness_comp_reverse, &c);
witness_assert_not_owner(tsdn, &c);
witness_assert_not_owner(&witness_tsdn, &c);
assert_false(saw_lock_error, "Unexpected witness lock error");
witness_lock(tsdn, &c);
witness_lock(&witness_tsdn, &c);
assert_true(saw_lock_error, "Expected witness lock error");
witness_unlock(tsdn, &c);
witness_assert_depth(tsdn, 1);
witness_unlock(&witness_tsdn, &c);
witness_assert_depth(&witness_tsdn, 1);
saw_lock_error = false;
witness_init(&d, "d", 1, NULL, NULL);
witness_assert_not_owner(tsdn, &d);
witness_assert_not_owner(&witness_tsdn, &d);
assert_false(saw_lock_error, "Unexpected witness lock error");
witness_lock(tsdn, &d);
witness_lock(&witness_tsdn, &d);
assert_true(saw_lock_error, "Expected witness lock error");
witness_unlock(tsdn, &d);
witness_assert_depth(tsdn, 1);
witness_unlock(&witness_tsdn, &d);
witness_assert_depth(&witness_tsdn, 1);
witness_unlock(tsdn, &a);
witness_unlock(&witness_tsdn, &a);
witness_assert_lockless(tsdn);
witness_assert_lockless(&witness_tsdn);
witness_lock_error = witness_lock_error_orig;
}
@@ -151,7 +147,7 @@ TEST_END
TEST_BEGIN(test_witness_reversal) {
witness_t a, b;
tsdn_t *tsdn;
witness_tsdn_t witness_tsdn = { WITNESS_TSD_INITIALIZER };
test_skip_if(!config_debug);
@@ -159,24 +155,22 @@ TEST_BEGIN(test_witness_reversal) {
witness_lock_error = witness_lock_error_intercept;
saw_lock_error = false;
tsdn = tsdn_fetch();
witness_assert_lockless(tsdn);
witness_assert_lockless(&witness_tsdn);
witness_init(&a, "a", 1, NULL, NULL);
witness_init(&b, "b", 2, NULL, NULL);
witness_lock(tsdn, &b);
witness_assert_depth(tsdn, 1);
witness_lock(&witness_tsdn, &b);
witness_assert_depth(&witness_tsdn, 1);
assert_false(saw_lock_error, "Unexpected witness lock error");
witness_lock(tsdn, &a);
witness_lock(&witness_tsdn, &a);
assert_true(saw_lock_error, "Expected witness lock error");
witness_unlock(tsdn, &a);
witness_assert_depth(tsdn, 1);
witness_unlock(tsdn, &b);
witness_unlock(&witness_tsdn, &a);
witness_assert_depth(&witness_tsdn, 1);
witness_unlock(&witness_tsdn, &b);
witness_assert_lockless(tsdn);
witness_assert_lockless(&witness_tsdn);
witness_lock_error = witness_lock_error_orig;
}
@@ -184,7 +178,7 @@ TEST_END
TEST_BEGIN(test_witness_recursive) {
witness_t a;
tsdn_t *tsdn;
witness_tsdn_t witness_tsdn = { WITNESS_TSD_INITIALIZER };
test_skip_if(!config_debug);
@@ -196,22 +190,20 @@ TEST_BEGIN(test_witness_recursive) {
witness_lock_error = witness_lock_error_intercept;
saw_lock_error = false;
tsdn = tsdn_fetch();
witness_assert_lockless(tsdn);
witness_assert_lockless(&witness_tsdn);
witness_init(&a, "a", 1, NULL, NULL);
witness_lock(tsdn, &a);
witness_lock(&witness_tsdn, &a);
assert_false(saw_lock_error, "Unexpected witness lock error");
assert_false(saw_not_owner_error, "Unexpected witness not owner error");
witness_lock(tsdn, &a);
witness_lock(&witness_tsdn, &a);
assert_true(saw_lock_error, "Expected witness lock error");
assert_true(saw_not_owner_error, "Expected witness not owner error");
witness_unlock(tsdn, &a);
witness_unlock(&witness_tsdn, &a);
witness_assert_lockless(tsdn);
witness_assert_lockless(&witness_tsdn);
witness_owner_error = witness_owner_error_orig;
witness_lock_error = witness_lock_error_orig;
@@ -221,7 +213,7 @@ TEST_END
TEST_BEGIN(test_witness_unlock_not_owned) {
witness_t a;
tsdn_t *tsdn;
witness_tsdn_t witness_tsdn = { WITNESS_TSD_INITIALIZER };
test_skip_if(!config_debug);
@@ -229,17 +221,15 @@ TEST_BEGIN(test_witness_unlock_not_owned) {
witness_owner_error = witness_owner_error_intercept;
saw_owner_error = false;
tsdn = tsdn_fetch();
witness_assert_lockless(tsdn);
witness_assert_lockless(&witness_tsdn);
witness_init(&a, "a", 1, NULL, NULL);
assert_false(saw_owner_error, "Unexpected owner error");
witness_unlock(tsdn, &a);
witness_unlock(&witness_tsdn, &a);
assert_true(saw_owner_error, "Expected owner error");
witness_assert_lockless(tsdn);
witness_assert_lockless(&witness_tsdn);
witness_owner_error = witness_owner_error_orig;
}
@@ -247,7 +237,7 @@ TEST_END
TEST_BEGIN(test_witness_depth) {
witness_t a;
tsdn_t *tsdn;
witness_tsdn_t witness_tsdn = { WITNESS_TSD_INITIALIZER };
test_skip_if(!config_debug);
@@ -255,26 +245,24 @@ TEST_BEGIN(test_witness_depth) {
witness_depth_error = witness_depth_error_intercept;
saw_depth_error = false;
tsdn = tsdn_fetch();
witness_assert_lockless(tsdn);
witness_assert_depth(tsdn, 0);
witness_assert_lockless(&witness_tsdn);
witness_assert_depth(&witness_tsdn, 0);
witness_init(&a, "a", 1, NULL, NULL);
assert_false(saw_depth_error, "Unexpected depth error");
witness_assert_lockless(tsdn);
witness_assert_depth(tsdn, 0);
witness_assert_lockless(&witness_tsdn);
witness_assert_depth(&witness_tsdn, 0);
witness_lock(tsdn, &a);
witness_assert_lockless(tsdn);
witness_assert_depth(tsdn, 0);
witness_lock(&witness_tsdn, &a);
witness_assert_lockless(&witness_tsdn);
witness_assert_depth(&witness_tsdn, 0);
assert_true(saw_depth_error, "Expected depth error");
witness_unlock(tsdn, &a);
witness_unlock(&witness_tsdn, &a);
witness_assert_lockless(tsdn);
witness_assert_depth(tsdn, 0);
witness_assert_lockless(&witness_tsdn);
witness_assert_depth(&witness_tsdn, 0);
witness_depth_error = witness_depth_error_orig;
}