mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 20:00:19 +02:00
Add pthread-related tests.
* test-suite/standalone/Makefile.am (test_scm_spawn_thread_CFLAGS, test_scm_spawn_thread_LDADD, test_pthread_create_CFLAGS, test_pthread_create_LDADD, test_pthread_create_secondary_CFLAGS, test_pthread_create_secondary_LDADD): New variables. (check_PROGRAMS)[BUILD_PTHREAD_SUPPORT]: Add `test-scm-spawn-thread', `test-pthread_create', `test-pthread_create-secondary'. (TESTS)[BUILD_PTHREAD_SUPPORT]: Likewise. * test-suite/standalone/test-scm-spawn-thread.c, test-suite/standalone/test-pthread-create.c, test-suite/standalone/test-pthread-create-secondary.c: New files.
This commit is contained in:
parent
912308835d
commit
4a23562339
5 changed files with 228 additions and 0 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
@ -139,3 +139,6 @@ INSTALL
|
||||||
/.sc-start-*
|
/.sc-start-*
|
||||||
/lib/math.h
|
/lib/math.h
|
||||||
/lib/sys/time.h
|
/lib/sys/time.h
|
||||||
|
/test-suite/standalone/test-scm-spawn-thread
|
||||||
|
/test-suite/standalone/test-pthread-create
|
||||||
|
/test-suite/standalone/test-pthread-create-secondary
|
||||||
|
|
|
@ -198,6 +198,21 @@ test_scm_with_guile_LDADD = $(LIBGUILE_LDADD)
|
||||||
check_PROGRAMS += test-scm-with-guile
|
check_PROGRAMS += test-scm-with-guile
|
||||||
TESTS += test-scm-with-guile
|
TESTS += test-scm-with-guile
|
||||||
|
|
||||||
|
test_scm_spawn_thread_CFLAGS = ${test_cflags}
|
||||||
|
test_scm_spawn_thread_LDADD = $(LIBGUILE_LDADD)
|
||||||
|
check_PROGRAMS += test-scm-spawn-thread
|
||||||
|
TESTS += test-scm-spawn-thread
|
||||||
|
|
||||||
|
test_pthread_create_CFLAGS = ${test_cflags}
|
||||||
|
test_pthread_create_LDADD = $(LIBGUILE_LDADD)
|
||||||
|
check_PROGRAMS += test-pthread-create
|
||||||
|
TESTS += test-pthread-create
|
||||||
|
|
||||||
|
test_pthread_create_secondary_CFLAGS = ${test_cflags} $(BDW_GC_CFLAGS)
|
||||||
|
test_pthread_create_secondary_LDADD = $(LIBGUILE_LDADD)
|
||||||
|
check_PROGRAMS += test-pthread-create-secondary
|
||||||
|
TESTS += test-pthread-create-secondary
|
||||||
|
|
||||||
else
|
else
|
||||||
|
|
||||||
EXTRA_DIST += test-with-guile-module.c test-scm-with-guile.c
|
EXTRA_DIST += test-with-guile-module.c test-scm-with-guile.c
|
||||||
|
|
85
test-suite/standalone/test-pthread-create-secondary.c
Normal file
85
test-suite/standalone/test-pthread-create-secondary.c
Normal file
|
@ -0,0 +1,85 @@
|
||||||
|
/* Copyright (C) 2011 Free Software Foundation, Inc.
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public License
|
||||||
|
* as published by the Free Software Foundation; either version 3 of
|
||||||
|
* the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This library is distributed in the hope that it will be useful, but
|
||||||
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
|
* License along with this library; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||||
|
* 02110-1301 USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Test whether threads created with `pthread_create' work, and whether
|
||||||
|
a secondary thread can call `scm_with_guile'. (bug #32436). */
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
# include <config.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <pthread.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <libguile.h>
|
||||||
|
|
||||||
|
#include <gc/gc_version.h>
|
||||||
|
|
||||||
|
|
||||||
|
/* Up to GC 7.2alpha5, calling `GC_INIT' from a secondary thread would
|
||||||
|
lead to a segfault. This was fixed in BDW-GC on 2011-04-16 by Ivan
|
||||||
|
Maidanski. See <http://thread.gmane.org/gmane.lisp.guile.bugs/5340>
|
||||||
|
for details. */
|
||||||
|
|
||||||
|
#if (GC_VERSION_MAJOR > 7) \
|
||||||
|
|| ((GC_VERSION_MAJOR == 7) && (GC_VERSION_MINOR > 2)) \
|
||||||
|
|| ((GC_VERSION_MAJOR == 7) && (GC_VERSION_MINOR == 2) \
|
||||||
|
&& (GC_ALPHA_VERSION > 5))
|
||||||
|
|
||||||
|
static void *
|
||||||
|
do_something (void *arg)
|
||||||
|
{
|
||||||
|
scm_list_copy (scm_make_list (scm_from_int (1234), SCM_BOOL_T));
|
||||||
|
scm_gc ();
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void *
|
||||||
|
thread (void *arg)
|
||||||
|
{
|
||||||
|
scm_with_guile (do_something, NULL);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int
|
||||||
|
main (int argc, char *argv[])
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
|
||||||
|
for (i = 0; i < 77; i++)
|
||||||
|
{
|
||||||
|
pthread_t thr;
|
||||||
|
|
||||||
|
pthread_create (&thr, NULL, thread, NULL);
|
||||||
|
pthread_join (thr, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
return EXIT_SUCCESS;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
#else /* GC < 7.2 */
|
||||||
|
|
||||||
|
int
|
||||||
|
main (int argc, char *argv[])
|
||||||
|
{
|
||||||
|
/* Skip. */
|
||||||
|
return 77;
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif /* GC < 7.2 */
|
63
test-suite/standalone/test-pthread-create.c
Normal file
63
test-suite/standalone/test-pthread-create.c
Normal file
|
@ -0,0 +1,63 @@
|
||||||
|
/* Copyright (C) 2011 Free Software Foundation, Inc.
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public License
|
||||||
|
* as published by the Free Software Foundation; either version 3 of
|
||||||
|
* the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This library is distributed in the hope that it will be useful, but
|
||||||
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
|
* License along with this library; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||||
|
* 02110-1301 USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Test whether threads created with `pthread_create' work (bug #32436)
|
||||||
|
when then main thread is the one that initializes Guile. */
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
# include <config.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <pthread.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
#include <libguile.h>
|
||||||
|
|
||||||
|
static void *
|
||||||
|
do_something (void *arg)
|
||||||
|
{
|
||||||
|
scm_list_copy (scm_make_list (scm_from_int (1234), SCM_BOOL_T));
|
||||||
|
scm_gc ();
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void *
|
||||||
|
thread (void *arg)
|
||||||
|
{
|
||||||
|
scm_with_guile (do_something, NULL);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int
|
||||||
|
main (int argc, char *argv[])
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
pthread_t thr;
|
||||||
|
|
||||||
|
scm_init_guile ();
|
||||||
|
|
||||||
|
do_something (NULL);
|
||||||
|
|
||||||
|
for (i = 0; i < 77; i++)
|
||||||
|
{
|
||||||
|
pthread_create (&thr, NULL, thread, NULL);
|
||||||
|
pthread_join (thr, NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
return EXIT_SUCCESS;
|
||||||
|
}
|
62
test-suite/standalone/test-scm-spawn-thread.c
Normal file
62
test-suite/standalone/test-scm-spawn-thread.c
Normal file
|
@ -0,0 +1,62 @@
|
||||||
|
/* Copyright (C) 2011 Free Software Foundation, Inc.
|
||||||
|
*
|
||||||
|
* This library is free software; you can redistribute it and/or
|
||||||
|
* modify it under the terms of the GNU Lesser General Public License
|
||||||
|
* as published by the Free Software Foundation; either version 3 of
|
||||||
|
* the License, or (at your option) any later version.
|
||||||
|
*
|
||||||
|
* This library is distributed in the hope that it will be useful, but
|
||||||
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
* Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public
|
||||||
|
* License along with this library; if not, write to the Free Software
|
||||||
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
||||||
|
* 02110-1301 USA
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* Test whether a thread created with `scm_spawn_thread' can be joined.
|
||||||
|
See <http://thread.gmane.org/gmane.lisp.guile.devel/11804> for the
|
||||||
|
original report. */
|
||||||
|
|
||||||
|
#ifdef HAVE_CONFIG_H
|
||||||
|
# include <config.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include <libguile.h>
|
||||||
|
|
||||||
|
#include <time.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
static SCM
|
||||||
|
thread_main (void *data)
|
||||||
|
{
|
||||||
|
return SCM_BOOL_T;
|
||||||
|
}
|
||||||
|
|
||||||
|
static SCM
|
||||||
|
thread_handler (void *data, SCM key, SCM args)
|
||||||
|
{
|
||||||
|
return SCM_BOOL_T;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void *
|
||||||
|
inner_main (void *data)
|
||||||
|
{
|
||||||
|
SCM thread, timeout;
|
||||||
|
|
||||||
|
thread = scm_spawn_thread (thread_main, 0, thread_handler, 0);
|
||||||
|
timeout = scm_from_unsigned_integer (time (NULL) + 10);
|
||||||
|
return (void *) scm_join_thread_timed (thread, timeout, SCM_BOOL_F);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int
|
||||||
|
main (int argc, char **argv)
|
||||||
|
{
|
||||||
|
SCM result;
|
||||||
|
|
||||||
|
result = PTR2SCM (scm_with_guile (inner_main, 0));
|
||||||
|
return scm_is_true (result) ? EXIT_SUCCESS : EXIT_FAILURE;
|
||||||
|
}
|
Loading…
Add table
Add a link
Reference in a new issue