apply the modified style

This commit is contained in:
Evan Hunt
2020-02-13 14:44:37 -08:00
parent 0255a97473
commit e851ed0bb5
669 changed files with 35995 additions and 42219 deletions

View File

@@ -39,24 +39,23 @@
/* Set to true (or use -v option) for verbose output */
static bool verbose = false;
#define FUDGE_SECONDS 0 /* in absence of clock_getres() */
#define FUDGE_SECONDS 0 /* in absence of clock_getres() */
#define FUDGE_NANOSECONDS 500000000 /* in absence of clock_getres() */
static isc_timer_t * timer = NULL;
static isc_condition_t cv;
static isc_mutex_t mx;
static isc_time_t endtime;
static isc_mutex_t lasttime_mx;
static isc_time_t lasttime;
static int seconds;
static int nanoseconds;
static atomic_int_fast32_t eventcnt;
static isc_timer_t *timer = NULL;
static isc_condition_t cv;
static isc_mutex_t mx;
static isc_time_t endtime;
static isc_mutex_t lasttime_mx;
static isc_time_t lasttime;
static int seconds;
static int nanoseconds;
static atomic_int_fast32_t eventcnt;
static atomic_uint_fast32_t errcnt;
static int nevents;
static int nevents;
static int
_setup(void **state)
{
_setup(void **state) {
isc_result_t result;
UNUSED(state);
@@ -71,8 +70,7 @@ _setup(void **state)
}
static int
_teardown(void **state)
{
_teardown(void **state) {
UNUSED(state);
isc_test_end();
@@ -81,8 +79,7 @@ _teardown(void **state)
}
static void
shutdown(isc_task_t *task, isc_event_t *event)
{
shutdown(isc_task_t *task, isc_event_t *event) {
isc_result_t result;
UNUSED(task);
@@ -105,10 +102,9 @@ shutdown(isc_task_t *task, isc_event_t *event)
static void
setup_test(isc_timertype_t timertype, isc_time_t *expires,
isc_interval_t *interval,
void (*action)(isc_task_t *, isc_event_t *))
{
void (*action)(isc_task_t *, isc_event_t *)) {
isc_result_t result;
isc_task_t * task = NULL;
isc_task_t *task = NULL;
isc_time_settoepoch(&endtime);
atomic_init(&eventcnt, 0);
@@ -152,45 +148,40 @@ setup_test(isc_timertype_t timertype, isc_time_t *expires,
}
static void
set_global_error(isc_result_t result)
{
set_global_error(isc_result_t result) {
(void)atomic_compare_exchange_strong(
&errcnt, &(uint_fast32_t){ ISC_R_SUCCESS }, result);
}
static void
subthread_assert_true(bool expected)
{
subthread_assert_true(bool expected) {
if (!expected) {
set_global_error(ISC_R_UNEXPECTED);
}
}
static void
subthread_assert_int_equal(int observed, int expected)
{
subthread_assert_int_equal(int observed, int expected) {
if (observed != expected) {
set_global_error(ISC_R_UNEXPECTED);
}
}
static void
subthread_assert_result_equal(isc_result_t result, isc_result_t expected)
{
subthread_assert_result_equal(isc_result_t result, isc_result_t expected) {
if (result != expected) {
set_global_error(result);
}
}
static void
ticktock(isc_task_t *task, isc_event_t *event)
{
isc_result_t result;
isc_time_t now;
isc_time_t base;
isc_time_t ulim;
isc_time_t llim;
isc_interval_t interval;
ticktock(isc_task_t *task, isc_event_t *event) {
isc_result_t result;
isc_time_t now;
isc_time_t base;
isc_time_t ulim;
isc_time_t llim;
isc_interval_t interval;
isc_eventtype_t expected_event_type;
int tick = atomic_fetch_add(&eventcnt, 1);
@@ -250,9 +241,8 @@ ticktock(isc_task_t *task, isc_event_t *event)
/* timer type ticker */
static void
ticker(void **state)
{
isc_time_t expires;
ticker(void **state) {
isc_time_t expires;
isc_interval_t interval;
UNUSED(state);
@@ -269,10 +259,9 @@ ticker(void **state)
/* timer type once reaches lifetime */
static void
once_life(void **state)
{
isc_result_t result;
isc_time_t expires;
once_life(void **state) {
isc_result_t result;
isc_time_t expires;
isc_interval_t interval;
UNUSED(state);
@@ -291,13 +280,12 @@ once_life(void **state)
}
static void
test_idle(isc_task_t *task, isc_event_t *event)
{
isc_result_t result;
isc_time_t now;
isc_time_t base;
isc_time_t ulim;
isc_time_t llim;
test_idle(isc_task_t *task, isc_event_t *event) {
isc_result_t result;
isc_time_t now;
isc_time_t base;
isc_time_t ulim;
isc_time_t llim;
isc_interval_t interval;
int tick = atomic_fetch_add(&eventcnt, 1);
@@ -339,10 +327,9 @@ test_idle(isc_task_t *task, isc_event_t *event)
/* timer type once idles out */
static void
once_idle(void **state)
{
isc_result_t result;
isc_time_t expires;
once_idle(void **state) {
isc_result_t result;
isc_time_t expires;
isc_interval_t interval;
UNUSED(state);
@@ -362,14 +349,13 @@ once_idle(void **state)
/* timer reset */
static void
test_reset(isc_task_t *task, isc_event_t *event)
{
isc_result_t result;
isc_time_t now;
isc_time_t base;
isc_time_t ulim;
isc_time_t llim;
isc_time_t expires;
test_reset(isc_task_t *task, isc_event_t *event) {
isc_result_t result;
isc_time_t now;
isc_time_t base;
isc_time_t ulim;
isc_time_t llim;
isc_time_t expires;
isc_interval_t interval;
int tick = atomic_fetch_add(&eventcnt, 1);
@@ -432,9 +418,8 @@ test_reset(isc_task_t *task, isc_event_t *event)
}
static void
reset(void **state)
{
isc_time_t expires;
reset(void **state) {
isc_time_t expires;
isc_interval_t interval;
UNUSED(state);
@@ -449,12 +434,12 @@ reset(void **state)
setup_test(isc_timertype_ticker, &expires, &interval, test_reset);
}
static int startflag;
static int shutdownflag;
static int startflag;
static int shutdownflag;
static isc_timer_t *tickertimer = NULL;
static isc_timer_t *oncetimer = NULL;
static isc_task_t * task1 = NULL;
static isc_task_t * task2 = NULL;
static isc_task_t *task1 = NULL;
static isc_task_t *task2 = NULL;
/*
* task1 blocks on mx while events accumulate
@@ -462,8 +447,7 @@ static isc_task_t * task2 = NULL;
*/
static void
start_event(isc_task_t *task, isc_event_t *event)
{
start_event(isc_task_t *task, isc_event_t *event) {
UNUSED(task);
if (verbose) {
@@ -480,10 +464,9 @@ start_event(isc_task_t *task, isc_event_t *event)
}
static void
tick_event(isc_task_t *task, isc_event_t *event)
{
isc_result_t result;
isc_time_t expires;
tick_event(isc_task_t *task, isc_event_t *event) {
isc_result_t result;
isc_time_t expires;
isc_interval_t interval;
UNUSED(task);
@@ -511,8 +494,7 @@ tick_event(isc_task_t *task, isc_event_t *event)
}
static void
once_event(isc_task_t *task, isc_event_t *event)
{
once_event(isc_task_t *task, isc_event_t *event) {
isc_result_t result;
if (verbose) {
@@ -534,8 +516,7 @@ once_event(isc_task_t *task, isc_event_t *event)
}
static void
shutdown_purge(isc_task_t *task, isc_event_t *event)
{
shutdown_purge(isc_task_t *task, isc_event_t *event) {
isc_result_t result;
UNUSED(task);
@@ -560,11 +541,10 @@ shutdown_purge(isc_task_t *task, isc_event_t *event)
/* timer events purged */
static void
purge(void **state)
{
isc_result_t result;
isc_event_t * event = NULL;
isc_time_t expires;
purge(void **state) {
isc_result_t result;
isc_event_t *event = NULL;
isc_time_t expires;
isc_interval_t interval;
UNUSED(state);
@@ -638,8 +618,7 @@ purge(void **state)
}
int
main(int argc, char **argv)
{
main(int argc, char **argv) {
const struct CMUnitTest tests[] = {
cmocka_unit_test(ticker), cmocka_unit_test(once_life),
cmocka_unit_test(once_idle), cmocka_unit_test(reset),
@@ -665,8 +644,7 @@ main(int argc, char **argv)
#include <stdio.h>
int
main(void)
{
main(void) {
printf("1..0 # Skipped: cmocka not available\n");
return (0);
}