gecko-dev/xpcom/tests/gtest/TestDeadlockDetector.cpp

361 lines
9.2 KiB
C++
Raw Normal View History

/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: sw=4 ts=4 et :
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "mozilla/ArrayUtils.h"
#include "prthread.h"
#include "nsCOMPtr.h"
#include "nsICrashReporter.h"
#include "nsMemory.h"
#include "nsServiceManagerUtils.h"
#include "nsTArray.h"
#include "mozilla/CondVar.h"
#include "mozilla/RecursiveMutex.h"
#include "mozilla/ReentrantMonitor.h"
#include "mozilla/Mutex.h"
#include "gtest/gtest.h"
using namespace mozilla;
Bug 1315138 - gtestify storage/test/*.cpp. r=mak,erahm. This change is mostly straightforward, except for the following. - It removes all the printing from the do_check_* macros because gtest macros do appropriate printing. - test_StatementCache.cpp needs some special gtest magic for the type parameterization. - It merges the four tests in test_unlock_notify.cpp because they rely on being executed in order, and so aren't independent. - storage_test_harness_tail.h is no longer necessary because gtest provides the test looping functionality. - It uses #include and the preprocessor to remove the duplication between test_deadlock_detector.cpp and xpcom/tests/DeadlockDetector.cpp. - It makes the test in test_service_init_background_thread.cpp a death test to force it to be the first storage gtest, because it fails otherwise. - It adds code to undo the SQLite mutex hooking as necessary, so that tests don't interfere with each other. - It de-virtualizes Spinner's destructor (as identified in bug 1318282). --HG-- rename : storage/test/storage_test_harness.h => storage/test/gtest/storage_test_harness.h rename : storage/test/test_AsXXX_helpers.cpp => storage/test/gtest/test_AsXXX_helpers.cpp rename : storage/test/test_StatementCache.cpp => storage/test/gtest/test_StatementCache.cpp rename : storage/test/test_asyncStatementExecution_transaction.cpp => storage/test/gtest/test_asyncStatementExecution_transaction.cpp rename : storage/test/test_async_callbacks_with_spun_event_loops.cpp => storage/test/gtest/test_async_callbacks_with_spun_event_loops.cpp rename : storage/test/test_binding_params.cpp => storage/test/gtest/test_binding_params.cpp rename : storage/test/test_deadlock_detector.cpp => storage/test/gtest/test_deadlock_detector.cpp rename : storage/test/test_file_perms.cpp => storage/test/gtest/test_file_perms.cpp rename : storage/test/test_mutex.cpp => storage/test/gtest/test_mutex.cpp rename : storage/test/test_service_init_background_thread.cpp => storage/test/gtest/test_service_init_background_thread.cpp rename : storage/test/test_statement_scoper.cpp => storage/test/gtest/test_statement_scoper.cpp rename : storage/test/test_transaction_helper.cpp => storage/test/gtest/test_transaction_helper.cpp rename : storage/test/test_true_async.cpp => storage/test/gtest/test_true_async.cpp rename : storage/test/test_unlock_notify.cpp => storage/test/gtest/test_unlock_notify.cpp extra : rebase_source : dbb695c112564efa1945116be1a8435988982e74
2016-11-10 22:59:23 +00:00
// The code in this file is also used by
// storage/test/gtest/test_deadlock_detector.cpp. The following two macros are
// used to provide the necessary differentiation between this file and that
// file.
#ifndef MUTEX
#define MUTEX mozilla::Mutex
#endif
#ifndef TESTNAME
#define TESTNAME(name) XPCOM##name
#endif
static PRThread*
spawn(void (*run)(void*), void* arg)
{
return PR_CreateThread(PR_SYSTEM_THREAD,
run,
arg,
PR_PRIORITY_NORMAL,
PR_GLOBAL_THREAD,
PR_JOINABLE_THREAD,
0);
}
// This global variable is defined in toolkit/xre/nsSigHandlers.cpp.
extern unsigned int _gdb_sleep_duration;
/**
* Simple test fixture that makes sure the gdb sleep setup in the
* ah crap handler is bypassed during the death tests.
*/
Bug 1315138 - gtestify storage/test/*.cpp. r=mak,erahm. This change is mostly straightforward, except for the following. - It removes all the printing from the do_check_* macros because gtest macros do appropriate printing. - test_StatementCache.cpp needs some special gtest magic for the type parameterization. - It merges the four tests in test_unlock_notify.cpp because they rely on being executed in order, and so aren't independent. - storage_test_harness_tail.h is no longer necessary because gtest provides the test looping functionality. - It uses #include and the preprocessor to remove the duplication between test_deadlock_detector.cpp and xpcom/tests/DeadlockDetector.cpp. - It makes the test in test_service_init_background_thread.cpp a death test to force it to be the first storage gtest, because it fails otherwise. - It adds code to undo the SQLite mutex hooking as necessary, so that tests don't interfere with each other. - It de-virtualizes Spinner's destructor (as identified in bug 1318282). --HG-- rename : storage/test/storage_test_harness.h => storage/test/gtest/storage_test_harness.h rename : storage/test/test_AsXXX_helpers.cpp => storage/test/gtest/test_AsXXX_helpers.cpp rename : storage/test/test_StatementCache.cpp => storage/test/gtest/test_StatementCache.cpp rename : storage/test/test_asyncStatementExecution_transaction.cpp => storage/test/gtest/test_asyncStatementExecution_transaction.cpp rename : storage/test/test_async_callbacks_with_spun_event_loops.cpp => storage/test/gtest/test_async_callbacks_with_spun_event_loops.cpp rename : storage/test/test_binding_params.cpp => storage/test/gtest/test_binding_params.cpp rename : storage/test/test_deadlock_detector.cpp => storage/test/gtest/test_deadlock_detector.cpp rename : storage/test/test_file_perms.cpp => storage/test/gtest/test_file_perms.cpp rename : storage/test/test_mutex.cpp => storage/test/gtest/test_mutex.cpp rename : storage/test/test_service_init_background_thread.cpp => storage/test/gtest/test_service_init_background_thread.cpp rename : storage/test/test_statement_scoper.cpp => storage/test/gtest/test_statement_scoper.cpp rename : storage/test/test_transaction_helper.cpp => storage/test/gtest/test_transaction_helper.cpp rename : storage/test/test_true_async.cpp => storage/test/gtest/test_true_async.cpp rename : storage/test/test_unlock_notify.cpp => storage/test/gtest/test_unlock_notify.cpp extra : rebase_source : dbb695c112564efa1945116be1a8435988982e74
2016-11-10 22:59:23 +00:00
class TESTNAME(DeadlockDetectorTest) : public ::testing::Test
{
protected:
void SetUp() final {
Bug 1315138 - gtestify storage/test/*.cpp. r=mak,erahm. This change is mostly straightforward, except for the following. - It removes all the printing from the do_check_* macros because gtest macros do appropriate printing. - test_StatementCache.cpp needs some special gtest magic for the type parameterization. - It merges the four tests in test_unlock_notify.cpp because they rely on being executed in order, and so aren't independent. - storage_test_harness_tail.h is no longer necessary because gtest provides the test looping functionality. - It uses #include and the preprocessor to remove the duplication between test_deadlock_detector.cpp and xpcom/tests/DeadlockDetector.cpp. - It makes the test in test_service_init_background_thread.cpp a death test to force it to be the first storage gtest, because it fails otherwise. - It adds code to undo the SQLite mutex hooking as necessary, so that tests don't interfere with each other. - It de-virtualizes Spinner's destructor (as identified in bug 1318282). --HG-- rename : storage/test/storage_test_harness.h => storage/test/gtest/storage_test_harness.h rename : storage/test/test_AsXXX_helpers.cpp => storage/test/gtest/test_AsXXX_helpers.cpp rename : storage/test/test_StatementCache.cpp => storage/test/gtest/test_StatementCache.cpp rename : storage/test/test_asyncStatementExecution_transaction.cpp => storage/test/gtest/test_asyncStatementExecution_transaction.cpp rename : storage/test/test_async_callbacks_with_spun_event_loops.cpp => storage/test/gtest/test_async_callbacks_with_spun_event_loops.cpp rename : storage/test/test_binding_params.cpp => storage/test/gtest/test_binding_params.cpp rename : storage/test/test_deadlock_detector.cpp => storage/test/gtest/test_deadlock_detector.cpp rename : storage/test/test_file_perms.cpp => storage/test/gtest/test_file_perms.cpp rename : storage/test/test_mutex.cpp => storage/test/gtest/test_mutex.cpp rename : storage/test/test_service_init_background_thread.cpp => storage/test/gtest/test_service_init_background_thread.cpp rename : storage/test/test_statement_scoper.cpp => storage/test/gtest/test_statement_scoper.cpp rename : storage/test/test_transaction_helper.cpp => storage/test/gtest/test_transaction_helper.cpp rename : storage/test/test_true_async.cpp => storage/test/gtest/test_true_async.cpp rename : storage/test/test_unlock_notify.cpp => storage/test/gtest/test_unlock_notify.cpp extra : rebase_source : dbb695c112564efa1945116be1a8435988982e74
2016-11-10 22:59:23 +00:00
mOldSleepDuration = ::_gdb_sleep_duration;
::_gdb_sleep_duration = 0;
}
void TearDown() final {
Bug 1315138 - gtestify storage/test/*.cpp. r=mak,erahm. This change is mostly straightforward, except for the following. - It removes all the printing from the do_check_* macros because gtest macros do appropriate printing. - test_StatementCache.cpp needs some special gtest magic for the type parameterization. - It merges the four tests in test_unlock_notify.cpp because they rely on being executed in order, and so aren't independent. - storage_test_harness_tail.h is no longer necessary because gtest provides the test looping functionality. - It uses #include and the preprocessor to remove the duplication between test_deadlock_detector.cpp and xpcom/tests/DeadlockDetector.cpp. - It makes the test in test_service_init_background_thread.cpp a death test to force it to be the first storage gtest, because it fails otherwise. - It adds code to undo the SQLite mutex hooking as necessary, so that tests don't interfere with each other. - It de-virtualizes Spinner's destructor (as identified in bug 1318282). --HG-- rename : storage/test/storage_test_harness.h => storage/test/gtest/storage_test_harness.h rename : storage/test/test_AsXXX_helpers.cpp => storage/test/gtest/test_AsXXX_helpers.cpp rename : storage/test/test_StatementCache.cpp => storage/test/gtest/test_StatementCache.cpp rename : storage/test/test_asyncStatementExecution_transaction.cpp => storage/test/gtest/test_asyncStatementExecution_transaction.cpp rename : storage/test/test_async_callbacks_with_spun_event_loops.cpp => storage/test/gtest/test_async_callbacks_with_spun_event_loops.cpp rename : storage/test/test_binding_params.cpp => storage/test/gtest/test_binding_params.cpp rename : storage/test/test_deadlock_detector.cpp => storage/test/gtest/test_deadlock_detector.cpp rename : storage/test/test_file_perms.cpp => storage/test/gtest/test_file_perms.cpp rename : storage/test/test_mutex.cpp => storage/test/gtest/test_mutex.cpp rename : storage/test/test_service_init_background_thread.cpp => storage/test/gtest/test_service_init_background_thread.cpp rename : storage/test/test_statement_scoper.cpp => storage/test/gtest/test_statement_scoper.cpp rename : storage/test/test_transaction_helper.cpp => storage/test/gtest/test_transaction_helper.cpp rename : storage/test/test_true_async.cpp => storage/test/gtest/test_true_async.cpp rename : storage/test/test_unlock_notify.cpp => storage/test/gtest/test_unlock_notify.cpp extra : rebase_source : dbb695c112564efa1945116be1a8435988982e74
2016-11-10 22:59:23 +00:00
::_gdb_sleep_duration = mOldSleepDuration;
}
private:
unsigned int mOldSleepDuration;
};
void DisableCrashReporter()
{
nsCOMPtr<nsICrashReporter> crashreporter =
do_GetService("@mozilla.org/toolkit/crash-reporter;1");
if (crashreporter) {
crashreporter->SetEnabled(false);
}
}
//-----------------------------------------------------------------------------
// Single-threaded sanity tests
// Stupidest possible deadlock.
int
Sanity_Child()
{
DisableCrashReporter();
Bug 1315138 - gtestify storage/test/*.cpp. r=mak,erahm. This change is mostly straightforward, except for the following. - It removes all the printing from the do_check_* macros because gtest macros do appropriate printing. - test_StatementCache.cpp needs some special gtest magic for the type parameterization. - It merges the four tests in test_unlock_notify.cpp because they rely on being executed in order, and so aren't independent. - storage_test_harness_tail.h is no longer necessary because gtest provides the test looping functionality. - It uses #include and the preprocessor to remove the duplication between test_deadlock_detector.cpp and xpcom/tests/DeadlockDetector.cpp. - It makes the test in test_service_init_background_thread.cpp a death test to force it to be the first storage gtest, because it fails otherwise. - It adds code to undo the SQLite mutex hooking as necessary, so that tests don't interfere with each other. - It de-virtualizes Spinner's destructor (as identified in bug 1318282). --HG-- rename : storage/test/storage_test_harness.h => storage/test/gtest/storage_test_harness.h rename : storage/test/test_AsXXX_helpers.cpp => storage/test/gtest/test_AsXXX_helpers.cpp rename : storage/test/test_StatementCache.cpp => storage/test/gtest/test_StatementCache.cpp rename : storage/test/test_asyncStatementExecution_transaction.cpp => storage/test/gtest/test_asyncStatementExecution_transaction.cpp rename : storage/test/test_async_callbacks_with_spun_event_loops.cpp => storage/test/gtest/test_async_callbacks_with_spun_event_loops.cpp rename : storage/test/test_binding_params.cpp => storage/test/gtest/test_binding_params.cpp rename : storage/test/test_deadlock_detector.cpp => storage/test/gtest/test_deadlock_detector.cpp rename : storage/test/test_file_perms.cpp => storage/test/gtest/test_file_perms.cpp rename : storage/test/test_mutex.cpp => storage/test/gtest/test_mutex.cpp rename : storage/test/test_service_init_background_thread.cpp => storage/test/gtest/test_service_init_background_thread.cpp rename : storage/test/test_statement_scoper.cpp => storage/test/gtest/test_statement_scoper.cpp rename : storage/test/test_transaction_helper.cpp => storage/test/gtest/test_transaction_helper.cpp rename : storage/test/test_true_async.cpp => storage/test/gtest/test_true_async.cpp rename : storage/test/test_unlock_notify.cpp => storage/test/gtest/test_unlock_notify.cpp extra : rebase_source : dbb695c112564efa1945116be1a8435988982e74
2016-11-10 22:59:23 +00:00
MUTEX m1("dd.sanity.m1");
m1.Lock();
m1.Lock();
return 0; // not reached
}
Bug 1315138 - gtestify storage/test/*.cpp. r=mak,erahm. This change is mostly straightforward, except for the following. - It removes all the printing from the do_check_* macros because gtest macros do appropriate printing. - test_StatementCache.cpp needs some special gtest magic for the type parameterization. - It merges the four tests in test_unlock_notify.cpp because they rely on being executed in order, and so aren't independent. - storage_test_harness_tail.h is no longer necessary because gtest provides the test looping functionality. - It uses #include and the preprocessor to remove the duplication between test_deadlock_detector.cpp and xpcom/tests/DeadlockDetector.cpp. - It makes the test in test_service_init_background_thread.cpp a death test to force it to be the first storage gtest, because it fails otherwise. - It adds code to undo the SQLite mutex hooking as necessary, so that tests don't interfere with each other. - It de-virtualizes Spinner's destructor (as identified in bug 1318282). --HG-- rename : storage/test/storage_test_harness.h => storage/test/gtest/storage_test_harness.h rename : storage/test/test_AsXXX_helpers.cpp => storage/test/gtest/test_AsXXX_helpers.cpp rename : storage/test/test_StatementCache.cpp => storage/test/gtest/test_StatementCache.cpp rename : storage/test/test_asyncStatementExecution_transaction.cpp => storage/test/gtest/test_asyncStatementExecution_transaction.cpp rename : storage/test/test_async_callbacks_with_spun_event_loops.cpp => storage/test/gtest/test_async_callbacks_with_spun_event_loops.cpp rename : storage/test/test_binding_params.cpp => storage/test/gtest/test_binding_params.cpp rename : storage/test/test_deadlock_detector.cpp => storage/test/gtest/test_deadlock_detector.cpp rename : storage/test/test_file_perms.cpp => storage/test/gtest/test_file_perms.cpp rename : storage/test/test_mutex.cpp => storage/test/gtest/test_mutex.cpp rename : storage/test/test_service_init_background_thread.cpp => storage/test/gtest/test_service_init_background_thread.cpp rename : storage/test/test_statement_scoper.cpp => storage/test/gtest/test_statement_scoper.cpp rename : storage/test/test_transaction_helper.cpp => storage/test/gtest/test_transaction_helper.cpp rename : storage/test/test_true_async.cpp => storage/test/gtest/test_true_async.cpp rename : storage/test/test_unlock_notify.cpp => storage/test/gtest/test_unlock_notify.cpp extra : rebase_source : dbb695c112564efa1945116be1a8435988982e74
2016-11-10 22:59:23 +00:00
TEST_F(TESTNAME(DeadlockDetectorTest), TESTNAME(SanityDeathTest))
{
const char* const regex =
"###!!! ERROR: Potential deadlock detected.*"
"=== Cyclical dependency starts at.*--- Mutex : dd.sanity.m1.*"
"=== Cycle completed at.*--- Mutex : dd.sanity.m1.*"
"###!!! Deadlock may happen NOW!.*" // better catch these easy cases...
"###!!! ASSERTION: Potential deadlock detected.*";
ASSERT_DEATH_IF_SUPPORTED(Sanity_Child(), regex);
}
// Slightly less stupid deadlock.
int
Sanity2_Child()
{
DisableCrashReporter();
Bug 1315138 - gtestify storage/test/*.cpp. r=mak,erahm. This change is mostly straightforward, except for the following. - It removes all the printing from the do_check_* macros because gtest macros do appropriate printing. - test_StatementCache.cpp needs some special gtest magic for the type parameterization. - It merges the four tests in test_unlock_notify.cpp because they rely on being executed in order, and so aren't independent. - storage_test_harness_tail.h is no longer necessary because gtest provides the test looping functionality. - It uses #include and the preprocessor to remove the duplication between test_deadlock_detector.cpp and xpcom/tests/DeadlockDetector.cpp. - It makes the test in test_service_init_background_thread.cpp a death test to force it to be the first storage gtest, because it fails otherwise. - It adds code to undo the SQLite mutex hooking as necessary, so that tests don't interfere with each other. - It de-virtualizes Spinner's destructor (as identified in bug 1318282). --HG-- rename : storage/test/storage_test_harness.h => storage/test/gtest/storage_test_harness.h rename : storage/test/test_AsXXX_helpers.cpp => storage/test/gtest/test_AsXXX_helpers.cpp rename : storage/test/test_StatementCache.cpp => storage/test/gtest/test_StatementCache.cpp rename : storage/test/test_asyncStatementExecution_transaction.cpp => storage/test/gtest/test_asyncStatementExecution_transaction.cpp rename : storage/test/test_async_callbacks_with_spun_event_loops.cpp => storage/test/gtest/test_async_callbacks_with_spun_event_loops.cpp rename : storage/test/test_binding_params.cpp => storage/test/gtest/test_binding_params.cpp rename : storage/test/test_deadlock_detector.cpp => storage/test/gtest/test_deadlock_detector.cpp rename : storage/test/test_file_perms.cpp => storage/test/gtest/test_file_perms.cpp rename : storage/test/test_mutex.cpp => storage/test/gtest/test_mutex.cpp rename : storage/test/test_service_init_background_thread.cpp => storage/test/gtest/test_service_init_background_thread.cpp rename : storage/test/test_statement_scoper.cpp => storage/test/gtest/test_statement_scoper.cpp rename : storage/test/test_transaction_helper.cpp => storage/test/gtest/test_transaction_helper.cpp rename : storage/test/test_true_async.cpp => storage/test/gtest/test_true_async.cpp rename : storage/test/test_unlock_notify.cpp => storage/test/gtest/test_unlock_notify.cpp extra : rebase_source : dbb695c112564efa1945116be1a8435988982e74
2016-11-10 22:59:23 +00:00
MUTEX m1("dd.sanity2.m1");
MUTEX m2("dd.sanity2.m2");
m1.Lock();
m2.Lock();
m1.Lock();
return 0; // not reached
}
Bug 1315138 - gtestify storage/test/*.cpp. r=mak,erahm. This change is mostly straightforward, except for the following. - It removes all the printing from the do_check_* macros because gtest macros do appropriate printing. - test_StatementCache.cpp needs some special gtest magic for the type parameterization. - It merges the four tests in test_unlock_notify.cpp because they rely on being executed in order, and so aren't independent. - storage_test_harness_tail.h is no longer necessary because gtest provides the test looping functionality. - It uses #include and the preprocessor to remove the duplication between test_deadlock_detector.cpp and xpcom/tests/DeadlockDetector.cpp. - It makes the test in test_service_init_background_thread.cpp a death test to force it to be the first storage gtest, because it fails otherwise. - It adds code to undo the SQLite mutex hooking as necessary, so that tests don't interfere with each other. - It de-virtualizes Spinner's destructor (as identified in bug 1318282). --HG-- rename : storage/test/storage_test_harness.h => storage/test/gtest/storage_test_harness.h rename : storage/test/test_AsXXX_helpers.cpp => storage/test/gtest/test_AsXXX_helpers.cpp rename : storage/test/test_StatementCache.cpp => storage/test/gtest/test_StatementCache.cpp rename : storage/test/test_asyncStatementExecution_transaction.cpp => storage/test/gtest/test_asyncStatementExecution_transaction.cpp rename : storage/test/test_async_callbacks_with_spun_event_loops.cpp => storage/test/gtest/test_async_callbacks_with_spun_event_loops.cpp rename : storage/test/test_binding_params.cpp => storage/test/gtest/test_binding_params.cpp rename : storage/test/test_deadlock_detector.cpp => storage/test/gtest/test_deadlock_detector.cpp rename : storage/test/test_file_perms.cpp => storage/test/gtest/test_file_perms.cpp rename : storage/test/test_mutex.cpp => storage/test/gtest/test_mutex.cpp rename : storage/test/test_service_init_background_thread.cpp => storage/test/gtest/test_service_init_background_thread.cpp rename : storage/test/test_statement_scoper.cpp => storage/test/gtest/test_statement_scoper.cpp rename : storage/test/test_transaction_helper.cpp => storage/test/gtest/test_transaction_helper.cpp rename : storage/test/test_true_async.cpp => storage/test/gtest/test_true_async.cpp rename : storage/test/test_unlock_notify.cpp => storage/test/gtest/test_unlock_notify.cpp extra : rebase_source : dbb695c112564efa1945116be1a8435988982e74
2016-11-10 22:59:23 +00:00
TEST_F(TESTNAME(DeadlockDetectorTest), TESTNAME(Sanity2DeathTest))
{
const char* const regex =
"###!!! ERROR: Potential deadlock detected.*"
"=== Cyclical dependency starts at.*--- Mutex : dd.sanity2.m1.*"
"--- Next dependency:.*--- Mutex : dd.sanity2.m2.*"
"=== Cycle completed at.*--- Mutex : dd.sanity2.m1.*"
"###!!! Deadlock may happen NOW!.*" // better catch these easy cases...
"###!!! ASSERTION: Potential deadlock detected.*";
ASSERT_DEATH_IF_SUPPORTED(Sanity2_Child(), regex);
}
#if 0
// Temporarily disabled, see bug 1370644.
int
Sanity3_Child()
{
DisableCrashReporter();
Bug 1315138 - gtestify storage/test/*.cpp. r=mak,erahm. This change is mostly straightforward, except for the following. - It removes all the printing from the do_check_* macros because gtest macros do appropriate printing. - test_StatementCache.cpp needs some special gtest magic for the type parameterization. - It merges the four tests in test_unlock_notify.cpp because they rely on being executed in order, and so aren't independent. - storage_test_harness_tail.h is no longer necessary because gtest provides the test looping functionality. - It uses #include and the preprocessor to remove the duplication between test_deadlock_detector.cpp and xpcom/tests/DeadlockDetector.cpp. - It makes the test in test_service_init_background_thread.cpp a death test to force it to be the first storage gtest, because it fails otherwise. - It adds code to undo the SQLite mutex hooking as necessary, so that tests don't interfere with each other. - It de-virtualizes Spinner's destructor (as identified in bug 1318282). --HG-- rename : storage/test/storage_test_harness.h => storage/test/gtest/storage_test_harness.h rename : storage/test/test_AsXXX_helpers.cpp => storage/test/gtest/test_AsXXX_helpers.cpp rename : storage/test/test_StatementCache.cpp => storage/test/gtest/test_StatementCache.cpp rename : storage/test/test_asyncStatementExecution_transaction.cpp => storage/test/gtest/test_asyncStatementExecution_transaction.cpp rename : storage/test/test_async_callbacks_with_spun_event_loops.cpp => storage/test/gtest/test_async_callbacks_with_spun_event_loops.cpp rename : storage/test/test_binding_params.cpp => storage/test/gtest/test_binding_params.cpp rename : storage/test/test_deadlock_detector.cpp => storage/test/gtest/test_deadlock_detector.cpp rename : storage/test/test_file_perms.cpp => storage/test/gtest/test_file_perms.cpp rename : storage/test/test_mutex.cpp => storage/test/gtest/test_mutex.cpp rename : storage/test/test_service_init_background_thread.cpp => storage/test/gtest/test_service_init_background_thread.cpp rename : storage/test/test_statement_scoper.cpp => storage/test/gtest/test_statement_scoper.cpp rename : storage/test/test_transaction_helper.cpp => storage/test/gtest/test_transaction_helper.cpp rename : storage/test/test_true_async.cpp => storage/test/gtest/test_true_async.cpp rename : storage/test/test_unlock_notify.cpp => storage/test/gtest/test_unlock_notify.cpp extra : rebase_source : dbb695c112564efa1945116be1a8435988982e74
2016-11-10 22:59:23 +00:00
MUTEX m1("dd.sanity3.m1");
MUTEX m2("dd.sanity3.m2");
MUTEX m3("dd.sanity3.m3");
MUTEX m4("dd.sanity3.m4");
m1.Lock();
m2.Lock();
m3.Lock();
m4.Lock();
m4.Unlock();
m3.Unlock();
m2.Unlock();
m1.Unlock();
m4.Lock();
m1.Lock();
return 0;
}
Bug 1315138 - gtestify storage/test/*.cpp. r=mak,erahm. This change is mostly straightforward, except for the following. - It removes all the printing from the do_check_* macros because gtest macros do appropriate printing. - test_StatementCache.cpp needs some special gtest magic for the type parameterization. - It merges the four tests in test_unlock_notify.cpp because they rely on being executed in order, and so aren't independent. - storage_test_harness_tail.h is no longer necessary because gtest provides the test looping functionality. - It uses #include and the preprocessor to remove the duplication between test_deadlock_detector.cpp and xpcom/tests/DeadlockDetector.cpp. - It makes the test in test_service_init_background_thread.cpp a death test to force it to be the first storage gtest, because it fails otherwise. - It adds code to undo the SQLite mutex hooking as necessary, so that tests don't interfere with each other. - It de-virtualizes Spinner's destructor (as identified in bug 1318282). --HG-- rename : storage/test/storage_test_harness.h => storage/test/gtest/storage_test_harness.h rename : storage/test/test_AsXXX_helpers.cpp => storage/test/gtest/test_AsXXX_helpers.cpp rename : storage/test/test_StatementCache.cpp => storage/test/gtest/test_StatementCache.cpp rename : storage/test/test_asyncStatementExecution_transaction.cpp => storage/test/gtest/test_asyncStatementExecution_transaction.cpp rename : storage/test/test_async_callbacks_with_spun_event_loops.cpp => storage/test/gtest/test_async_callbacks_with_spun_event_loops.cpp rename : storage/test/test_binding_params.cpp => storage/test/gtest/test_binding_params.cpp rename : storage/test/test_deadlock_detector.cpp => storage/test/gtest/test_deadlock_detector.cpp rename : storage/test/test_file_perms.cpp => storage/test/gtest/test_file_perms.cpp rename : storage/test/test_mutex.cpp => storage/test/gtest/test_mutex.cpp rename : storage/test/test_service_init_background_thread.cpp => storage/test/gtest/test_service_init_background_thread.cpp rename : storage/test/test_statement_scoper.cpp => storage/test/gtest/test_statement_scoper.cpp rename : storage/test/test_transaction_helper.cpp => storage/test/gtest/test_transaction_helper.cpp rename : storage/test/test_true_async.cpp => storage/test/gtest/test_true_async.cpp rename : storage/test/test_unlock_notify.cpp => storage/test/gtest/test_unlock_notify.cpp extra : rebase_source : dbb695c112564efa1945116be1a8435988982e74
2016-11-10 22:59:23 +00:00
TEST_F(TESTNAME(DeadlockDetectorTest), TESTNAME(Sanity3DeathTest))
{
const char* const regex =
"###!!! ERROR: Potential deadlock detected.*"
"=== Cyclical dependency starts at.*--- Mutex : dd.sanity3.m1.*"
"--- Next dependency:.*--- Mutex : dd.sanity3.m2.*"
"--- Next dependency:.*--- Mutex : dd.sanity3.m3.*"
"--- Next dependency:.*--- Mutex : dd.sanity3.m4.*"
"=== Cycle completed at.*--- Mutex : dd.sanity3.m1.*"
"###!!! ASSERTION: Potential deadlock detected.*";
ASSERT_DEATH_IF_SUPPORTED(Sanity3_Child(), regex);
}
#endif
int
Sanity4_Child()
{
DisableCrashReporter();
mozilla::ReentrantMonitor m1("dd.sanity4.m1");
Bug 1315138 - gtestify storage/test/*.cpp. r=mak,erahm. This change is mostly straightforward, except for the following. - It removes all the printing from the do_check_* macros because gtest macros do appropriate printing. - test_StatementCache.cpp needs some special gtest magic for the type parameterization. - It merges the four tests in test_unlock_notify.cpp because they rely on being executed in order, and so aren't independent. - storage_test_harness_tail.h is no longer necessary because gtest provides the test looping functionality. - It uses #include and the preprocessor to remove the duplication between test_deadlock_detector.cpp and xpcom/tests/DeadlockDetector.cpp. - It makes the test in test_service_init_background_thread.cpp a death test to force it to be the first storage gtest, because it fails otherwise. - It adds code to undo the SQLite mutex hooking as necessary, so that tests don't interfere with each other. - It de-virtualizes Spinner's destructor (as identified in bug 1318282). --HG-- rename : storage/test/storage_test_harness.h => storage/test/gtest/storage_test_harness.h rename : storage/test/test_AsXXX_helpers.cpp => storage/test/gtest/test_AsXXX_helpers.cpp rename : storage/test/test_StatementCache.cpp => storage/test/gtest/test_StatementCache.cpp rename : storage/test/test_asyncStatementExecution_transaction.cpp => storage/test/gtest/test_asyncStatementExecution_transaction.cpp rename : storage/test/test_async_callbacks_with_spun_event_loops.cpp => storage/test/gtest/test_async_callbacks_with_spun_event_loops.cpp rename : storage/test/test_binding_params.cpp => storage/test/gtest/test_binding_params.cpp rename : storage/test/test_deadlock_detector.cpp => storage/test/gtest/test_deadlock_detector.cpp rename : storage/test/test_file_perms.cpp => storage/test/gtest/test_file_perms.cpp rename : storage/test/test_mutex.cpp => storage/test/gtest/test_mutex.cpp rename : storage/test/test_service_init_background_thread.cpp => storage/test/gtest/test_service_init_background_thread.cpp rename : storage/test/test_statement_scoper.cpp => storage/test/gtest/test_statement_scoper.cpp rename : storage/test/test_transaction_helper.cpp => storage/test/gtest/test_transaction_helper.cpp rename : storage/test/test_true_async.cpp => storage/test/gtest/test_true_async.cpp rename : storage/test/test_unlock_notify.cpp => storage/test/gtest/test_unlock_notify.cpp extra : rebase_source : dbb695c112564efa1945116be1a8435988982e74
2016-11-10 22:59:23 +00:00
MUTEX m2("dd.sanity4.m2");
m1.Enter();
m2.Lock();
m1.Enter();
return 0;
}
Bug 1315138 - gtestify storage/test/*.cpp. r=mak,erahm. This change is mostly straightforward, except for the following. - It removes all the printing from the do_check_* macros because gtest macros do appropriate printing. - test_StatementCache.cpp needs some special gtest magic for the type parameterization. - It merges the four tests in test_unlock_notify.cpp because they rely on being executed in order, and so aren't independent. - storage_test_harness_tail.h is no longer necessary because gtest provides the test looping functionality. - It uses #include and the preprocessor to remove the duplication between test_deadlock_detector.cpp and xpcom/tests/DeadlockDetector.cpp. - It makes the test in test_service_init_background_thread.cpp a death test to force it to be the first storage gtest, because it fails otherwise. - It adds code to undo the SQLite mutex hooking as necessary, so that tests don't interfere with each other. - It de-virtualizes Spinner's destructor (as identified in bug 1318282). --HG-- rename : storage/test/storage_test_harness.h => storage/test/gtest/storage_test_harness.h rename : storage/test/test_AsXXX_helpers.cpp => storage/test/gtest/test_AsXXX_helpers.cpp rename : storage/test/test_StatementCache.cpp => storage/test/gtest/test_StatementCache.cpp rename : storage/test/test_asyncStatementExecution_transaction.cpp => storage/test/gtest/test_asyncStatementExecution_transaction.cpp rename : storage/test/test_async_callbacks_with_spun_event_loops.cpp => storage/test/gtest/test_async_callbacks_with_spun_event_loops.cpp rename : storage/test/test_binding_params.cpp => storage/test/gtest/test_binding_params.cpp rename : storage/test/test_deadlock_detector.cpp => storage/test/gtest/test_deadlock_detector.cpp rename : storage/test/test_file_perms.cpp => storage/test/gtest/test_file_perms.cpp rename : storage/test/test_mutex.cpp => storage/test/gtest/test_mutex.cpp rename : storage/test/test_service_init_background_thread.cpp => storage/test/gtest/test_service_init_background_thread.cpp rename : storage/test/test_statement_scoper.cpp => storage/test/gtest/test_statement_scoper.cpp rename : storage/test/test_transaction_helper.cpp => storage/test/gtest/test_transaction_helper.cpp rename : storage/test/test_true_async.cpp => storage/test/gtest/test_true_async.cpp rename : storage/test/test_unlock_notify.cpp => storage/test/gtest/test_unlock_notify.cpp extra : rebase_source : dbb695c112564efa1945116be1a8435988982e74
2016-11-10 22:59:23 +00:00
TEST_F(TESTNAME(DeadlockDetectorTest), TESTNAME(Sanity4DeathTest))
{
const char* const regex =
"Re-entering ReentrantMonitor after acquiring other resources.*"
"###!!! ERROR: Potential deadlock detected.*"
"=== Cyclical dependency starts at.*--- ReentrantMonitor : dd.sanity4.m1.*"
"--- Next dependency:.*--- Mutex : dd.sanity4.m2.*"
"=== Cycle completed at.*--- ReentrantMonitor : dd.sanity4.m1.*"
"###!!! ASSERTION: Potential deadlock detected.*";
ASSERT_DEATH_IF_SUPPORTED(Sanity4_Child(), regex);
}
int
Sanity5_Child()
{
DisableCrashReporter();
mozilla::RecursiveMutex m1("dd.sanity4.m1");
MUTEX m2("dd.sanity4.m2");
m1.Lock();
m2.Lock();
m1.Lock();
return 0;
}
TEST_F(TESTNAME(DeadlockDetectorTest), TESTNAME(Sanity5DeathTest))
{
const char* const regex =
"Re-entering RecursiveMutex after acquiring other resources.*"
"###!!! ERROR: Potential deadlock detected.*"
"=== Cyclical dependency starts at.*--- RecursiveMutex : dd.sanity4.m1.*"
"--- Next dependency:.*--- Mutex : dd.sanity4.m2.*"
"=== Cycle completed at.*--- RecursiveMutex : dd.sanity4.m1.*"
"###!!! ASSERTION: Potential deadlock detected.*";
ASSERT_DEATH_IF_SUPPORTED(Sanity5_Child(), regex);
}
//-----------------------------------------------------------------------------
// Multithreaded tests
/**
* Helper for passing state to threads in the multithread tests.
*/
struct ThreadState
{
/**
* Locks to use during the test. This is just a reference and is owned by
* the main test thread.
*/
Bug 1315138 - gtestify storage/test/*.cpp. r=mak,erahm. This change is mostly straightforward, except for the following. - It removes all the printing from the do_check_* macros because gtest macros do appropriate printing. - test_StatementCache.cpp needs some special gtest magic for the type parameterization. - It merges the four tests in test_unlock_notify.cpp because they rely on being executed in order, and so aren't independent. - storage_test_harness_tail.h is no longer necessary because gtest provides the test looping functionality. - It uses #include and the preprocessor to remove the duplication between test_deadlock_detector.cpp and xpcom/tests/DeadlockDetector.cpp. - It makes the test in test_service_init_background_thread.cpp a death test to force it to be the first storage gtest, because it fails otherwise. - It adds code to undo the SQLite mutex hooking as necessary, so that tests don't interfere with each other. - It de-virtualizes Spinner's destructor (as identified in bug 1318282). --HG-- rename : storage/test/storage_test_harness.h => storage/test/gtest/storage_test_harness.h rename : storage/test/test_AsXXX_helpers.cpp => storage/test/gtest/test_AsXXX_helpers.cpp rename : storage/test/test_StatementCache.cpp => storage/test/gtest/test_StatementCache.cpp rename : storage/test/test_asyncStatementExecution_transaction.cpp => storage/test/gtest/test_asyncStatementExecution_transaction.cpp rename : storage/test/test_async_callbacks_with_spun_event_loops.cpp => storage/test/gtest/test_async_callbacks_with_spun_event_loops.cpp rename : storage/test/test_binding_params.cpp => storage/test/gtest/test_binding_params.cpp rename : storage/test/test_deadlock_detector.cpp => storage/test/gtest/test_deadlock_detector.cpp rename : storage/test/test_file_perms.cpp => storage/test/gtest/test_file_perms.cpp rename : storage/test/test_mutex.cpp => storage/test/gtest/test_mutex.cpp rename : storage/test/test_service_init_background_thread.cpp => storage/test/gtest/test_service_init_background_thread.cpp rename : storage/test/test_statement_scoper.cpp => storage/test/gtest/test_statement_scoper.cpp rename : storage/test/test_transaction_helper.cpp => storage/test/gtest/test_transaction_helper.cpp rename : storage/test/test_true_async.cpp => storage/test/gtest/test_true_async.cpp rename : storage/test/test_unlock_notify.cpp => storage/test/gtest/test_unlock_notify.cpp extra : rebase_source : dbb695c112564efa1945116be1a8435988982e74
2016-11-10 22:59:23 +00:00
const nsTArray<MUTEX*>& locks;
/**
* Integer argument used to identify each thread.
*/
int id;
};
#if 0
// Temporarily disabled, see bug 1370644.
static void
TwoThreads_thread(void* arg)
{
ThreadState* state = static_cast<ThreadState*>(arg);
Bug 1315138 - gtestify storage/test/*.cpp. r=mak,erahm. This change is mostly straightforward, except for the following. - It removes all the printing from the do_check_* macros because gtest macros do appropriate printing. - test_StatementCache.cpp needs some special gtest magic for the type parameterization. - It merges the four tests in test_unlock_notify.cpp because they rely on being executed in order, and so aren't independent. - storage_test_harness_tail.h is no longer necessary because gtest provides the test looping functionality. - It uses #include and the preprocessor to remove the duplication between test_deadlock_detector.cpp and xpcom/tests/DeadlockDetector.cpp. - It makes the test in test_service_init_background_thread.cpp a death test to force it to be the first storage gtest, because it fails otherwise. - It adds code to undo the SQLite mutex hooking as necessary, so that tests don't interfere with each other. - It de-virtualizes Spinner's destructor (as identified in bug 1318282). --HG-- rename : storage/test/storage_test_harness.h => storage/test/gtest/storage_test_harness.h rename : storage/test/test_AsXXX_helpers.cpp => storage/test/gtest/test_AsXXX_helpers.cpp rename : storage/test/test_StatementCache.cpp => storage/test/gtest/test_StatementCache.cpp rename : storage/test/test_asyncStatementExecution_transaction.cpp => storage/test/gtest/test_asyncStatementExecution_transaction.cpp rename : storage/test/test_async_callbacks_with_spun_event_loops.cpp => storage/test/gtest/test_async_callbacks_with_spun_event_loops.cpp rename : storage/test/test_binding_params.cpp => storage/test/gtest/test_binding_params.cpp rename : storage/test/test_deadlock_detector.cpp => storage/test/gtest/test_deadlock_detector.cpp rename : storage/test/test_file_perms.cpp => storage/test/gtest/test_file_perms.cpp rename : storage/test/test_mutex.cpp => storage/test/gtest/test_mutex.cpp rename : storage/test/test_service_init_background_thread.cpp => storage/test/gtest/test_service_init_background_thread.cpp rename : storage/test/test_statement_scoper.cpp => storage/test/gtest/test_statement_scoper.cpp rename : storage/test/test_transaction_helper.cpp => storage/test/gtest/test_transaction_helper.cpp rename : storage/test/test_true_async.cpp => storage/test/gtest/test_true_async.cpp rename : storage/test/test_unlock_notify.cpp => storage/test/gtest/test_unlock_notify.cpp extra : rebase_source : dbb695c112564efa1945116be1a8435988982e74
2016-11-10 22:59:23 +00:00
MUTEX* ttM1 = state->locks[0];
MUTEX* ttM2 = state->locks[1];
if (state->id) {
ttM1->Lock();
ttM2->Lock();
ttM2->Unlock();
ttM1->Unlock();
}
else {
ttM2->Lock();
ttM1->Lock();
ttM1->Unlock();
ttM2->Unlock();
}
}
int
TwoThreads_Child()
{
DisableCrashReporter();
Bug 1315138 - gtestify storage/test/*.cpp. r=mak,erahm. This change is mostly straightforward, except for the following. - It removes all the printing from the do_check_* macros because gtest macros do appropriate printing. - test_StatementCache.cpp needs some special gtest magic for the type parameterization. - It merges the four tests in test_unlock_notify.cpp because they rely on being executed in order, and so aren't independent. - storage_test_harness_tail.h is no longer necessary because gtest provides the test looping functionality. - It uses #include and the preprocessor to remove the duplication between test_deadlock_detector.cpp and xpcom/tests/DeadlockDetector.cpp. - It makes the test in test_service_init_background_thread.cpp a death test to force it to be the first storage gtest, because it fails otherwise. - It adds code to undo the SQLite mutex hooking as necessary, so that tests don't interfere with each other. - It de-virtualizes Spinner's destructor (as identified in bug 1318282). --HG-- rename : storage/test/storage_test_harness.h => storage/test/gtest/storage_test_harness.h rename : storage/test/test_AsXXX_helpers.cpp => storage/test/gtest/test_AsXXX_helpers.cpp rename : storage/test/test_StatementCache.cpp => storage/test/gtest/test_StatementCache.cpp rename : storage/test/test_asyncStatementExecution_transaction.cpp => storage/test/gtest/test_asyncStatementExecution_transaction.cpp rename : storage/test/test_async_callbacks_with_spun_event_loops.cpp => storage/test/gtest/test_async_callbacks_with_spun_event_loops.cpp rename : storage/test/test_binding_params.cpp => storage/test/gtest/test_binding_params.cpp rename : storage/test/test_deadlock_detector.cpp => storage/test/gtest/test_deadlock_detector.cpp rename : storage/test/test_file_perms.cpp => storage/test/gtest/test_file_perms.cpp rename : storage/test/test_mutex.cpp => storage/test/gtest/test_mutex.cpp rename : storage/test/test_service_init_background_thread.cpp => storage/test/gtest/test_service_init_background_thread.cpp rename : storage/test/test_statement_scoper.cpp => storage/test/gtest/test_statement_scoper.cpp rename : storage/test/test_transaction_helper.cpp => storage/test/gtest/test_transaction_helper.cpp rename : storage/test/test_true_async.cpp => storage/test/gtest/test_true_async.cpp rename : storage/test/test_unlock_notify.cpp => storage/test/gtest/test_unlock_notify.cpp extra : rebase_source : dbb695c112564efa1945116be1a8435988982e74
2016-11-10 22:59:23 +00:00
nsTArray<MUTEX*> locks = {
new MUTEX("dd.twothreads.m1"),
new MUTEX("dd.twothreads.m2")
};
ThreadState state_1 {locks, 0};
PRThread* t1 = spawn(TwoThreads_thread, &state_1);
PR_JoinThread(t1);
ThreadState state_2 {locks, 1};
PRThread* t2 = spawn(TwoThreads_thread, &state_2);
PR_JoinThread(t2);
for (auto& lock : locks) {
delete lock;
}
return 0;
}
Bug 1315138 - gtestify storage/test/*.cpp. r=mak,erahm. This change is mostly straightforward, except for the following. - It removes all the printing from the do_check_* macros because gtest macros do appropriate printing. - test_StatementCache.cpp needs some special gtest magic for the type parameterization. - It merges the four tests in test_unlock_notify.cpp because they rely on being executed in order, and so aren't independent. - storage_test_harness_tail.h is no longer necessary because gtest provides the test looping functionality. - It uses #include and the preprocessor to remove the duplication between test_deadlock_detector.cpp and xpcom/tests/DeadlockDetector.cpp. - It makes the test in test_service_init_background_thread.cpp a death test to force it to be the first storage gtest, because it fails otherwise. - It adds code to undo the SQLite mutex hooking as necessary, so that tests don't interfere with each other. - It de-virtualizes Spinner's destructor (as identified in bug 1318282). --HG-- rename : storage/test/storage_test_harness.h => storage/test/gtest/storage_test_harness.h rename : storage/test/test_AsXXX_helpers.cpp => storage/test/gtest/test_AsXXX_helpers.cpp rename : storage/test/test_StatementCache.cpp => storage/test/gtest/test_StatementCache.cpp rename : storage/test/test_asyncStatementExecution_transaction.cpp => storage/test/gtest/test_asyncStatementExecution_transaction.cpp rename : storage/test/test_async_callbacks_with_spun_event_loops.cpp => storage/test/gtest/test_async_callbacks_with_spun_event_loops.cpp rename : storage/test/test_binding_params.cpp => storage/test/gtest/test_binding_params.cpp rename : storage/test/test_deadlock_detector.cpp => storage/test/gtest/test_deadlock_detector.cpp rename : storage/test/test_file_perms.cpp => storage/test/gtest/test_file_perms.cpp rename : storage/test/test_mutex.cpp => storage/test/gtest/test_mutex.cpp rename : storage/test/test_service_init_background_thread.cpp => storage/test/gtest/test_service_init_background_thread.cpp rename : storage/test/test_statement_scoper.cpp => storage/test/gtest/test_statement_scoper.cpp rename : storage/test/test_transaction_helper.cpp => storage/test/gtest/test_transaction_helper.cpp rename : storage/test/test_true_async.cpp => storage/test/gtest/test_true_async.cpp rename : storage/test/test_unlock_notify.cpp => storage/test/gtest/test_unlock_notify.cpp extra : rebase_source : dbb695c112564efa1945116be1a8435988982e74
2016-11-10 22:59:23 +00:00
TEST_F(TESTNAME(DeadlockDetectorTest), TESTNAME(TwoThreadsDeathTest))
{
const char* const regex =
"###!!! ERROR: Potential deadlock detected.*"
"=== Cyclical dependency starts at.*--- Mutex : dd.twothreads.m2.*"
"--- Next dependency:.*--- Mutex : dd.twothreads.m1.*"
"=== Cycle completed at.*--- Mutex : dd.twothreads.m2.*"
"###!!! ASSERTION: Potential deadlock detected.*";
ASSERT_DEATH_IF_SUPPORTED(TwoThreads_Child(), regex);
}
#endif
static void
ContentionNoDeadlock_thread(void* arg)
{
const uint32_t K = 100000;
ThreadState* state = static_cast<ThreadState*>(arg);
int32_t starti = static_cast<int32_t>(state->id);
auto& cndMs = state->locks;
for (uint32_t k = 0; k < K; ++k) {
for (int32_t i = starti; i < (int32_t)cndMs.Length(); ++i)
cndMs[i]->Lock();
// comment out the next two lines for deadlocking fun!
for (int32_t i = cndMs.Length() - 1; i >= starti; --i)
cndMs[i]->Unlock();
starti = (starti + 1) % 3;
}
}
int
ContentionNoDeadlock_Child()
{
const size_t kMutexCount = 4;
PRThread* threads[3];
Bug 1315138 - gtestify storage/test/*.cpp. r=mak,erahm. This change is mostly straightforward, except for the following. - It removes all the printing from the do_check_* macros because gtest macros do appropriate printing. - test_StatementCache.cpp needs some special gtest magic for the type parameterization. - It merges the four tests in test_unlock_notify.cpp because they rely on being executed in order, and so aren't independent. - storage_test_harness_tail.h is no longer necessary because gtest provides the test looping functionality. - It uses #include and the preprocessor to remove the duplication between test_deadlock_detector.cpp and xpcom/tests/DeadlockDetector.cpp. - It makes the test in test_service_init_background_thread.cpp a death test to force it to be the first storage gtest, because it fails otherwise. - It adds code to undo the SQLite mutex hooking as necessary, so that tests don't interfere with each other. - It de-virtualizes Spinner's destructor (as identified in bug 1318282). --HG-- rename : storage/test/storage_test_harness.h => storage/test/gtest/storage_test_harness.h rename : storage/test/test_AsXXX_helpers.cpp => storage/test/gtest/test_AsXXX_helpers.cpp rename : storage/test/test_StatementCache.cpp => storage/test/gtest/test_StatementCache.cpp rename : storage/test/test_asyncStatementExecution_transaction.cpp => storage/test/gtest/test_asyncStatementExecution_transaction.cpp rename : storage/test/test_async_callbacks_with_spun_event_loops.cpp => storage/test/gtest/test_async_callbacks_with_spun_event_loops.cpp rename : storage/test/test_binding_params.cpp => storage/test/gtest/test_binding_params.cpp rename : storage/test/test_deadlock_detector.cpp => storage/test/gtest/test_deadlock_detector.cpp rename : storage/test/test_file_perms.cpp => storage/test/gtest/test_file_perms.cpp rename : storage/test/test_mutex.cpp => storage/test/gtest/test_mutex.cpp rename : storage/test/test_service_init_background_thread.cpp => storage/test/gtest/test_service_init_background_thread.cpp rename : storage/test/test_statement_scoper.cpp => storage/test/gtest/test_statement_scoper.cpp rename : storage/test/test_transaction_helper.cpp => storage/test/gtest/test_transaction_helper.cpp rename : storage/test/test_true_async.cpp => storage/test/gtest/test_true_async.cpp rename : storage/test/test_unlock_notify.cpp => storage/test/gtest/test_unlock_notify.cpp extra : rebase_source : dbb695c112564efa1945116be1a8435988982e74
2016-11-10 22:59:23 +00:00
nsTArray<MUTEX*> locks;
ThreadState states[] = {
{ locks, 0 },
{ locks, 1 },
{ locks, 2 }
};
for (uint32_t i = 0; i < kMutexCount; ++i)
Bug 1315138 - gtestify storage/test/*.cpp. r=mak,erahm. This change is mostly straightforward, except for the following. - It removes all the printing from the do_check_* macros because gtest macros do appropriate printing. - test_StatementCache.cpp needs some special gtest magic for the type parameterization. - It merges the four tests in test_unlock_notify.cpp because they rely on being executed in order, and so aren't independent. - storage_test_harness_tail.h is no longer necessary because gtest provides the test looping functionality. - It uses #include and the preprocessor to remove the duplication between test_deadlock_detector.cpp and xpcom/tests/DeadlockDetector.cpp. - It makes the test in test_service_init_background_thread.cpp a death test to force it to be the first storage gtest, because it fails otherwise. - It adds code to undo the SQLite mutex hooking as necessary, so that tests don't interfere with each other. - It de-virtualizes Spinner's destructor (as identified in bug 1318282). --HG-- rename : storage/test/storage_test_harness.h => storage/test/gtest/storage_test_harness.h rename : storage/test/test_AsXXX_helpers.cpp => storage/test/gtest/test_AsXXX_helpers.cpp rename : storage/test/test_StatementCache.cpp => storage/test/gtest/test_StatementCache.cpp rename : storage/test/test_asyncStatementExecution_transaction.cpp => storage/test/gtest/test_asyncStatementExecution_transaction.cpp rename : storage/test/test_async_callbacks_with_spun_event_loops.cpp => storage/test/gtest/test_async_callbacks_with_spun_event_loops.cpp rename : storage/test/test_binding_params.cpp => storage/test/gtest/test_binding_params.cpp rename : storage/test/test_deadlock_detector.cpp => storage/test/gtest/test_deadlock_detector.cpp rename : storage/test/test_file_perms.cpp => storage/test/gtest/test_file_perms.cpp rename : storage/test/test_mutex.cpp => storage/test/gtest/test_mutex.cpp rename : storage/test/test_service_init_background_thread.cpp => storage/test/gtest/test_service_init_background_thread.cpp rename : storage/test/test_statement_scoper.cpp => storage/test/gtest/test_statement_scoper.cpp rename : storage/test/test_transaction_helper.cpp => storage/test/gtest/test_transaction_helper.cpp rename : storage/test/test_true_async.cpp => storage/test/gtest/test_true_async.cpp rename : storage/test/test_unlock_notify.cpp => storage/test/gtest/test_unlock_notify.cpp extra : rebase_source : dbb695c112564efa1945116be1a8435988982e74
2016-11-10 22:59:23 +00:00
locks.AppendElement(new MUTEX("dd.cnd.ms"));
for (int32_t i = 0; i < (int32_t) ArrayLength(threads); ++i)
threads[i] = spawn(ContentionNoDeadlock_thread, states + i);
for (uint32_t i = 0; i < ArrayLength(threads); ++i)
PR_JoinThread(threads[i]);
for (uint32_t i = 0; i < locks.Length(); ++i)
delete locks[i];
return 0;
}
Bug 1315138 - gtestify storage/test/*.cpp. r=mak,erahm. This change is mostly straightforward, except for the following. - It removes all the printing from the do_check_* macros because gtest macros do appropriate printing. - test_StatementCache.cpp needs some special gtest magic for the type parameterization. - It merges the four tests in test_unlock_notify.cpp because they rely on being executed in order, and so aren't independent. - storage_test_harness_tail.h is no longer necessary because gtest provides the test looping functionality. - It uses #include and the preprocessor to remove the duplication between test_deadlock_detector.cpp and xpcom/tests/DeadlockDetector.cpp. - It makes the test in test_service_init_background_thread.cpp a death test to force it to be the first storage gtest, because it fails otherwise. - It adds code to undo the SQLite mutex hooking as necessary, so that tests don't interfere with each other. - It de-virtualizes Spinner's destructor (as identified in bug 1318282). --HG-- rename : storage/test/storage_test_harness.h => storage/test/gtest/storage_test_harness.h rename : storage/test/test_AsXXX_helpers.cpp => storage/test/gtest/test_AsXXX_helpers.cpp rename : storage/test/test_StatementCache.cpp => storage/test/gtest/test_StatementCache.cpp rename : storage/test/test_asyncStatementExecution_transaction.cpp => storage/test/gtest/test_asyncStatementExecution_transaction.cpp rename : storage/test/test_async_callbacks_with_spun_event_loops.cpp => storage/test/gtest/test_async_callbacks_with_spun_event_loops.cpp rename : storage/test/test_binding_params.cpp => storage/test/gtest/test_binding_params.cpp rename : storage/test/test_deadlock_detector.cpp => storage/test/gtest/test_deadlock_detector.cpp rename : storage/test/test_file_perms.cpp => storage/test/gtest/test_file_perms.cpp rename : storage/test/test_mutex.cpp => storage/test/gtest/test_mutex.cpp rename : storage/test/test_service_init_background_thread.cpp => storage/test/gtest/test_service_init_background_thread.cpp rename : storage/test/test_statement_scoper.cpp => storage/test/gtest/test_statement_scoper.cpp rename : storage/test/test_transaction_helper.cpp => storage/test/gtest/test_transaction_helper.cpp rename : storage/test/test_true_async.cpp => storage/test/gtest/test_true_async.cpp rename : storage/test/test_unlock_notify.cpp => storage/test/gtest/test_unlock_notify.cpp extra : rebase_source : dbb695c112564efa1945116be1a8435988982e74
2016-11-10 22:59:23 +00:00
TEST_F(TESTNAME(DeadlockDetectorTest), TESTNAME(ContentionNoDeadlock))
{
// Just check that this test runs to completion.
ASSERT_EQ(ContentionNoDeadlock_Child(), 0);
}