fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-01-31 18:00:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add multithreaded unit test for DBusCounter to available build systems

Browse source 
The mentioned test is build on unix like platforms when embedded tests
are enabled.

(cherry picked from commit 20febb522b)
[backport to 1.14.x: adjust included header]
This commit is contained in:
Ralf Habacker 2023-01-07 10:21:33 +01:00
parent 79f7fcab69
commit 9155d36905
4 changed files with 139 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dbus/dbus-resources.h
View file

@ -23,6 +23,7 @@
#ifndef DBUS_RESOURCES_H
#define DBUS_RESOURCES_H
#include <dbus/dbus-internals.h>
#include <dbus/dbus-macros.h>
#include <dbus/dbus-errors.h>
#include <dbus/dbus-connection.h>
@ -33,17 +34,22 @@ typedef struct DBusCounter DBusCounter;
typedef void (* DBusCounterNotifyFunction) (DBusCounter *counter,
void *user_data);
DBUS_EMBEDDED_TESTS_EXPORT
DBusCounter* _dbus_counter_new (void);
DBusCounter* _dbus_counter_ref (DBusCounter *counter);
DBUS_EMBEDDED_TESTS_EXPORT
void _dbus_counter_unref (DBusCounter *counter);
DBUS_EMBEDDED_TESTS_EXPORT
void _dbus_counter_adjust_size (DBusCounter *counter,
long delta);
DBUS_EMBEDDED_TESTS_EXPORT
void _dbus_counter_adjust_unix_fd (DBusCounter *counter,
long delta);
void _dbus_counter_notify (DBusCounter *counter);
DBUS_EMBEDDED_TESTS_EXPORT
long _dbus_counter_get_size_value (DBusCounter *counter);
DBUS_EMBEDDED_TESTS_EXPORT
long _dbus_counter_get_unix_fd_value (DBusCounter *counter);
void _dbus_counter_set_notify (DBusCounter *counter,

1
test/CMakeLists.txt
View file

@ -158,6 +158,7 @@ if(DBUS_ENABLE_EMBEDDED_TESTS)
if(NOT WIN32)
add_test_executable(test-bus-system bus/system.c launch-helper-internal dbus-testutils)
add_test_executable(test-counter internals/counter.c dbus-testutils)
if(ENABLE_TRADITIONAL_ACTIVATION)
add_test_executable(test-bus-launch-helper-oom bus/launch-helper-oom.c launch-helper-internal dbus-testutils)
add_helper_executable(dbus-daemon-launch-helper-for-tests bus/launch-helper-for-tests.c launch-helper-internal)

11
test/Makefile.am
View file

@ -93,6 +93,9 @@ uninstallable_test_programs += \
$(NULL)
if DBUS_UNIX
test_counter_SOURCES = internals/counter.c
test_counter_LDADD = libdbus-testutils.la
if ENABLE_TRADITIONAL_ACTIVATION
uninstallable_test_programs += test-bus-launch-helper-oom
uninstallable_test_programs += test-bus-system
@ -355,6 +358,14 @@ installable_manual_tests += \
$(NULL)
endif DBUS_WITH_GLIB
if DBUS_UNIX
if DBUS_ENABLE_EMBEDDED_TESTS
installable_tests += \
test-counter \
$(NULL)
endif DBUS_ENABLE_EMBEDDED_TESTS
endif DBUS_UNIX
installable_test_meta = \
$(dist_installable_test_scripts:=.test) \
$(dist_installed_test_scripts:=.test) \

120
test/internals/counter.c Normal file
View file

@ -0,0 +1,120 @@
/*
* Copyright (c) 2023 Ralf Habacker
* SPDX-License-Identifier: MIT
*/
#include <config.h>
#include "dbus/dbus-resources.h"
#include "dbus/dbus-test.h"
#include "dbus/dbus-test-tap.h"
#include "test/test-utils.h"
#include <pthread.h>
static dbus_bool_t verbose = FALSE;
static DBusCounter *counter = NULL;
static void* unix_fd_thread1 (void *arg _DBUS_GNUC_UNUSED)
{
long i;
for (i=0; i < 10000; i++)
{
long j;
_dbus_counter_adjust_unix_fd (counter, 1);
j = _dbus_counter_get_unix_fd_value (counter);
if (verbose)
_dbus_test_diag ("write %ld\n", j);
}
return NULL;
}
static void* unix_fd_thread2 (void *arg _DBUS_GNUC_UNUSED)
{
long j = 0;
do
{
j = _dbus_counter_get_unix_fd_value (counter);
if (verbose)
_dbus_test_diag ("read %ld\n", j);
} while (j < 10000);
return NULL;
}
static void* size_value_thread1 (void *arg _DBUS_GNUC_UNUSED)
{
long i;
for (i=0; i < 10000; i++)
{
long j;
_dbus_counter_adjust_size (counter, 1);
j = _dbus_counter_get_size_value (counter);
if (verbose)
_dbus_test_diag ("write %ld\n", j);
}
return NULL;
}
static void* size_value_thread2 (void *arg _DBUS_GNUC_UNUSED)
{
long j = 0;
do
{
j = _dbus_counter_get_size_value (counter);
if (verbose)
_dbus_test_diag("read %ld\n", j);
} while (j < 10000);
return NULL;
}
static dbus_bool_t
_dbus_counter_unix_fd_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
{
pthread_t tid[2];
dbus_bool_t ret = TRUE;
counter = _dbus_counter_new ();
pthread_create (&(tid[0]), NULL, &unix_fd_thread1, NULL);
pthread_create (&(tid[1]), NULL, &unix_fd_thread2, NULL);
pthread_join (tid[0], NULL);
pthread_join (tid[1], NULL);
_dbus_counter_unref (counter);
return ret;
}
static dbus_bool_t
_dbus_counter_size_value_test (const char *test_data_dir _DBUS_GNUC_UNUSED)
{
pthread_t tid[2];
dbus_bool_t ret = TRUE;
counter = _dbus_counter_new ();
pthread_create (&(tid[0]), NULL, &size_value_thread1, NULL);
pthread_create (&(tid[1]), NULL, &size_value_thread2, NULL);
pthread_join (tid[0], NULL);
pthread_join (tid[1], NULL);
_dbus_counter_unref (counter);
return ret;
}
static const DBusTestCase test[] =
{
{ "unix_fd", _dbus_counter_unix_fd_test },
{ "size", _dbus_counter_size_value_test },
};
int
main (int argc,
char **argv)
{
return _dbus_test_main (argc, argv, sizeof(test) / sizeof (DBusTestCase), test,
DBUS_TEST_FLAGS_CHECK_MEMORY_LEAKS,
NULL, NULL);
}