Module: xenomai-head Branch: master Commit: 184918fb41167648852fe151c3b622bb40069cbc URL: http://git.xenomai.org/?p=xenomai-head.git;a=commit;h=184918fb41167648852fe151c3b622bb40069cbc
Author: Philippe Gerum <r...@xenomai.org> Date: Sat Oct 23 12:32:18 2010 +0200 testsuite: remove sigtest Real-time signal support will be implemented differently, rebased on the MAYDAY support. Remove the sigtest code which depends on the innards of the original implementation. --- configure.in | 3 - include/nucleus/Makefile.in | 2 +- src/testsuite/Makefile.am | 11 +- src/testsuite/Makefile.in | 12 +- src/testsuite/sigtest/Makefile.am | 20 -- src/testsuite/sigtest/Makefile.in | 583 ------------------------------------- src/testsuite/sigtest/sigtest.c | 293 ------------------- 7 files changed, 3 insertions(+), 921 deletions(-) diff --git a/configure.in b/configure.in index 2dcf513..b8a4604 100644 --- a/configure.in +++ b/configure.in @@ -761,9 +761,6 @@ AC_CONFIG_FILES([ \ src/testsuite/clocktest/Makefile \ src/testsuite/klatency/Makefile \ src/testsuite/unit/Makefile \ - src/testsuite/sigtest/Makefile \ - src/testsuite/xeno-test/Makefile \ - src/testsuite/xeno-test/xeno-test \ src/utils/Makefile \ src/utils/can/Makefile \ src/utils/analogy/Makefile \ diff --git a/include/nucleus/Makefile.in b/include/nucleus/Makefile.in index 24fbb0b..9a04d03 100644 --- a/include/nucleus/Makefile.in +++ b/include/nucleus/Makefile.in @@ -271,7 +271,7 @@ includesub_HEADERS = \ trace.h \ types.h \ vdso.h \ - seqlock.h \ + seqlock_user.h \ version.h \ xenomai.h diff --git a/src/testsuite/Makefile.am b/src/testsuite/Makefile.am index 761a58d..0f533c2 100644 --- a/src/testsuite/Makefile.am +++ b/src/testsuite/Makefile.am @@ -1,10 +1 @@ -SUBDIRS = \ - latency \ - cyclic \ - switchtest \ - irqbench \ - clocktest \ - klatency \ - unit \ - sigtest \ - xeno-test +SUBDIRS = latency cyclic switchtest irqbench clocktest klatency unit diff --git a/src/testsuite/Makefile.in b/src/testsuite/Makefile.in index c91da44..ff7f7b8 100644 --- a/src/testsuite/Makefile.in +++ b/src/testsuite/Makefile.in @@ -248,17 +248,7 @@ target_vendor = @target_vendor@ top_build_prefix = @top_build_prefix@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ -SUBDIRS = \ - latency \ - cyclic \ - switchtest \ - irqbench \ - clocktest \ - klatency \ - unit \ - sigtest \ - xeno-test - +SUBDIRS = latency cyclic switchtest irqbench clocktest klatency unit all: all-recursive .SUFFIXES: diff --git a/src/testsuite/sigtest/Makefile.am b/src/testsuite/sigtest/Makefile.am deleted file mode 100644 index 8014007..0000000 --- a/src/testsuite/sigtest/Makefile.am +++ /dev/null @@ -1,20 +0,0 @@ -rundir = $(exec_prefix)/share/xenomai/testsuite/sigtest -testdir = @XENO_TEST_DIR@ - -CCLD = $(top_srcdir)/scripts/wrap-link.sh $(CC) - -test_PROGRAMS = sigtest - -sigtest_SOURCES = sigtest.c - -sigtest_CPPFLAGS = -I$(top_srcdir)/include/posix $(XENO_USER_CFLAGS) -g -I$(top_srcdir)/include - -sigtest_LDFLAGS = $(XENO_POSIX_WRAPPERS) $(XENO_USER_LDFLAGS) -if CONFIG_XENO_SHARED -sigtest_LDFLAGS += -rdynamic -endif - -sigtest_LDADD = \ - ../../skins/posix/libpthread_rt.la \ - ../../skins/common/libxenomai.la \ - -lpthread -lrt diff --git a/src/testsuite/sigtest/Makefile.in b/src/testsuite/sigtest/Makefile.in deleted file mode 100644 index 11ab6ea..0000000 --- a/src/testsuite/sigtest/Makefile.in +++ /dev/null @@ -1,583 +0,0 @@ -# Makefile.in generated by automake 1.11.1 from Makefile.am. -# @configure_input@ - -# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, -# Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - -@SET_MAKE@ - -VPATH = @srcdir@ -pkgdatadir = $(datadir)/@PACKAGE@ -pkgincludedir = $(includedir)/@PACKAGE@ -pkglibdir = $(libdir)/@PACKAGE@ -pkglibexecdir = $(libexecdir)/@PACKAGE@ -am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd -install_sh_DATA = $(install_sh) -c -m 644 -install_sh_PROGRAM = $(install_sh) -c -install_sh_SCRIPT = $(install_sh) -c -INSTALL_HEADER = $(INSTALL_DATA) -transform = $(program_transform_name) -NORMAL_INSTALL = : -PRE_INSTALL = : -POST_INSTALL = : -NORMAL_UNINSTALL = : -PRE_UNINSTALL = : -POST_UNINSTALL = : -build_triplet = @build@ -host_triplet = @host@ -target_triplet = @target@ -test_PROGRAMS = sigtest$(EXEEXT) -@CONFIG_XENO_SHARED_TRUE@am__append_1 = -rdynamic -subdir = src/testsuite/sigtest -DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 -am__aclocal_m4_deps = $(top_srcdir)/config/ac_prog_cc_for_build.m4 \ - $(top_srcdir)/config/docbook.m4 \ - $(top_srcdir)/config/libtool.m4 \ - $(top_srcdir)/config/ltoptions.m4 \ - $(top_srcdir)/config/ltsugar.m4 \ - $(top_srcdir)/config/ltversion.m4 \ - $(top_srcdir)/config/lt~obsolete.m4 \ - $(top_srcdir)/config/version $(top_srcdir)/configure.in -am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ - $(ACLOCAL_M4) -mkinstalldirs = $(install_sh) -d -CONFIG_HEADER = $(top_builddir)/src/include/xeno_config.h -CONFIG_CLEAN_FILES = -CONFIG_CLEAN_VPATH_FILES = -am__installdirs = "$(DESTDIR)$(testdir)" -PROGRAMS = $(test_PROGRAMS) -am_sigtest_OBJECTS = sigtest-sigtest.$(OBJEXT) -sigtest_OBJECTS = $(am_sigtest_OBJECTS) -sigtest_DEPENDENCIES = ../../skins/posix/libpthread_rt.la \ - ../../skins/common/libxenomai.la -sigtest_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(sigtest_LDFLAGS) \ - $(LDFLAGS) -o $@ -DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include -depcomp = $(SHELL) $(top_srcdir)/config/depcomp -am__depfiles_maybe = depfiles -am__mv = mv -f -COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \ - $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ - --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \ - $(LDFLAGS) -o $@ -SOURCES = $(sigtest_SOURCES) -DIST_SOURCES = $(sigtest_SOURCES) -ETAGS = etags -CTAGS = ctags -DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) -ACLOCAL = @ACLOCAL@ -AMTAR = @AMTAR@ -AR = @AR@ -AUTOCONF = @AUTOCONF@ -AUTOHEADER = @AUTOHEADER@ -AUTOMAKE = @AUTOMAKE@ -AWK = @AWK@ -BUILD_EXEEXT = @BUILD_EXEEXT@ -BUILD_OBJEXT = @BUILD_OBJEXT@ -CC = @CC@ -CCAS = @CCAS@ -CCASDEPMODE = @CCASDEPMODE@ -CCASFLAGS = @CCASFLAGS@ -CCDEPMODE = @CCDEPMODE@ -CC_FOR_BUILD = @CC_FOR_BUILD@ -CFLAGS = @CFLAGS@ -CFLAGS_FOR_BUILD = @CFLAGS_FOR_BUILD@ -CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@ -CPP = @CPP@ -CPPFLAGS = @CPPFLAGS@ -CPPFLAGS_FOR_BUILD = @CPPFLAGS_FOR_BUILD@ -CPP_FOR_BUILD = @CPP_FOR_BUILD@ -CYGPATH_W = @CYGPATH_W@ -DBX_DOC_ROOT = @DBX_DOC_ROOT@ -DBX_FOP = @DBX_FOP@ -DBX_GEN_DOC_ROOT = @DBX_GEN_DOC_ROOT@ -DBX_LINT = @DBX_LINT@ -DBX_MAYBE_NONET = @DBX_MAYBE_NONET@ -DBX_ROOT = @DBX_ROOT@ -DBX_XSLTPROC = @DBX_XSLTPROC@ -DBX_XSL_ROOT = @DBX_XSL_ROOT@ -DEFS = @DEFS@ -DEPDIR = @DEPDIR@ -DOXYGEN = @DOXYGEN@ -DOXYGEN_HAVE_DOT = @DOXYGEN_HAVE_DOT@ -DOXYGEN_SHOW_INCLUDE_FILES = @DOXYGEN_SHOW_INCLUDE_FILES@ -DSYMUTIL = @DSYMUTIL@ -DUMPBIN = @DUMPBIN@ -ECHO_C = @ECHO_C@ -ECHO_N = @ECHO_N@ -ECHO_T = @ECHO_T@ -EGREP = @EGREP@ -EXEEXT = @EXEEXT@ -FGREP = @FGREP@ -GREP = @GREP@ -INSTALL = @INSTALL@ -INSTALL_DATA = @INSTALL_DATA@ -INSTALL_PROGRAM = @INSTALL_PROGRAM@ -INSTALL_SCRIPT = @INSTALL_SCRIPT@ -INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@ -LATEX_BATCHMODE = @LATEX_BATCHMODE@ -LATEX_MODE = @LATEX_MODE@ -LD = @LD@ -LDFLAGS = @LDFLAGS@ -LD_FILE_OPTION = @LD_FILE_OPTION@ -LEX = @LEX@ -LEXLIB = @LEXLIB@ -LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@ -LIBOBJS = @LIBOBJS@ -LIBS = @LIBS@ -LIBTOOL = @LIBTOOL@ -LIPO = @LIPO@ -LN_S = @LN_S@ -LTLIBOBJS = @LTLIBOBJS@ -MAINT = @MAINT@ -MAKEINFO = @MAKEINFO@ -MKDIR_P = @MKDIR_P@ -NM = @NM@ -NMEDIT = @NMEDIT@ -OBJEXT = @OBJEXT@ -OTOOL = @OTOOL@ -OTOOL64 = @OTOOL64@ -PACKAGE = @PACKAGE@ -PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@ -PACKAGE_NAME = @PACKAGE_NAME@ -PACKAGE_STRING = @PACKAGE_STRING@ -PACKAGE_TARNAME = @PACKAGE_TARNAME@ -PACKAGE_URL = @PACKAGE_URL@ -PACKAGE_VERSION = @PACKAGE_VERSION@ -PATH_SEPARATOR = @PATH_SEPARATOR@ -RANLIB = @RANLIB@ -SED = @SED@ -SET_MAKE = @SET_MAKE@ -SHELL = @SHELL@ -STRIP = @STRIP@ -VERSION = @VERSION@ -XENO_BUILD_STRING = @XENO_BUILD_STRING@ -XENO_DLOPEN_CONSTRAINT = @XENO_DLOPEN_CONSTRAINT@ -XENO_HOST_STRING = @XENO_HOST_STRING@ -XENO_MAYBE_DOCDIR = @XENO_MAYBE_DOCDIR@ -XENO_POSIX_WRAPPERS = @XENO_POSIX_WRAPPERS@ -XENO_TARGET_ARCH = @XENO_TARGET_ARCH@ -XENO_TEST_DIR = @XENO_TEST_DIR@ -XENO_USER_APP_CFLAGS = @XENO_USER_APP_CFLAGS@ -XENO_USER_APP_LDFLAGS = @XENO_USER_APP_LDFLAGS@ -XENO_USER_CFLAGS = @XENO_USER_CFLAGS@ -XENO_USER_LDFLAGS = @XENO_USER_LDFLAGS@ -abs_builddir = @abs_builddir@ -abs_srcdir = @abs_srcdir@ -abs_top_builddir = @abs_top_builddir@ -abs_top_srcdir = @abs_top_srcdir@ -ac_ct_CC = @ac_ct_CC@ -ac_ct_CC_FOR_BUILD = @ac_ct_CC_FOR_BUILD@ -ac_ct_DUMPBIN = @ac_ct_DUMPBIN@ -am__include = @am__include@ -am__leading_dot = @am__leading_dot@ -am__quote = @am__quote@ -am__tar = @am__tar@ -am__untar = @am__untar@ -bindir = @bindir@ -build = @build@ -build_alias = @build_alias@ -build_cpu = @build_cpu@ -build_os = @build_os@ -build_vendor = @build_vendor@ -builddir = @builddir@ -datadir = @datadir@ -datarootdir = @datarootdir@ -docdir = @docdir@ -dvidir = @dvidir@ -exec_prefix = @exec_prefix@ -host = @host@ -host_alias = @host_alias@ -host_cpu = @host_cpu@ -host_os = @host_os@ -host_vendor = @host_vendor@ -htmldir = @htmldir@ -includedir = @includedir@ -infodir = @infodir@ -install_sh = @install_sh@ -libdir = @libdir@ -libexecdir = @libexecdir@ -localedir = @localedir@ -localstatedir = @localstatedir@ -lt_ECHO = @lt_ECHO@ -mandir = @mandir@ -mkdir_p = @mkdir_p@ -oldincludedir = @oldincludedir@ -pdfdir = @pdfdir@ -prefix = @prefix@ -program_transform_name = @program_transform_name@ -psdir = @psdir@ -sbindir = @sbindir@ -sharedstatedir = @sharedstatedir@ -srcdir = @srcdir@ -sysconfdir = @sysconfdir@ -target = @target@ -target_alias = @target_alias@ -target_cpu = @target_cpu@ -target_os = @target_os@ -target_vendor = @target_vendor@ -top_build_prefix = @top_build_prefix@ -top_builddir = @top_builddir@ -top_srcdir = @top_srcdir@ -rundir = $(exec_prefix)/share/xenomai/testsuite/sigtest -testdir = @XENO_TEST_DIR@ -CCLD = $(top_srcdir)/scripts/wrap-link.sh $(CC) -sigtest_SOURCES = sigtest.c -sigtest_CPPFLAGS = -I$(top_srcdir)/include/posix $(XENO_USER_CFLAGS) -g -I$(top_srcdir)/include -sigtest_LDFLAGS = $(XENO_POSIX_WRAPPERS) $(XENO_USER_LDFLAGS) \ - $(am__append_1) -sigtest_LDADD = \ - ../../skins/posix/libpthread_rt.la \ - ../../skins/common/libxenomai.la \ - -lpthread -lrt - -all: all-am - -.SUFFIXES: -.SUFFIXES: .c .lo .o .obj -$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps) - @for dep in $?; do \ - case '$(am__configure_deps)' in \ - *$$dep*) \ - ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \ - && { if test -f $@; then exit 0; else break; fi; }; \ - exit 1;; \ - esac; \ - done; \ - echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign src/testsuite/sigtest/Makefile'; \ - $(am__cd) $(top_srcdir) && \ - $(AUTOMAKE) --foreign src/testsuite/sigtest/Makefile -.PRECIOUS: Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status - @case '$?' in \ - *config.status*) \ - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \ - *) \ - echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \ - cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \ - esac; - -$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh - -$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) - cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh -$(am__aclocal_m4_deps): -install-testPROGRAMS: $(test_PROGRAMS) - @$(NORMAL_INSTALL) - test -z "$(testdir)" || $(MKDIR_P) "$(DESTDIR)$(testdir)" - @list='$(test_PROGRAMS)'; test -n "$(testdir)" || list=; \ - for p in $$list; do echo "$$p $$p"; done | \ - sed 's/$(EXEEXT)$$//' | \ - while read p p1; do if test -f $$p || test -f $$p1; \ - then echo "$$p"; echo "$$p"; else :; fi; \ - done | \ - sed -e 'p;s,.*/,,;n;h' -e 's|.*|.|' \ - -e 'p;x;s,.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/' | \ - sed 'N;N;N;s,\n, ,g' | \ - $(AWK) 'BEGIN { files["."] = ""; dirs["."] = 1 } \ - { d=$$3; if (dirs[d] != 1) { print "d", d; dirs[d] = 1 } \ - if ($$2 == $$4) files[d] = files[d] " " $$1; \ - else { print "f", $$3 "/" $$4, $$1; } } \ - END { for (d in files) print "f", d, files[d] }' | \ - while read type dir files; do \ - if test "$$dir" = .; then dir=; else dir=/$$dir; fi; \ - test -z "$$files" || { \ - echo " $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files '$(DESTDIR)$(testdir)$$dir'"; \ - $(INSTALL_PROGRAM_ENV) $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL_PROGRAM) $$files "$(DESTDIR)$(testdir)$$dir" || exit $$?; \ - } \ - ; done - -uninstall-testPROGRAMS: - @$(NORMAL_UNINSTALL) - @list='$(test_PROGRAMS)'; test -n "$(testdir)" || list=; \ - files=`for p in $$list; do echo "$$p"; done | \ - sed -e 'h;s,^.*/,,;s/$(EXEEXT)$$//;$(transform)' \ - -e 's/$$/$(EXEEXT)/' `; \ - test -n "$$list" || exit 0; \ - echo " ( cd '$(DESTDIR)$(testdir)' && rm -f" $$files ")"; \ - cd "$(DESTDIR)$(testdir)" && rm -f $$files - -clean-testPROGRAMS: - @list='$(test_PROGRAMS)'; test -n "$$list" || exit 0; \ - echo " rm -f" $$list; \ - rm -f $$list || exit $$?; \ - test -n "$(EXEEXT)" || exit 0; \ - list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \ - echo " rm -f" $$list; \ - rm -f $$list -sigtest$(EXEEXT): $(sigtest_OBJECTS) $(sigtest_DEPENDENCIES) - @rm -f sigtest$(EXEEXT) - $(sigtest_LINK) $(sigtest_OBJECTS) $(sigtest_LDADD) $(LIBS) - -mostlyclean-compile: - -rm -f *.$(OBJEXT) - -distclean-compile: - -rm -f *.tab.c - -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sigtest-sigtest.Po@am__quote@ - -.c.o: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c $< - -.c.obj: -@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(COMPILE) -c `$(CYGPATH_W) '$<'` - -.c.lo: -@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $< -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $< - -sigtest-sigtest.o: sigtest.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sigtest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sigtest-sigtest.o -MD -MP -MF $(DEPDIR)/sigtest-sigtest.Tpo -c -o sigtest-sigtest.o `test -f 'sigtest.c' || echo '$(srcdir)/'`sigtest.c -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/sigtest-sigtest.Tpo $(DEPDIR)/sigtest-sigtest.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sigtest.c' object='sigtest-sigtest.o' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sigtest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sigtest-sigtest.o `test -f 'sigtest.c' || echo '$(srcdir)/'`sigtest.c - -sigtest-sigtest.obj: sigtest.c -@am__fastdepCC_TRUE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sigtest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT sigtest-sigtest.obj -MD -MP -MF $(DEPDIR)/sigtest-sigtest.Tpo -c -o sigtest-sigtest.obj `if test -f 'sigtest.c'; then $(CYGPATH_W) 'sigtest.c'; else $(CYGPATH_W) '$(srcdir)/sigtest.c'; fi` -@am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/sigtest-sigtest.Tpo $(DEPDIR)/sigtest-sigtest.Po -@AMDEP_TRUE@@am__fastdepCC_FALSE@ source='sigtest.c' object='sigtest-sigtest.obj' libtool=no @AMDEPBACKSLASH@ -@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@ -@am__fastdepCC_FALSE@ $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(sigtest_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o sigtest-sigtest.obj `if test -f 'sigtest.c'; then $(CYGPATH_W) 'sigtest.c'; else $(CYGPATH_W) '$(srcdir)/sigtest.c'; fi` - -mostlyclean-libtool: - -rm -f *.lo - -clean-libtool: - -rm -rf .libs _libs - -ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - mkid -fID $$unique -tags: TAGS - -TAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - set x; \ - here=`pwd`; \ - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - shift; \ - if test -z "$(ETAGS_ARGS)$$*$$unique"; then :; else \ - test -n "$$unique" || unique=$$empty_fix; \ - if test $$# -gt 0; then \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - "$$@" $$unique; \ - else \ - $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \ - $$unique; \ - fi; \ - fi -ctags: CTAGS -CTAGS: $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \ - $(TAGS_FILES) $(LISP) - list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \ - unique=`for i in $$list; do \ - if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \ - done | \ - $(AWK) '{ files[$$0] = 1; nonempty = 1; } \ - END { if (nonempty) { for (i in files) print i; }; }'`; \ - test -z "$(CTAGS_ARGS)$$unique" \ - || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \ - $$unique - -GTAGS: - here=`$(am__cd) $(top_builddir) && pwd` \ - && $(am__cd) $(top_srcdir) \ - && gtags -i $(GTAGS_ARGS) "$$here" - -distclean-tags: - -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags - -distdir: $(DISTFILES) - @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \ - list='$(DISTFILES)'; \ - dist_files=`for file in $$list; do echo $$file; done | \ - sed -e "s|^$$srcdirstrip/||;t" \ - -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \ - case $$dist_files in \ - */*) $(MKDIR_P) `echo "$$dist_files" | \ - sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \ - sort -u` ;; \ - esac; \ - for file in $$dist_files; do \ - if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \ - if test -d $$d/$$file; then \ - dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \ - if test -d "$(distdir)/$$file"; then \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \ - cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \ - find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \ - fi; \ - cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \ - else \ - test -f "$(distdir)/$$file" \ - || cp -p $$d/$$file "$(distdir)/$$file" \ - || exit 1; \ - fi; \ - done -check-am: all-am -check: check-am -all-am: Makefile $(PROGRAMS) -installdirs: - for dir in "$(DESTDIR)$(testdir)"; do \ - test -z "$$dir" || $(MKDIR_P) "$$dir"; \ - done -install: install-am -install-exec: install-exec-am -install-data: install-data-am -uninstall: uninstall-am - -install-am: all-am - @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am - -installcheck: installcheck-am -install-strip: - $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \ - install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \ - `test -z '$(STRIP)' || \ - echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install -mostlyclean-generic: - -clean-generic: - -distclean-generic: - -test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES) - -test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES) - -maintainer-clean-generic: - @echo "This command is intended for maintainers to use" - @echo "it deletes files that may require special tools to rebuild." -clean: clean-am - -clean-am: clean-generic clean-libtool clean-testPROGRAMS \ - mostlyclean-am - -distclean: distclean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -distclean-am: clean-am distclean-compile distclean-generic \ - distclean-tags - -dvi: dvi-am - -dvi-am: - -html: html-am - -html-am: - -info: info-am - -info-am: - -install-data-am: install-testPROGRAMS - -install-dvi: install-dvi-am - -install-dvi-am: - -install-exec-am: - -install-html: install-html-am - -install-html-am: - -install-info: install-info-am - -install-info-am: - -install-man: - -install-pdf: install-pdf-am - -install-pdf-am: - -install-ps: install-ps-am - -install-ps-am: - -installcheck-am: - -maintainer-clean: maintainer-clean-am - -rm -rf ./$(DEPDIR) - -rm -f Makefile -maintainer-clean-am: distclean-am maintainer-clean-generic - -mostlyclean: mostlyclean-am - -mostlyclean-am: mostlyclean-compile mostlyclean-generic \ - mostlyclean-libtool - -pdf: pdf-am - -pdf-am: - -ps: ps-am - -ps-am: - -uninstall-am: uninstall-testPROGRAMS - -.MAKE: install-am install-strip - -.PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \ - clean-libtool clean-testPROGRAMS ctags distclean \ - distclean-compile distclean-generic distclean-libtool \ - distclean-tags distdir dvi dvi-am html html-am info info-am \ - install install-am install-data install-data-am install-dvi \ - install-dvi-am install-exec install-exec-am install-html \ - install-html-am install-info install-info-am install-man \ - install-pdf install-pdf-am install-ps install-ps-am \ - install-strip install-testPROGRAMS installcheck \ - installcheck-am installdirs maintainer-clean \ - maintainer-clean-generic mostlyclean mostlyclean-compile \ - mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \ - tags uninstall uninstall-am uninstall-testPROGRAMS - - -# Tell versions [3.59,3.63) of GNU make to not export all variables. -# Otherwise a system limit (for SysV at least) may be exceeded. -.NOEXPORT: diff --git a/src/testsuite/sigtest/sigtest.c b/src/testsuite/sigtest/sigtest.c deleted file mode 100644 index 6c43c6b..0000000 --- a/src/testsuite/sigtest/sigtest.c +++ /dev/null @@ -1,293 +0,0 @@ -#include <stdlib.h> -#include <stdio.h> -#include <string.h> - -#include <unistd.h> -#include <pthread.h> -#include <sys/mman.h> -#ifndef __UCLIBC__ -#include <execinfo.h> -#endif /* !__UCLIBC__ */ - -#include <asm-generic/bits/sigshadow.h> -#include <testing/sigtest_syscall.h> -#include <asm/xenomai/bits/bind.h> - -#define ARRAY_SIZE(array) (sizeof(array)/sizeof(array[0])) - -static int shifted_muxid; - -int sigtest_queue(int *retvals, size_t nr) -{ - return XENOMAI_SKINCALL2(shifted_muxid, - __NR_sigtest_queue, retvals, nr); -} - -int sigtest_wait_pri(void) -{ - return XENOMAI_SKINCALL0(shifted_muxid, __NR_sigtest_wait_pri); -} - -int sigtest_wait_sec(void) -{ - return XENOMAI_SKINCALL0(shifted_muxid, __NR_sigtest_wait_sec); -} - -static xnsighandler *mysh; - -void sigtest_handler(union xnsiginfo *gen_si) -{ - mysh(gen_si); -} - -__attribute__((constructor)) void __init_sigtest_interface(void) -{ - int muxid; - - muxid = xeno_bind_skin(SIGTEST_SKIN_MAGIC, "SIGTEST", "xeno_sigtest", sigtest_handler); - - shifted_muxid = __xn_mux_shifted_id(muxid); -} - -static volatile unsigned seen; -static int cascade_res; - -void mark_seen(union xnsiginfo *gen_si) -{ - struct sigtest_siginfo *si = (struct sigtest_siginfo *)gen_si; - seen |= (1 << si->sig_nr); -} - -void mark_seen_2(int sig) -{ - seen |= 2; -} - -void mark_seen_2_bt(int sig) -{ -#ifndef __UCLIBC__ - void *buf[200]; - int nelems = backtrace(buf, sizeof(buf)/sizeof(buf[0])); - fputs("\n>>>>>>>>>>>>>>>>>>>>> Please " - "check that the following backtrace looks correct:\n", stderr); - backtrace_symbols_fd(buf, nelems, 2); - fputs("<<<<<<<<<<<<<<<<<<<<< End of backtrace\n\n", stderr); -#endif /* !__UCLIBC__ */ - seen |= 2; -} - -void cascade_pri(union xnsiginfo *gen_si __attribute__((unused))) -{ - cascade_res = sigtest_wait_pri() == -EINTR ? -EINTR : cascade_res; -} - -void cascade_sec(union xnsiginfo *gen_si __attribute__((unused))) -{ - cascade_res = sigtest_wait_sec() == -EINTR ? -EINTR : cascade_res; -} - -static unsigned failed, success; - -#define test_assert(expr) \ - ({ \ - if (expr) { \ - ++success; \ - fprintf(stderr, #expr ": success.\n"); \ - } else { \ - ++failed; \ - fprintf(stderr, #expr " failed\n"); \ - } \ - }) - -#define check(expr, expected) \ - ({ \ - int rc = (expr); \ - if (rc == (expected)) { \ - ++success; \ - fprintf(stderr, #expr ": success.\n"); \ - } else { \ - ++failed; \ - fprintf(stderr, #expr " failed: %d\n", -rc); \ - } \ - }) - -struct cond { - pthread_mutex_t mx; - pthread_cond_t cnd; - int val; -}; - -void *dual_signals(void *cookie) -{ - struct cond *c = (struct cond *)cookie; - int one_restart[] = { -ERESTART, }; - - pthread_set_name_np(pthread_self(), "dual_signals"); - - check(sigtest_queue(one_restart, ARRAY_SIZE(one_restart)), 0); - pthread_mutex_lock(&c->mx); - c->val = 1; - pthread_cond_signal(&c->cnd); - while (c->val != 2) - check(pthread_cond_wait(&c->cnd, &c->mx), 0); - c->val = 3; - pthread_cond_signal(&c->cnd); - pthread_mutex_unlock(&c->mx); - pthread_exit(NULL); -} - -void *dual_signals2(void *cookie) -{ - int one_restart[] = { -ERESTART, }; - - pthread_set_name_np(pthread_self(), "dual_signals"); - check(sigtest_queue(one_restart, ARRAY_SIZE(one_restart)), 0); - check(sigtest_wait_sec(), 0); - test_assert(seen == 3); - pthread_exit(NULL); -} - -int main(void) -{ - struct sched_param sparam = { .sched_priority = 1 }; - - mlockall(MCL_CURRENT | MCL_FUTURE); - - pthread_setschedparam(pthread_self(), SCHED_FIFO, &sparam); - - int one_restart[] = { -ERESTART, }; - mysh = mark_seen; - seen = 0; - check(sigtest_queue(one_restart, ARRAY_SIZE(one_restart)), 0); - check(sigtest_wait_pri(), 0); - test_assert(seen == 1); - - seen = 0; - check(sigtest_queue(one_restart, ARRAY_SIZE(one_restart)), 0); - check(sigtest_wait_sec(), 0); - test_assert(seen == 1); - - int one_intr[] = { -EINTR, }; - seen = 0; - check(sigtest_queue(one_intr, ARRAY_SIZE(one_intr)), 0); - check(sigtest_wait_pri(), -EINTR); - test_assert(seen == 1); - - seen = 0; - check(sigtest_queue(one_intr, ARRAY_SIZE(one_intr)), 0); - check(sigtest_wait_sec(), 0); /* Signal does not interrupt - * secondary-mode syscall */ - test_assert(seen == 1); - - int sixteen_restart[] = { [0 ... 15] = -ERESTART, }; - seen = 0; - check(sigtest_queue(sixteen_restart, ARRAY_SIZE(sixteen_restart)), 0); - check(sigtest_wait_pri(), 0); - test_assert(seen == ((1 << 16) - 1)); - - seen = 0; - check(sigtest_queue(sixteen_restart, ARRAY_SIZE(sixteen_restart)), 0); - check(sigtest_wait_sec(), 0); - test_assert(seen == ((1 << 16) - 1)); - - int middle_intr[] = { [0 ... 7] = -ERESTART, [8] = -EINTR, [9 ... 15] = -ERESTART, - }; - seen = 0; - check(sigtest_queue(middle_intr, ARRAY_SIZE(middle_intr)), 0); - check(sigtest_wait_pri(), -EINTR); - test_assert(seen == ((1 << 16) - 1)); - - seen = 0; - check(sigtest_queue(middle_intr, ARRAY_SIZE(middle_intr)), 0); - check(sigtest_wait_sec(), 0); /* Signal does not interrupt - * secondary-mode syscall */ - test_assert(seen == ((1 << 16) - 1)); - - int seventeen_restart[] = { [0 ... 16] = -ERESTART }; - mysh = cascade_pri; - cascade_res = ~0; - check(sigtest_queue(seventeen_restart, ARRAY_SIZE(seventeen_restart)), 0); - check(sigtest_wait_pri(), 0); - test_assert(cascade_res == ~0); - - cascade_res = ~0; - check(sigtest_queue(seventeen_restart, ARRAY_SIZE(seventeen_restart)), 0); - check(sigtest_wait_sec(), 0); - test_assert(cascade_res == ~0); - - int seventeen_intr[] = { [0 ... 15] = -ERESTART, [16] = -EINTR }; - cascade_res = ~0; - check(sigtest_queue(seventeen_intr, ARRAY_SIZE(seventeen_intr)), 0); - check(sigtest_wait_pri(), 0); - test_assert(cascade_res == -EINTR); - - cascade_res = ~0; - check(sigtest_queue(seventeen_intr, ARRAY_SIZE(seventeen_intr)), 0); - check(sigtest_wait_sec(), 0); - test_assert(cascade_res == -EINTR); - - /* Cascade secondary mode call. */ - mysh = cascade_sec; - cascade_res = ~0; - check(sigtest_queue(seventeen_restart, ARRAY_SIZE(seventeen_restart)), 0); - check(sigtest_wait_pri(), 0); - test_assert(cascade_res == ~0); - - cascade_res = ~0; - check(sigtest_queue(seventeen_restart, ARRAY_SIZE(seventeen_restart)), 0); - check(sigtest_wait_sec(), 0); - test_assert(cascade_res == ~0); - - cascade_res = ~0; - check(sigtest_queue(seventeen_intr, ARRAY_SIZE(seventeen_intr)), 0); - check(sigtest_wait_pri(), 0); - test_assert(cascade_res == ~0); - - cascade_res = ~0; - check(sigtest_queue(seventeen_intr, ARRAY_SIZE(seventeen_intr)), 0); - check(sigtest_wait_sec(), 0); - test_assert(cascade_res == ~0); - - /* Try and mix linux signals and xeno signals (this test does - not work as expected, but turns out to be a good test for - pthread_cond_wait and signals, so, keep it). */ - struct timespec ts; - pthread_t tid; - struct cond c; - mysh = mark_seen; - seen = 0; - pthread_mutex_init(&c.mx, NULL); - pthread_cond_init(&c.cnd, NULL); - c.val = 0; - signal(SIGUSR1, mark_seen_2); - pthread_create(&tid, NULL, dual_signals, &c); - check(pthread_mutex_lock(&c.mx), 0); - while (c.val != 1) - check(pthread_cond_wait(&c.cnd, &c.mx), 0); - ts.tv_sec = 0; - ts.tv_nsec = 20000000; - nanosleep(&ts, NULL); - c.val = 2; - /* thread received the xeno signals, now send the linux signal */ - pthread_kill(tid, SIGUSR1); - pthread_cond_signal(&c.cnd); /* Now, wake-up. */ - while (c.val != 3) - check(pthread_cond_wait(&c.cnd, &c.mx), 0); - pthread_mutex_unlock(&c.mx); - test_assert(seen == 3); - pthread_join(tid, NULL); - - /* Try and mix linux signals and xeno signals. Take 2. */ - signal(SIGUSR1, mark_seen_2_bt); - seen = 0; - pthread_create(&tid, NULL, dual_signals2, NULL); - ts.tv_sec = 0; - ts.tv_nsec = 15000000; - nanosleep(&ts, NULL); - pthread_kill(tid, SIGUSR1); - pthread_join(tid, NULL); - - fprintf(stderr, "Failed %u/%u\n", failed, success + failed); - sleep(1); - exit(failed ? EXIT_FAILURE : EXIT_SUCCESS); -} _______________________________________________ Xenomai-git mailing list Xenomai-git@gna.org https://mail.gna.org/listinfo/xenomai-git