mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-13 00:30:07 +00:00
11bf311edc
2007-01-11 Jakub Jelinek <jakub@redhat.com> * sysdeps/i386/soft-fp/sfp-machine.h: Remove. * sysdeps/x86_64/soft-fp/sfp-machine.h: Likewise. 2007-01-10 Ulrich Drepper <drepper@redhat.com> * io/fts.c: Make sure fts_cur is always valid after return from fts_read. Patch by Miloslav Trmac <mitr@redhat.com>. 2006-10-27 Richard Sandiford <richard@codesourcery.com> * elf/elf.h (R_MIPS_GLOB_DAT): Define. (R_MIPS_NUM): Bump by 1. 2007-01-03 Jakub Jelinek <jakub@redhat.com> * posix/execvp.c: Include alloca.h. (allocate_scripts_argv): Renamed to... (scripts_argv): ... this. Don't allocate buffer here nor count arguments. (execvp): Use alloca if possible. * posix/Makefile: Add rules to build and run tst-vfork3 test. * posix/tst-vfork3.c: New test. * stdlib/Makefile (tst-strtod3-ENV): Define. 2007-01-02 Ulrich Drepper <drepper@redhat.com> * posix/getconf.c: Update copyright year. * nss/getent.c: Likewise. * iconv/iconvconfig.c: Likewise. * iconv/iconv_prog.c: Likewise. * elf/ldconfig.c: Likewise. * catgets/gencat.c: Likewise. * csu/version.c: Likewise. * elf/ldd.bash.in: Likewise. * elf/sprof.c (print_version): Likewise. * locale/programs/locale.c: Likewise. * locale/programs/localedef.c: Likewise. * nscd/nscd.c (print_version): Likewise. * debug/xtrace.sh: Likewise. * malloc/memusage.sh: Likewise. * malloc/mtrace.pl: Likewise. * debug/catchsegv.sh: Likewise. 2006-12-24 Ulrich Drepper <drepper@redhat.com> * malloc/malloc.c (sYSMALLOc): Remove some unnecessary alignment attempts. 2006-12-23 Ulrich Drepper <drepper@redhat.com> * posix/wordexp.c: Remove some unnecessary tests. 2006-12-20 SUGIOKA Toshinobu <sugioka@itonet.co.jp> * sysdeps/unix/sysv/linux/sh/bits/shm.h: New file. * nss/getXXbyYY_r.c: Include atomic.h. (INTERNAL (REENTRANT_NAME)): Write startp after start_fct, add atomic_write_barrier () in between. 2006-11-28 Jakub Jelinek <jakub@redhat.com> * elf/dl-support.c: Include dl-procinfo.h. * sysdeps/powerpc/dl-procinfo.h (PPC_PLATFORM_POWER4, PPC_PLATFORM_PPC970, PPC_PLATFORM_POWER5, PPC_PLATFORM_POWER5_PLUS, PPC_PLATFORM_POWER6, PPC_PLATFORM_CELL_BE, PPC_PLATFORM_POWER6X): Define. (_dl_string_platform): Use PPC_PLATFORM_* macros instead of hardcoded constants. * sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_platform): Use PPC_PLATFORM_* macros for array designators. 2006-11-11 Steven Munroe <sjmunroe@us.ibm.com> * sysdeps/powerpc/dl-procinfo.c (_dl_powerpc_cap_flags): Add 3 new cap names to the beginning. (_dl_powerpc_platforms): Add "power6x". * sysdeps/powerpc/dl-procinfo.h (_DL_HWCAP_FIRST): Decrease. (HWCAP_IMPORTANT): Add PPC_FEATURE_HAS_DFP. (_DL_PLATFORMS_COUNT): Increase. (_dl_string_platform): Handle power6x case. * sysdeps/powerpc/sysdep.h (PPC_FEATURE_PA6T, PPC_FEATURE_HAS_DFP, PPC_FEATURE_POWER6_EXT): Define. (PPC_FEATURE_POWER5, PPC_FEATURE_POWER5_PLUS): Correct Comment. [-2^31 .. 2^31) range. * sysdeps/unix/sysv/linux/bits/statvfs.h: Define ST_RELATIME. * sysdeps/unix/sysv/linux/internal_statvfs.c (__statvfs_getflags): Handle relatime mount option. 2006-12-13 Jakub Jelinek <jakub@redhat.com> * sysdeps/unix/sysv/linux/powerpc/powerpc32/setcontext.S: Include kernel-features.h. 2006-12-11 Ulrich Drepper <drepper@redhat.com> * stdlib/strtod_l.c (____STRTOF_INTERNAL): Parse thousand separators also if no non-zero digits found. * stdlib/Makefile (tests): Add tst-strtod3. [BZ #3664] * stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix test to recognize empty parsed strings. * stdlib/Makefile (tests): Add tst-strtod2. * stdlib/tst-strtod2.c: New file. [BZ #3673] * stdlib/strtod_l.c (____STRTOF_INTERNAL): Fix exp_limit computation. * stdlib/Makefile (tests): Add tst-atof2. * stdlib/tst-atof2.c: New file. [BZ #3674] * stdlib/strtod_l.c (____STRTOF_INTERNAL): Adjust exponent value correctly if removing trailing zero of hex-float. * stdlib/Makefile (tests): Add tst-atof1. * stdlib/tst-atof1.c: New file. * misc/mntent_r.c (__hasmntopt): Check p[optlen] even when p == rest. Start searching for next comma at p rather than rest. * misc/Makefile (tests): Add tst-mntent2. * misc/tst-mntent2.c: New test. 2006-12-08 Ulrich Drepper <drepper@redhat.com> * malloc/memusage.c: Handle realloc with new size of zero and non-NULL pointer correctly. (me): Really write first record twice. (struct entry): Make format bi-arch safe. (dest): Write out more realloc statistics. * malloc/memusagestat.c (struct entry): Make format bi-arch safe. 2006-12-05 Jakub Jelinek <jakub@redhat.com> * nis/nis_subr.c (nis_getnames): Revert last change. 2006-12-03 Kaz Kojima <kkojima@rr.iij4u.or.jp> * sysdeps/unix/sysv/linux/sh/sys/io.h: Removed. 2006-11-30 H.J. Lu <hongjiu.lu@intel.com> * sysdeps/i386/i686/memcmp.S: Use jump table as the base of jump table entries. 2006-11-30 Jan Kratochvil <jan.kratochvil@redhat.com> * sysdeps/unix/sysv/linux/i386/clone.S: Provide CFI for the outermost `clone' function to ensure proper unwinding stop of gdb. * sysdeps/unix/sysv/linux/x86_64/clone.S: Likewise. 2006-12-01 Ulrich Drepper <drepper@redhat.com> * nscd/nscd.init: Remove obsolete and commented-out -S option handling. 2006-11-23 Jakub Jelinek <jakub@redhat.com> [BZ #3514] * manual/string.texi (strncmp): Fix pastos from wcscmp description. [BZ #3515] * manual/string.texi (strtok): Remove duplicate paragraph. 2006-12-01 Jan Kratochvil <jan.kratochvil@redhat.com> * sysdeps/unix/sysv/linux/x86_64/sigaction.c: Fix compatibility with libgcc not supporting `rflags' unwinding (register # >= 17). 2006-11-30 Jakub Jelinek <jakub@redhat.com> * sunrpc/svc_run.c (svc_run): Set my_pollfd to new_pollfd if realloc succeeded. 2006-11-29 Daniel Jacobowitz <dan@codesourcery.com> Jakub Jelinek <jakub@redhat.com> Jan Kratochvil <jan.kratochvil@redhat.com> * sysdeps/unix/sysv/linux/x86_64/sigaction.c (restore_rt): Add correct unwind information. * sysdeps/unix/sysv/linux/x86_64/Makefile: Provide symbols for 'restore_rt' even in the 'signal' directory. * sysdeps/unix/sysv/linux/x86_64/ucontext_i.sym: Extend the regs list. malloc crashed. Don't allocate memory unnecessarily in each loop. 2006-10-21 Jakub Jelinek <jakub@redhat.com> * resolv/mapv4v6addr.h (map_v4v6_address): Fix last change. 2006-11-20 Ulrich Drepper <drepper@redhat.com> * resolv/mapv4v6addr.h (map_v4v6_address): Optimize a bit. 2006-11-18 Bruno Haible <bruno@clisp.org> * sysdeps/unix/sysv/linux/i386/getgroups.c (__getgroups): Invoke __sysconf only after having tried to call getgroups32. 2006-11-19 Ulrich Drepper <drepper@redhat.com> * nss/nss_files/files-hosts.c (LINE_PARSER): Support IPv6-style addresses for IPv4 queries if they can be mapped. 2006-11-16 Jakub Jelinek <jakub@redhat.com> * sysdeps/x86_64/fpu/s_copysignf.S (__copysignf): Switch to .text. * sysdeps/x86_64/fpu/s_copysign.S (__copysign): Likewise. (signmask): Add .size directive. (othermask): Add .type directive. 2006-11-14 Ulrich Drepper <drepper@redhat.com> * po/nl.po: Update from translation team. * timezone/zdump.c: Redo fix for BZ #3137. 2006-11-14 Jakub Jelinek <jakub@redhat.com> * nss/nss_files/files-alias.c (get_next_alias): Set line back to first_unused after parsing :include: file. * timezone/africa: Update from tzdata2006o. * timezone/antarctica: Likewise. * timezone/asia: Likewise. * timezone/australasia: Likewise. * timezone/backward: Likewise. * timezone/europe: Likewise. * timezone/iso3166.tab: Likewise. * timezone/northamerica: Likewise. * timezone/southamerica: Likewise. * timezone/zone.tab: Likewise. * time/tzfile.c (__tzfile_read): Extend to handle new file format on machines with 64-bit time_t. * timezone/checktab.awk: Update from tzcode2006o. * timezone/ialloc.c: Likewise. * timezone/private.h: Likewise. * timezone/scheck.c: Likewise. * timezone/tzfile.h: Likewise. * timezone/tzselect.ksh: Likewise. * timezone/zdump.c: Likewise. * timezone/zic.c: Likewise. [BZ #3483] * elf/ldconfig.c (main): Call setlocale and textdomain. Patch mostly by Benno Schulenberg <bensberg@justemail.net>. [BZ #3480] * manual/argp.texi: Fix typos. * manual/charset.texi: Likewise. * manual/errno.texi: Likewise. * manual/filesys.texi: Likewise. * manual/lang.texi: Likewise. * manual/maint.texi: Likewise. * manual/memory.texi: Likewise. * manual/message.texi: Likewise. * manual/resource.texi: Likewise. * manual/search.texi: Likewise. * manual/signal.texi: Likewise. * manual/startup.texi: Likewise. * manual/stdio.texi: Likewise. * manual/sysinfo.texi: Likewise. * manual/syslog.texi: Likewise. * manual/time.texi: Likewise. Patch by Ralf Wildenhues <Ralf.Wildenhues@gmx.de>. [BZ #3465] * sunrpc/clnt_raw.c: Minimal message improvements. * sunrpc/pm_getmaps.c: Likewise. * nis/nss_nisplus/nisplus-publickey.c: Likewise. * nis/nis_print_group_entry.c: Likewise. * locale/programs/repertoire.c: Likewise. * locale/programs/charmap.c: Likewise. * malloc/memusage.sh: Likewise. * elf/dl-deps.c: Likewise. * locale/programs/ld-collate.c: Likewise. * libio/vswprintf.c: Likewise. * malloc/memusagestat.c: Likewise. * sunrpc/auth_unix.c: Likewise. * sunrpc/rpc_main.c: Likewise. * nscd/cache.c: Likewise. * locale/programs/repertoire.c: Unify output messages. * locale/programs/charmap.c: Likewise. * locale/programs/ld-ctype.c: Likewise. * locale/programs/ld-monetary.c: Likewise. * locale/programs/ld-numeric.c: Likewise. * locale/programs/ld-time.c: Likewise. * elf/ldconfig.c: Likewise. * nscd/selinux.c: Likewise. * elf/cache.c: Likewise. Patch mostly by Benno Schulenberg <bensberg@justemail.net>. 2006-11-10 Jakub Jelinek <jakub@redhat.com> * string/strxfrm_l.c (STRXFRM): Fix trailing \1 optimization if N is one bigger than return value. * string/tst-strxfrm2.c (do_test): Also test strxfrm with l1 + 1 and l1 last arguments, if buf is defined, verify the return value equals to strlen (buf) and verify no byte beyond passed length is modified. 2006-11-10 Ulrich Drepper <drepper@redhat.com> * po/sv.po: Update from translation team. * sysdeps/gnu/siglist.c (__old_sys_siglist, __old_sys_sigabbrev): Use __new_sys_siglist instead of _sys_siglist_internal as second macro argument. (_old_sys_siglist): Use declare_symbol_alias macro instead of strong_alias. 2006-11-09 Ulrich Drepper <drepper@redhat.com> [BZ #3493] * posix/unistd.h (sysconf): Remove const attribute. * sysdeps/posix/getaddrinfo.c (getaddrinfo): Fix test for temporary or deprecated addresses. Patch by Sridhar Samudrala <sri@us.ibm.com>. * string/Makefile (tests): Add tst-strxfrm2. * string/tst-strxfrm2.c: New file. 2006-10-09 Jakub Jelinek <jakub@redhat.com> * elf/dl-debug.c (_dl_debug_initialize): Check r->r_map for 0 rather than r->r_brk. * string/strxfrm_l.c (STRXFRM): Do the trailing \1 removal optimization even if needed > n. 2006-11-07 Jakub Jelinek <jakub@redhat.com> * include/libc-symbols.h (declare_symbol): Rename to... (declare_symbol_alias): ... this. Add ORIGINAL argument, imply strong_alias (ORIGINAL, SYMBOL) in asm to make sure it preceedes .size directive. * sysdeps/gnu/errlist-compat.awk: Adjust for declare_symbol_alias changes. * sysdeps/gnu/siglist.c: Likewise. 2006-11-03 Steven Munroe <sjmunroe@us.ibm.com> * sysdeps/powerpc/fpu/bits/mathinline.h [__LIBC_INTERNAL_MATH_INLINES]: Moved to ... * sysdeps/powerpc/fpu/math_private.h: ...here. New file. 2006-11-05 Ulrich Drepper <drepper@redhat.com> * sysdeps/unix/sysv/linux/i386/sysconf.c (intel_check_word): Update handling of cache descriptor 0x49 for new models. * sysdeps/unix/sysv/linux/x86_64/sysconf.c (intel_check_word): Likewise. 2006-11-02 Ulrich Drepper <drepper@redhat.com> * configure.in: Work around ld --help change and avoid -z relro test completely if the architecture doesn't care about security. 2006-11-01 Ulrich Drepper <drepper@redhat.com> * po/sv.po: Update from translation team. 2006-10-31 Ulrich Drepper <drepper@redhat.com> * stdlib/atexit.c (atexit): Don't mark as hidden when used to generate compatibility version. 2006-10-29 Ulrich Drepper <drepper@redhat.com> * configure.in: Relax -z relro requirement a bit. * po/sv.po: Update from translation team. 2006-10-29 Jakub Jelinek <jakub@redhat.com> * elf/dl-sym.c (do_sym): Use RTLD_SINGLE_THREAD_P. * elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Likewise. * elf/dl-close.c (_dl_close_worker): Likewise. * elf/dl-open.c (_dl_open_worker): Likewise. * sysdeps/generic/sysdep-cancel.h (RTLD_SINGLE_THREAD_P): Define. * configure.in: Require assembler support for visibility, compiler support for visibility and aliases, linker support for various -z options. * Makeconfig: Remove conditional code which now is unnecessary. * config.h.in: Likewise. * config.make.in: Likewise. * dlfcn/Makefile: Likewise. * elf/Makefile: Likewise. * elf/dl-load.c: Likewise. * elf/rtld.c: Likewise. * include/libc-symbols.h: Likewise. * include/stdio.h: Likewise. * io/Makefile: Likewise. * io/fstat.c: Likewise. * io/fstat64.c: Likewise. * io/fstatat.c: Likewise. * io/fstatat64.c: Likewise. * io/lstat.c: Likewise. * io/lstat64.c: Likewise. * io/mknod.c: Likewise. * io/mknodat.c: Likewise. * io/stat.c: Likewise. * io/stat64.c: Likewise. * libio/stdio.c: Likewise. * nscd/Makefile: Likewise. * stdlib/Makefile: Likewise. * stdlib/atexit.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/i386/dl-machine.h: Likewise. * sysdeps/i386/sysdep.h: Likewise. * sysdeps/i386/i686/memcmp.S: Likewise. * sysdeps/powerpc/powerpc32/sysdep.h: Likewise. * sysdeps/unix/sysv/linux/i386/sigaction.c: Likewise. * sysdeps/unix/sysv/linux/x86_64/sigaction.c: Likewise. * Makerules: USE_TLS support is now default. * tls.make.c: Likewise. * csu/Versions: Likewise. * csu/libc-start.c: Likewise. * csu/libc-tls.c: Likewise. * csu/version.c: Likewise. * dlfcn/dlinfo.c: Likewise. * elf/dl-addr.c: Likewise. * elf/dl-cache.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-iteratephdr.c: Likewise. * elf/dl-load.c: Likewise. * elf/dl-lookup.c: Likewise. * elf/dl-object.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-reloc.c: Likewise. * elf/dl-support.c: Likewise. * elf/dl-sym.c: Likewise. * elf/dl-sysdep.c: Likewise. * elf/dl-tls.c: Likewise. * elf/ldconfig.c: Likewise. * elf/rtld.c: Likewise. * elf/tst-tls-dlinfo.c: Likewise. * elf/tst-tls1.c: Likewise. * elf/tst-tls10.h: Likewise. * elf/tst-tls14.c: Likewise. * elf/tst-tls2.c: Likewise. * elf/tst-tls3.c: Likewise. * elf/tst-tls4.c: Likewise. * elf/tst-tls5.c: Likewise. * elf/tst-tls6.c: Likewise. * elf/tst-tls7.c: Likewise. * elf/tst-tls8.c: Likewise. * elf/tst-tls9.c: Likewise. * elf/tst-tlsmod1.c: Likewise. * elf/tst-tlsmod13.c: Likewise. * elf/tst-tlsmod13a.c: Likewise. * elf/tst-tlsmod14a.c: Likewise. * elf/tst-tlsmod2.c: Likewise. * elf/tst-tlsmod3.c: Likewise. * elf/tst-tlsmod4.c: Likewise. * elf/tst-tlsmod5.c: Likewise. * elf/tst-tlsmod6.c: Likewise. * include/errno.h: Likewise. * include/link.h: Likewise. * include/tls.h: Likewise. * locale/global-locale.c: Likewise. * locale/localeinfo.h: Likewise. * malloc/arena.c: Likewise. * malloc/hooks.c: Likewise. * malloc/malloc.c: Likewise. * resolv/Versions: Likewise. * sysdeps/alpha/dl-machine.h: Likewise. * sysdeps/alpha/libc-tls.c: Likewise. * sysdeps/generic/ldsodefs.h: Likewise. * sysdeps/generic/tls.h: Likewise. * sysdeps/i386/dl-machine.h: Likewise. * sysdeps/ia64/dl-machine.h: Likewise. * sysdeps/ia64/libc-tls.c: Likewise. * sysdeps/mach/hurd/fork.c: Likewise. * sysdeps/mach/hurd/i386/tls.h: Likewise. * sysdeps/powerpc/powerpc32/dl-machine.c: Likwise. * sysdeps/powerpc/powerpc32/dl-machine.h: Likewise. * sysdeps/powerpc/powerpc64/dl-machine.h: Likewise. * sysdeps/s390/libc-tls.c: Likewise. * sysdeps/s390/s390-32/dl-machine.h: Likewise. * sysdeps/s390/s390-64/dl-machine.h: Likewise. * sysdeps/sh/dl-machine.h: Likewise. * sysdeps/sparc/sparc32/dl-machine.h: Likewise. * sysdeps/sparc/sparc64/dl-machine.h: Likewise. * sysdeps/x86_64/dl-machine.h: Likewise. [BZ #3426] * stdlib/stdlib.h: Adjust comment for canonicalize_file_name to reality. 2006-10-27 Jakub Jelinek <jakub@redhat.com> * elf/dl-lookup.c (_dl_debug_bindings): Remove unused symbol_scope argument. (_dl_lookup_symbol_x): Adjust caller. * sysdeps/generic/ldsodefs.h (struct link_namespaces): Remove _ns_global_scope. * elf/rtld.c (dl_main): Don't initialize _ns_global_scope. * elf/dl-libc.c: Revert l_scope name changes. * elf/dl-load.c: Likewise. * elf/dl-object.c: Likewise. * elf/rtld.c: Likewise. * elf/dl-close.c (_dl_close): Likewise. * elf/dl-open.c (dl_open_worker): Likewise. If not SINGLE_THREAD_P, always use __rtld_mrlock_{change,done}. Always free old scope list here if not l_scope_mem. * elf/dl-runtime.c (_dl_fixup, _dl_profile_fixup): Revert l_scope name change. Never free scope list here. Just __rtld_mrlock_lock before the lookup and __rtld_mrlock_unlock it after the lookup. * elf/dl-sym.c: Likewise. * include/link.h (struct r_scoperec): Remove. (struct link_map): Replace l_scoperec with l_scope, l_scoperec_mem with l_scope_mem and l_scoperec_lock with l_scope_lock. 2006-10-25 Ulrich Drepper <drepper@redhat.com> * sysdeps/gnu/netinet/tcp.h: Define TCP_CONGESTION. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * configure.in: Disable building profile libraries by default. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * elf/dl-lookup.c (_dl_lookup_symbol_x): Add warning to _dl_lookup_symbol_x code. 2006-10-17 Jakub Jelinek <jakub@redhat.com> * elf/dl-runtime.c: Include sysdep-cancel.h. (_dl_fixup, _dl_profile_fixup): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-sym.c: Include sysdep-cancel.h. (do_sym): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-close.c: Include sysdep-cancel.h. (_dl_close): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. * elf/dl-open.c: Include sysdep-cancel.h. (dl_open_worker): Use __rtld_mrlock_* and scoperec->nusers only if !SINGLE_THREAD_P. Use atomic_* instead of catomic_* macros. 2006-10-17 Jakub Jelinek <jakub@redhat.com> [BZ #3313] * malloc/malloc.c (malloc_consolidate): Set maxfb to address of last fastbin rather than end of fastbin array. 2006-10-18 Ulrich Drepper <drepper@redhat.com> * sysdeps/i386/i486/bits/atomic.h (catomic_decrement): Use correct body macro. * sysdeps/x86_64/bits/atomic.h (__arch_c_compare_and_exchange_val_64_acq): Add missing casts. (catomic_decrement): Use correct body macro. 2006-10-17 Jakub Jelinek <jakub@redhat.com> * include/atomic.h: Add a unique prefix to all local variables in macros. * csu/tst-atomic.c (do_test): Test also catomic_* macros. 2006-10-14 Ulrich Drepper <drepper@redhat.com> * resolv/arpa/nameser.h: Document that ns_t_a6 is deprecated. [BZ #3313] * malloc/malloc.c (malloc_consolidate): Don't use get_fast_max to determine highest fast bin to consolidate, always look into all of them. (do_check_malloc_state): Only require for empty bins for large sizes in main arena. * libio/stdio.h: Add more __wur attributes. 2006-11-12 Andreas Jaeger <aj@suse.de> [BZ #2510] * manual/search.texi (Hash Search Function): Clarify. (Array Search Function): Clarify. 2006-11-12 Joseph Myers <joseph@codesourcery.com> [BZ #2830] * math/atest-exp.c (main): Cast hex value to mp_limb_t before shifting. * math/atest-exp2.c (read_mpn_hex): Likewise. * math/atest-sincos.c (main): Likewise. * sysdeps/unix/sysv/linux/syscalls.list: Add epoll_pwait. * sysdeps/unix/sysv/linux/sys/epoll.h: Declare epoll_pwait. * sysdeps/unix/sysv/linux/Versions (libc): Add epoll_pwait for version GLIBC_2.6. * Versions.def: Add GLIBC_2.6 for libc. * sysdeps/i386/i486/bits/atomic.h: Add catomic_* support. 2006-10-11 Jakub Jelinek <jakub@redhat.com> * malloc/malloc.c (_int_malloc): Remove unused any_larger variable. * nis/nis_defaults.c (__nis_default_access): Don't call getenv twice. * nis/nis_subr.c (nis_getnames): Use __secure_getenv instead of getenv. * sysdeps/generic/unsecvars.h: Add NIS_PATH. 2006-10-11 Ulrich Drepper <drepper@redhat.com> * include/atomic.c: Define catomic_* operations. * sysdeps/x86_64/bits/atomic.h: Likewise. Fix a few minor problems. * stdlib/cxa_finalize.c: Use catomic_* operations instead of atomic_*. * malloc/memusage.c: Likewise. * gmon/mcount.c: Likewise. * elf/dl-close.c: Likewise. * elf/dl-open.c: Likewise. * elf/dl-profile.c: Likewise. * elf/dl-sym.c: Likewise. * elf/dl-runtime.c: Likewise. * elf/dl-fptr.c: Likewise. * resolv/res_libc.c: Likewise. 2006-10-10 Roland McGrath <roland@frob.com> * sysdeps/mach/hurd/utimes.c: Use a union to avoid an improper cast. * sysdeps/mach/hurd/futimes.c: Likewise. * sysdeps/mach/hurd/lutimes.c: Likewise. 2006-10-09 Ulrich Drepper <drepper@redhat.com> Jakub Jelinek <jakub@redhat.com> Implement reference counting of scope records. * elf/dl-close.c (_dl_close): Remove all scopes from removed objects from the list in objects which remain. Always allocate new scope record. * elf/dl-open.c (dl_open_worker): When growing array for scopes, don't resize, allocate a new one. * elf/dl-runtime.c: Update reference counters before using a scope array. * elf/dl-sym.c: Likewise. * elf/dl-libc.c: Adjust for l_scope name change. * elf/dl-load.c: Likewise. * elf/dl-object.c: Likewise. * elf/rtld.c: Likewise. * include/link.h: Include <rtld-lowlevel.h>. Define struct r_scoperec. Replace r_scope with pointer to r_scoperec structure. Add l_scoperec_lock. * sysdeps/generic/ldsodefs.h: Include <rtld-lowlevel.h>. * sysdeps/generic/rtld-lowlevel.h: New file. * include/atomic.h: Rename atomic_and to atomic_and_val and atomic_or to atomic_or_val. Define new macros atomic_and and atomic_or which do not return values. * sysdeps/x86_64/bits/atomic.h: Define atomic_and and atomic_or. Various cleanups. * sysdeps/i386/i486/bits/atomic.h: Likewise. * po/sv.po: Update from translation team. 2006-10-07 Ulrich Drepper <drepper@redhat.com> * Versions.def: Add GLIBC_2.6 to libpthread. * include/shlib-compat.h (SHLIB_COMPAT): Expand parameters before use. (versioned_symbol): Likewise. (compat_symbol): Likewise. * po/tr.po: Update from translation team. * nis/Banner: Removed. It's been integral part forever and the author info is incomplete anyway. * libio/Banner: Likewise. 2006-10-06 Ulrich Drepper <drepper@redhat.com> * version.h (VERSION): Bump to 2.5.90 for new development tree.
2331 lines
47 KiB
C
2331 lines
47 KiB
C
/* Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@redhat.com>, 2002.
|
|
|
|
The GNU C 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 2.1 of the License, or (at your option) any later version.
|
|
|
|
The GNU C 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 the GNU C Library; if not, write to the Free
|
|
Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
|
|
02111-1307 USA. */
|
|
|
|
/* NOTE: this tests functionality beyond POSIX. POSIX does not allow
|
|
exit to be called more than once. */
|
|
|
|
#include <errno.h>
|
|
#include <fcntl.h>
|
|
#include <limits.h>
|
|
#include <pthread.h>
|
|
#include <stddef.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <termios.h>
|
|
#include <unistd.h>
|
|
#include <sys/mman.h>
|
|
#include <sys/msg.h>
|
|
#include <sys/poll.h>
|
|
#include <sys/select.h>
|
|
#include <sys/socket.h>
|
|
#include <sys/uio.h>
|
|
#include <sys/un.h>
|
|
#include <sys/wait.h>
|
|
|
|
#include "pthreadP.h"
|
|
|
|
|
|
/* Since STREAMS are not supported in the standard Linux kernel and
|
|
there we don't advertise STREAMS as supported is no need to test
|
|
the STREAMS related functions. This affects
|
|
getmsg() getpmsg() putmsg()
|
|
putpmsg()
|
|
|
|
lockf() and fcntl() are tested in tst-cancel16.
|
|
|
|
pthread_join() is tested in tst-join5.
|
|
|
|
pthread_testcancel()'s only purpose is to allow cancellation. This
|
|
is tested in several places.
|
|
|
|
sem_wait() and sem_timedwait() are checked in tst-cancel1[2345] tests.
|
|
|
|
mq_send(), mq_timedsend(), mq_receive() and mq_timedreceive() are checked
|
|
in tst-mqueue8{,x} tests.
|
|
|
|
aio_suspend() is tested in tst-cancel17.
|
|
|
|
clock_nanosleep() is tested in tst-cancel18.
|
|
*/
|
|
|
|
/* Pipe descriptors. */
|
|
static int fds[2];
|
|
|
|
/* Temporary file descriptor, to be closed after each round. */
|
|
static int tempfd = -1;
|
|
static int tempfd2 = -1;
|
|
/* Name of temporary file to be removed after each round. */
|
|
static char *tempfname;
|
|
/* Temporary message queue. */
|
|
static int tempmsg = -1;
|
|
|
|
/* Often used barrier for two threads. */
|
|
static pthread_barrier_t b2;
|
|
|
|
|
|
#ifndef IPC_ADDVAL
|
|
# define IPC_ADDVAL 0
|
|
#endif
|
|
|
|
#define WRITE_BUFFER_SIZE 4096
|
|
|
|
/* Cleanup handling test. */
|
|
static int cl_called;
|
|
|
|
static void
|
|
cl (void *arg)
|
|
{
|
|
++cl_called;
|
|
}
|
|
|
|
|
|
|
|
static void *
|
|
tf_read (void *arg)
|
|
{
|
|
int fd;
|
|
int r;
|
|
|
|
if (arg == NULL)
|
|
fd = fds[0];
|
|
else
|
|
{
|
|
char fname[] = "/tmp/tst-cancel4-fd-XXXXXX";
|
|
tempfd = fd = mkstemp (fname);
|
|
if (fd == -1)
|
|
printf ("%s: mkstemp failed\n", __FUNCTION__);
|
|
unlink (fname);
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
ssize_t s;
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
char buf[100];
|
|
s = read (fd, buf, sizeof (buf));
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: read returns with %zd\n", __FUNCTION__, s);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_readv (void *arg)
|
|
{
|
|
int fd;
|
|
int r;
|
|
|
|
if (arg == NULL)
|
|
fd = fds[0];
|
|
else
|
|
{
|
|
char fname[] = "/tmp/tst-cancel4-fd-XXXXXX";
|
|
tempfd = fd = mkstemp (fname);
|
|
if (fd == -1)
|
|
printf ("%s: mkstemp failed\n", __FUNCTION__);
|
|
unlink (fname);
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
ssize_t s;
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
char buf[100];
|
|
struct iovec iov[1] = { [0] = { .iov_base = buf, .iov_len = sizeof (buf) } };
|
|
s = readv (fd, iov, 1);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: readv returns with %zd\n", __FUNCTION__, s);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_write (void *arg)
|
|
{
|
|
int fd;
|
|
int r;
|
|
|
|
if (arg == NULL)
|
|
fd = fds[1];
|
|
else
|
|
{
|
|
char fname[] = "/tmp/tst-cancel4-fd-XXXXXX";
|
|
tempfd = fd = mkstemp (fname);
|
|
if (fd == -1)
|
|
printf ("%s: mkstemp failed\n", __FUNCTION__);
|
|
unlink (fname);
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
ssize_t s;
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
char buf[WRITE_BUFFER_SIZE];
|
|
memset (buf, '\0', sizeof (buf));
|
|
s = write (fd, buf, sizeof (buf));
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: write returns with %zd\n", __FUNCTION__, s);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_writev (void *arg)
|
|
{
|
|
int fd;
|
|
int r;
|
|
|
|
if (arg == NULL)
|
|
fd = fds[1];
|
|
else
|
|
{
|
|
char fname[] = "/tmp/tst-cancel4-fd-XXXXXX";
|
|
tempfd = fd = mkstemp (fname);
|
|
if (fd == -1)
|
|
printf ("%s: mkstemp failed\n", __FUNCTION__);
|
|
unlink (fname);
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
ssize_t s;
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
char buf[WRITE_BUFFER_SIZE];
|
|
memset (buf, '\0', sizeof (buf));
|
|
struct iovec iov[1] = { [0] = { .iov_base = buf, .iov_len = sizeof (buf) } };
|
|
s = writev (fd, iov, 1);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: writev returns with %zd\n", __FUNCTION__, s);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_sleep (void *arg)
|
|
{
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
if (arg != NULL)
|
|
{
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
sleep (arg == NULL ? 1000000 : 0);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: sleep returns\n", __FUNCTION__);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_usleep (void *arg)
|
|
{
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
if (arg != NULL)
|
|
{
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: 2nd barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
usleep (arg == NULL ? (useconds_t) ULONG_MAX : 0);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: usleep returns\n", __FUNCTION__);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_nanosleep (void *arg)
|
|
{
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
if (arg != NULL)
|
|
{
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
struct timespec ts = { .tv_sec = arg == NULL ? 10000000 : 0, .tv_nsec = 0 };
|
|
TEMP_FAILURE_RETRY (nanosleep (&ts, &ts));
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: nanosleep returns\n", __FUNCTION__);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_select (void *arg)
|
|
{
|
|
int fd;
|
|
int r;
|
|
|
|
if (arg == NULL)
|
|
fd = fds[0];
|
|
else
|
|
{
|
|
char fname[] = "/tmp/tst-cancel4-fd-XXXXXX";
|
|
tempfd = fd = mkstemp (fname);
|
|
if (fd == -1)
|
|
printf ("%s: mkstemp failed\n", __FUNCTION__);
|
|
unlink (fname);
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
fd_set rfs;
|
|
FD_ZERO (&rfs);
|
|
FD_SET (fd, &rfs);
|
|
|
|
int s;
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
s = select (fd + 1, &rfs, NULL, NULL, NULL);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: select returns with %d (%s)\n", __FUNCTION__, s,
|
|
strerror (errno));
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_pselect (void *arg)
|
|
{
|
|
int fd;
|
|
int r;
|
|
|
|
if (arg == NULL)
|
|
fd = fds[0];
|
|
else
|
|
{
|
|
char fname[] = "/tmp/tst-cancel4-fd-XXXXXX";
|
|
tempfd = fd = mkstemp (fname);
|
|
if (fd == -1)
|
|
printf ("%s: mkstemp failed\n", __FUNCTION__);
|
|
unlink (fname);
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
fd_set rfs;
|
|
FD_ZERO (&rfs);
|
|
FD_SET (fd, &rfs);
|
|
|
|
int s;
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
s = pselect (fd + 1, &rfs, NULL, NULL, NULL, NULL);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: pselect returns with %d (%s)\n", __FUNCTION__, s,
|
|
strerror (errno));
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_poll (void *arg)
|
|
{
|
|
int fd;
|
|
int r;
|
|
|
|
if (arg == NULL)
|
|
fd = fds[0];
|
|
else
|
|
{
|
|
char fname[] = "/tmp/tst-cancel4-fd-XXXXXX";
|
|
tempfd = fd = mkstemp (fname);
|
|
if (fd == -1)
|
|
printf ("%s: mkstemp failed\n", __FUNCTION__);
|
|
unlink (fname);
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
struct pollfd rfs[1] = { [0] = { .fd = fd, .events = POLLIN } };
|
|
|
|
int s;
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
s = poll (rfs, 1, -1);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: poll returns with %d (%s)\n", __FUNCTION__, s,
|
|
strerror (errno));
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_ppoll (void *arg)
|
|
{
|
|
int fd;
|
|
int r;
|
|
|
|
if (arg == NULL)
|
|
fd = fds[0];
|
|
else
|
|
{
|
|
char fname[] = "/tmp/tst-cancel4-fd-XXXXXX";
|
|
tempfd = fd = mkstemp (fname);
|
|
if (fd == -1)
|
|
printf ("%s: mkstemp failed\n", __FUNCTION__);
|
|
unlink (fname);
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
struct pollfd rfs[1] = { [0] = { .fd = fd, .events = POLLIN } };
|
|
|
|
int s;
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
s = ppoll (rfs, 1, NULL, NULL);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: ppoll returns with %d (%s)\n", __FUNCTION__, s,
|
|
strerror (errno));
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_wait (void *arg)
|
|
{
|
|
pid_t pid = fork ();
|
|
if (pid == -1)
|
|
{
|
|
puts ("fork failed");
|
|
exit (1);
|
|
}
|
|
|
|
if (pid == 0)
|
|
{
|
|
/* Make the program disappear after a while. */
|
|
if (arg == NULL)
|
|
sleep (10);
|
|
exit (0);
|
|
}
|
|
|
|
int r;
|
|
if (arg != NULL)
|
|
{
|
|
struct timespec ts = { .tv_sec = 0, .tv_nsec = 100000000 };
|
|
while (nanosleep (&ts, &ts) != 0)
|
|
continue;
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
int s;
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
s = wait (NULL);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: wait returns with %d (%s)\n", __FUNCTION__, s,
|
|
strerror (errno));
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_waitpid (void *arg)
|
|
{
|
|
|
|
pid_t pid = fork ();
|
|
if (pid == -1)
|
|
{
|
|
puts ("fork failed");
|
|
exit (1);
|
|
}
|
|
|
|
if (pid == 0)
|
|
{
|
|
/* Make the program disappear after a while. */
|
|
if (arg == NULL)
|
|
sleep (10);
|
|
exit (0);
|
|
}
|
|
|
|
int r;
|
|
if (arg != NULL)
|
|
{
|
|
struct timespec ts = { .tv_sec = 0, .tv_nsec = 100000000 };
|
|
while (nanosleep (&ts, &ts) != 0)
|
|
continue;
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
int s;
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
s = waitpid (-1, NULL, 0);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: waitpid returns with %d (%s)\n", __FUNCTION__, s,
|
|
strerror (errno));
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_waitid (void *arg)
|
|
{
|
|
pid_t pid = fork ();
|
|
if (pid == -1)
|
|
{
|
|
puts ("fork failed");
|
|
exit (1);
|
|
}
|
|
|
|
if (pid == 0)
|
|
{
|
|
/* Make the program disappear after a while. */
|
|
if (arg == NULL)
|
|
sleep (10);
|
|
exit (0);
|
|
}
|
|
|
|
int r;
|
|
if (arg != NULL)
|
|
{
|
|
struct timespec ts = { .tv_sec = 0, .tv_nsec = 100000000 };
|
|
while (nanosleep (&ts, &ts) != 0)
|
|
continue;
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
int s;
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
#ifndef WEXITED
|
|
# define WEXITED 0
|
|
#endif
|
|
siginfo_t si;
|
|
s = waitid (P_PID, pid, &si, WEXITED);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: waitid returns with %d (%s)\n", __FUNCTION__, s,
|
|
strerror (errno));
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_sigpause (void *arg)
|
|
{
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
if (arg != NULL)
|
|
{
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: 2nd barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
/* Just for fun block the cancellation signal. We need to use
|
|
__xpg_sigpause since otherwise we will get the BSD version. */
|
|
__xpg_sigpause (SIGCANCEL);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: sigpause returned\n", __FUNCTION__);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_sigsuspend (void *arg)
|
|
{
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
if (arg != NULL)
|
|
{
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: 2nd barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
/* Just for fun block all signals. */
|
|
sigset_t mask;
|
|
sigfillset (&mask);
|
|
sigsuspend (&mask);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: sigsuspend returned\n", __FUNCTION__);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_sigwait (void *arg)
|
|
{
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
if (arg != NULL)
|
|
{
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: 2nd barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
/* Block SIGUSR1. */
|
|
sigset_t mask;
|
|
sigemptyset (&mask);
|
|
sigaddset (&mask, SIGUSR1);
|
|
if (pthread_sigmask (SIG_BLOCK, &mask, NULL) != 0)
|
|
{
|
|
printf ("%s: pthread_sigmask failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
int sig;
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
/* Wait for SIGUSR1. */
|
|
sigwait (&mask, &sig);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: sigwait returned with signal %d\n", __FUNCTION__, sig);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_sigwaitinfo (void *arg)
|
|
{
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
if (arg != NULL)
|
|
{
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: 2nd barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
/* Block SIGUSR1. */
|
|
sigset_t mask;
|
|
sigemptyset (&mask);
|
|
sigaddset (&mask, SIGUSR1);
|
|
if (pthread_sigmask (SIG_BLOCK, &mask, NULL) != 0)
|
|
{
|
|
printf ("%s: pthread_sigmask failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
siginfo_t info;
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
/* Wait for SIGUSR1. */
|
|
sigwaitinfo (&mask, &info);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: sigwaitinfo returned with signal %d\n", __FUNCTION__,
|
|
info.si_signo);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_sigtimedwait (void *arg)
|
|
{
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
if (arg != NULL)
|
|
{
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: 2nd barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
/* Block SIGUSR1. */
|
|
sigset_t mask;
|
|
sigemptyset (&mask);
|
|
sigaddset (&mask, SIGUSR1);
|
|
if (pthread_sigmask (SIG_BLOCK, &mask, NULL) != 0)
|
|
{
|
|
printf ("%s: pthread_sigmask failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
/* Wait for SIGUSR1. */
|
|
siginfo_t info;
|
|
struct timespec ts = { .tv_sec = 60, .tv_nsec = 0 };
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
sigtimedwait (&mask, &info, &ts);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: sigtimedwait returned with signal %d\n", __FUNCTION__,
|
|
info.si_signo);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_pause (void *arg)
|
|
{
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
if (arg != NULL)
|
|
{
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: 2nd barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
pause ();
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: pause returned\n", __FUNCTION__);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_accept (void *arg)
|
|
{
|
|
struct sockaddr_un sun;
|
|
/* To test a non-blocking accept call we make the call file by using
|
|
a datagrame socket. */
|
|
int pf = arg == NULL ? SOCK_STREAM : SOCK_DGRAM;
|
|
|
|
tempfd = socket (AF_UNIX, pf, 0);
|
|
if (tempfd == -1)
|
|
{
|
|
printf ("%s: socket call failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
int tries = 0;
|
|
do
|
|
{
|
|
if (++tries > 10)
|
|
{
|
|
printf ("%s: too many unsuccessful bind calls\n", __FUNCTION__);
|
|
}
|
|
|
|
strcpy (sun.sun_path, "/tmp/tst-cancel4-socket-1-XXXXXX");
|
|
if (mktemp (sun.sun_path) == NULL)
|
|
{
|
|
printf ("%s: cannot generate temp file name\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
sun.sun_family = AF_UNIX;
|
|
}
|
|
while (bind (tempfd, (struct sockaddr *) &sun,
|
|
offsetof (struct sockaddr_un, sun_path)
|
|
+ strlen (sun.sun_path) + 1) != 0);
|
|
|
|
unlink (sun.sun_path);
|
|
|
|
listen (tempfd, 5);
|
|
|
|
socklen_t len = sizeof (sun);
|
|
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
if (arg != NULL)
|
|
{
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: 2nd barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
accept (tempfd, (struct sockaddr *) &sun, &len);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: accept returned\n", __FUNCTION__);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_send (void *arg)
|
|
{
|
|
struct sockaddr_un sun;
|
|
|
|
tempfd = socket (AF_UNIX, SOCK_STREAM, 0);
|
|
if (tempfd == -1)
|
|
{
|
|
printf ("%s: first socket call failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
int tries = 0;
|
|
do
|
|
{
|
|
if (++tries > 10)
|
|
{
|
|
printf ("%s: too many unsuccessful bind calls\n", __FUNCTION__);
|
|
}
|
|
|
|
strcpy (sun.sun_path, "/tmp/tst-cancel4-socket-2-XXXXXX");
|
|
if (mktemp (sun.sun_path) == NULL)
|
|
{
|
|
printf ("%s: cannot generate temp file name\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
sun.sun_family = AF_UNIX;
|
|
}
|
|
while (bind (tempfd, (struct sockaddr *) &sun,
|
|
offsetof (struct sockaddr_un, sun_path)
|
|
+ strlen (sun.sun_path) + 1) != 0);
|
|
|
|
listen (tempfd, 5);
|
|
|
|
tempfd2 = socket (AF_UNIX, SOCK_STREAM, 0);
|
|
if (tempfd2 == -1)
|
|
{
|
|
printf ("%s: second socket call failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
if (connect (tempfd2, (struct sockaddr *) &sun, sizeof (sun)) != 0)
|
|
{
|
|
printf ("%s: connect failed\n", __FUNCTION__);
|
|
exit(1);
|
|
}
|
|
|
|
unlink (sun.sun_path);
|
|
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
if (arg != NULL)
|
|
{
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: 2nd barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
/* Very large block, so that the send call blocks. */
|
|
char mem[700000];
|
|
|
|
send (tempfd2, mem, arg == NULL ? sizeof (mem) : 1, 0);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: send returned\n", __FUNCTION__);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_recv (void *arg)
|
|
{
|
|
struct sockaddr_un sun;
|
|
|
|
tempfd = socket (AF_UNIX, SOCK_STREAM, 0);
|
|
if (tempfd == -1)
|
|
{
|
|
printf ("%s: first socket call failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
int tries = 0;
|
|
do
|
|
{
|
|
if (++tries > 10)
|
|
{
|
|
printf ("%s: too many unsuccessful bind calls\n", __FUNCTION__);
|
|
}
|
|
|
|
strcpy (sun.sun_path, "/tmp/tst-cancel4-socket-3-XXXXXX");
|
|
if (mktemp (sun.sun_path) == NULL)
|
|
{
|
|
printf ("%s: cannot generate temp file name\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
sun.sun_family = AF_UNIX;
|
|
}
|
|
while (bind (tempfd, (struct sockaddr *) &sun,
|
|
offsetof (struct sockaddr_un, sun_path)
|
|
+ strlen (sun.sun_path) + 1) != 0);
|
|
|
|
listen (tempfd, 5);
|
|
|
|
tempfd2 = socket (AF_UNIX, SOCK_STREAM, 0);
|
|
if (tempfd2 == -1)
|
|
{
|
|
printf ("%s: second socket call failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
if (connect (tempfd2, (struct sockaddr *) &sun, sizeof (sun)) != 0)
|
|
{
|
|
printf ("%s: connect failed\n", __FUNCTION__);
|
|
exit(1);
|
|
}
|
|
|
|
unlink (sun.sun_path);
|
|
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
if (arg != NULL)
|
|
{
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: 2nd barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
char mem[70];
|
|
|
|
recv (tempfd2, mem, arg == NULL ? sizeof (mem) : 0, 0);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: recv returned\n", __FUNCTION__);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_recvfrom (void *arg)
|
|
{
|
|
struct sockaddr_un sun;
|
|
|
|
tempfd = socket (AF_UNIX, SOCK_DGRAM, 0);
|
|
if (tempfd == -1)
|
|
{
|
|
printf ("%s: first socket call failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
int tries = 0;
|
|
do
|
|
{
|
|
if (++tries > 10)
|
|
{
|
|
printf ("%s: too many unsuccessful bind calls\n", __FUNCTION__);
|
|
}
|
|
|
|
strcpy (sun.sun_path, "/tmp/tst-cancel4-socket-4-XXXXXX");
|
|
if (mktemp (sun.sun_path) == NULL)
|
|
{
|
|
printf ("%s: cannot generate temp file name\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
sun.sun_family = AF_UNIX;
|
|
}
|
|
while (bind (tempfd, (struct sockaddr *) &sun,
|
|
offsetof (struct sockaddr_un, sun_path)
|
|
+ strlen (sun.sun_path) + 1) != 0);
|
|
|
|
tempfname = strdup (sun.sun_path);
|
|
|
|
tempfd2 = socket (AF_UNIX, SOCK_DGRAM, 0);
|
|
if (tempfd2 == -1)
|
|
{
|
|
printf ("%s: second socket call failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
if (arg != NULL)
|
|
{
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: 2nd barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
char mem[70];
|
|
socklen_t len = sizeof (sun);
|
|
|
|
recvfrom (tempfd2, mem, arg == NULL ? sizeof (mem) : 0, 0,
|
|
(struct sockaddr *) &sun, &len);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: recvfrom returned\n", __FUNCTION__);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_recvmsg (void *arg)
|
|
{
|
|
struct sockaddr_un sun;
|
|
|
|
tempfd = socket (AF_UNIX, SOCK_DGRAM, 0);
|
|
if (tempfd == -1)
|
|
{
|
|
printf ("%s: first socket call failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
int tries = 0;
|
|
do
|
|
{
|
|
if (++tries > 10)
|
|
{
|
|
printf ("%s: too many unsuccessful bind calls\n", __FUNCTION__);
|
|
}
|
|
|
|
strcpy (sun.sun_path, "/tmp/tst-cancel4-socket-5-XXXXXX");
|
|
if (mktemp (sun.sun_path) == NULL)
|
|
{
|
|
printf ("%s: cannot generate temp file name\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
sun.sun_family = AF_UNIX;
|
|
}
|
|
while (bind (tempfd, (struct sockaddr *) &sun,
|
|
offsetof (struct sockaddr_un, sun_path)
|
|
+ strlen (sun.sun_path) + 1) != 0);
|
|
|
|
tempfname = strdup (sun.sun_path);
|
|
|
|
tempfd2 = socket (AF_UNIX, SOCK_DGRAM, 0);
|
|
if (tempfd2 == -1)
|
|
{
|
|
printf ("%s: second socket call failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
if (arg != NULL)
|
|
{
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: 2nd barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
char mem[70];
|
|
struct iovec iov[1];
|
|
iov[0].iov_base = mem;
|
|
iov[0].iov_len = arg == NULL ? sizeof (mem) : 0;
|
|
|
|
struct msghdr m;
|
|
m.msg_name = &sun;
|
|
m.msg_namelen = sizeof (sun);
|
|
m.msg_iov = iov;
|
|
m.msg_iovlen = 1;
|
|
m.msg_control = NULL;
|
|
m.msg_controllen = 0;
|
|
|
|
recvmsg (tempfd2, &m, 0);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: recvmsg returned\n", __FUNCTION__);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_open (void *arg)
|
|
{
|
|
if (arg == NULL)
|
|
// XXX If somebody can provide a portable test case in which open()
|
|
// blocks we can enable this test to run in both rounds.
|
|
abort ();
|
|
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: 2nd barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
open ("Makefile", O_RDONLY);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: open returned\n", __FUNCTION__);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_close (void *arg)
|
|
{
|
|
if (arg == NULL)
|
|
// XXX If somebody can provide a portable test case in which close()
|
|
// blocks we can enable this test to run in both rounds.
|
|
abort ();
|
|
|
|
char fname[] = "/tmp/tst-cancel-fd-XXXXXX";
|
|
tempfd = mkstemp (fname);
|
|
if (tempfd == -1)
|
|
{
|
|
printf ("%s: mkstemp failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
unlink (fname);
|
|
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: 2nd barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
close (tempfd);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: close returned\n", __FUNCTION__);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_pread (void *arg)
|
|
{
|
|
if (arg == NULL)
|
|
// XXX If somebody can provide a portable test case in which pread()
|
|
// blocks we can enable this test to run in both rounds.
|
|
abort ();
|
|
|
|
tempfd = open ("Makefile", O_RDONLY);
|
|
if (tempfd == -1)
|
|
{
|
|
printf ("%s: cannot open Makefile\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: 2nd barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
char mem[10];
|
|
pread (tempfd, mem, sizeof (mem), 0);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: pread returned\n", __FUNCTION__);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_pwrite (void *arg)
|
|
{
|
|
if (arg == NULL)
|
|
// XXX If somebody can provide a portable test case in which pwrite()
|
|
// blocks we can enable this test to run in both rounds.
|
|
abort ();
|
|
|
|
char fname[] = "/tmp/tst-cancel4-fd-XXXXXX";
|
|
tempfd = mkstemp (fname);
|
|
if (tempfd == -1)
|
|
{
|
|
printf ("%s: mkstemp failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
unlink (fname);
|
|
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: 2nd barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
char mem[10];
|
|
pwrite (tempfd, mem, sizeof (mem), 0);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: pwrite returned\n", __FUNCTION__);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_fsync (void *arg)
|
|
{
|
|
if (arg == NULL)
|
|
// XXX If somebody can provide a portable test case in which fsync()
|
|
// blocks we can enable this test to run in both rounds.
|
|
abort ();
|
|
|
|
tempfd = open ("Makefile", O_RDONLY);
|
|
if (tempfd == -1)
|
|
{
|
|
printf ("%s: cannot open Makefile\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: 2nd barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
fsync (tempfd);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: fsync returned\n", __FUNCTION__);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_msync (void *arg)
|
|
{
|
|
if (arg == NULL)
|
|
// XXX If somebody can provide a portable test case in which msync()
|
|
// blocks we can enable this test to run in both rounds.
|
|
abort ();
|
|
|
|
tempfd = open ("Makefile", O_RDONLY);
|
|
if (tempfd == -1)
|
|
{
|
|
printf ("%s: cannot open Makefile\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
void *p = mmap (NULL, 10, PROT_READ, MAP_SHARED, tempfd, 0);
|
|
if (p == MAP_FAILED)
|
|
{
|
|
printf ("%s: mmap failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: 2nd barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
msync (p, 10, 0);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: msync returned\n", __FUNCTION__);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_sendto (void *arg)
|
|
{
|
|
if (arg == NULL)
|
|
// XXX If somebody can provide a portable test case in which sendto()
|
|
// blocks we can enable this test to run in both rounds.
|
|
abort ();
|
|
|
|
struct sockaddr_un sun;
|
|
|
|
tempfd = socket (AF_UNIX, SOCK_DGRAM, 0);
|
|
if (tempfd == -1)
|
|
{
|
|
printf ("%s: first socket call failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
int tries = 0;
|
|
do
|
|
{
|
|
if (++tries > 10)
|
|
{
|
|
printf ("%s: too many unsuccessful bind calls\n", __FUNCTION__);
|
|
}
|
|
|
|
strcpy (sun.sun_path, "/tmp/tst-cancel4-socket-6-XXXXXX");
|
|
if (mktemp (sun.sun_path) == NULL)
|
|
{
|
|
printf ("%s: cannot generate temp file name\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
sun.sun_family = AF_UNIX;
|
|
}
|
|
while (bind (tempfd, (struct sockaddr *) &sun,
|
|
offsetof (struct sockaddr_un, sun_path)
|
|
+ strlen (sun.sun_path) + 1) != 0);
|
|
tempfname = strdup (sun.sun_path);
|
|
|
|
tempfd2 = socket (AF_UNIX, SOCK_DGRAM, 0);
|
|
if (tempfd2 == -1)
|
|
{
|
|
printf ("%s: second socket call failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: 2nd barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
char mem[1];
|
|
|
|
sendto (tempfd2, mem, arg == NULL ? sizeof (mem) : 1, 0,
|
|
(struct sockaddr *) &sun,
|
|
offsetof (struct sockaddr_un, sun_path) + strlen (sun.sun_path) + 1);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: sendto returned\n", __FUNCTION__);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_sendmsg (void *arg)
|
|
{
|
|
if (arg == NULL)
|
|
// XXX If somebody can provide a portable test case in which sendmsg()
|
|
// blocks we can enable this test to run in both rounds.
|
|
abort ();
|
|
|
|
struct sockaddr_un sun;
|
|
|
|
tempfd = socket (AF_UNIX, SOCK_DGRAM, 0);
|
|
if (tempfd == -1)
|
|
{
|
|
printf ("%s: first socket call failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
int tries = 0;
|
|
do
|
|
{
|
|
if (++tries > 10)
|
|
{
|
|
printf ("%s: too many unsuccessful bind calls\n", __FUNCTION__);
|
|
}
|
|
|
|
strcpy (sun.sun_path, "/tmp/tst-cancel4-socket-7-XXXXXX");
|
|
if (mktemp (sun.sun_path) == NULL)
|
|
{
|
|
printf ("%s: cannot generate temp file name\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
sun.sun_family = AF_UNIX;
|
|
}
|
|
while (bind (tempfd, (struct sockaddr *) &sun,
|
|
offsetof (struct sockaddr_un, sun_path)
|
|
+ strlen (sun.sun_path) + 1) != 0);
|
|
tempfname = strdup (sun.sun_path);
|
|
|
|
tempfd2 = socket (AF_UNIX, SOCK_DGRAM, 0);
|
|
if (tempfd2 == -1)
|
|
{
|
|
printf ("%s: second socket call failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: 2nd barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
char mem[1];
|
|
struct iovec iov[1];
|
|
iov[0].iov_base = mem;
|
|
iov[0].iov_len = 1;
|
|
|
|
struct msghdr m;
|
|
m.msg_name = &sun;
|
|
m.msg_namelen = (offsetof (struct sockaddr_un, sun_path)
|
|
+ strlen (sun.sun_path) + 1);
|
|
m.msg_iov = iov;
|
|
m.msg_iovlen = 1;
|
|
m.msg_control = NULL;
|
|
m.msg_controllen = 0;
|
|
|
|
sendmsg (tempfd2, &m, 0);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: sendmsg returned\n", __FUNCTION__);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_creat (void *arg)
|
|
{
|
|
if (arg == NULL)
|
|
// XXX If somebody can provide a portable test case in which sendmsg()
|
|
// blocks we can enable this test to run in both rounds.
|
|
abort ();
|
|
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: 2nd barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
creat ("tmp/tst-cancel-4-should-not-exist", 0666);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: creat returned\n", __FUNCTION__);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_connect (void *arg)
|
|
{
|
|
if (arg == NULL)
|
|
// XXX If somebody can provide a portable test case in which connect()
|
|
// blocks we can enable this test to run in both rounds.
|
|
abort ();
|
|
|
|
struct sockaddr_un sun;
|
|
|
|
tempfd = socket (AF_UNIX, SOCK_STREAM, 0);
|
|
if (tempfd == -1)
|
|
{
|
|
printf ("%s: first socket call failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
int tries = 0;
|
|
do
|
|
{
|
|
if (++tries > 10)
|
|
{
|
|
printf ("%s: too many unsuccessful bind calls\n", __FUNCTION__);
|
|
}
|
|
|
|
strcpy (sun.sun_path, "/tmp/tst-cancel4-socket-2-XXXXXX");
|
|
if (mktemp (sun.sun_path) == NULL)
|
|
{
|
|
printf ("%s: cannot generate temp file name\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
sun.sun_family = AF_UNIX;
|
|
}
|
|
while (bind (tempfd, (struct sockaddr *) &sun,
|
|
offsetof (struct sockaddr_un, sun_path)
|
|
+ strlen (sun.sun_path) + 1) != 0);
|
|
tempfname = strdup (sun.sun_path);
|
|
|
|
listen (tempfd, 5);
|
|
|
|
tempfd2 = socket (AF_UNIX, SOCK_STREAM, 0);
|
|
if (tempfd2 == -1)
|
|
{
|
|
printf ("%s: second socket call failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
if (arg != NULL)
|
|
{
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: 2nd barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
connect (tempfd2, (struct sockaddr *) &sun, sizeof (sun));
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: connect returned\n", __FUNCTION__);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_tcdrain (void *arg)
|
|
{
|
|
if (arg == NULL)
|
|
// XXX If somebody can provide a portable test case in which tcdrain()
|
|
// blocks we can enable this test to run in both rounds.
|
|
abort ();
|
|
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
if (arg != NULL)
|
|
{
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: 2nd barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
/* Regardless of stderr being a terminal, the tcdrain call should be
|
|
canceled. */
|
|
tcdrain (STDERR_FILENO);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: tcdrain returned\n", __FUNCTION__);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_msgrcv (void *arg)
|
|
{
|
|
tempmsg = msgget (IPC_PRIVATE, 0666 | IPC_CREAT);
|
|
if (tempmsg == -1)
|
|
{
|
|
printf ("%s: msgget failed: %s\n", __FUNCTION__, strerror (errno));
|
|
exit (1);
|
|
}
|
|
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
if (arg != NULL)
|
|
{
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: 2nd barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
}
|
|
|
|
ssize_t s;
|
|
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
struct
|
|
{
|
|
long int type;
|
|
char mem[10];
|
|
} m;
|
|
int randnr;
|
|
/* We need a positive random number. */
|
|
do
|
|
randnr = random () % 64000;
|
|
while (randnr <= 0);
|
|
do
|
|
{
|
|
errno = 0;
|
|
s = msgrcv (tempmsg, (struct msgbuf *) &m, 10, randnr, 0);
|
|
}
|
|
while (errno == EIDRM || errno == EINTR);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: msgrcv returned %zd with errno = %m\n", __FUNCTION__, s);
|
|
|
|
msgctl (tempmsg, IPC_RMID, NULL);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static void *
|
|
tf_msgsnd (void *arg)
|
|
{
|
|
if (arg == NULL)
|
|
// XXX If somebody can provide a portable test case in which msgsnd()
|
|
// blocks we can enable this test to run in both rounds.
|
|
abort ();
|
|
|
|
tempmsg = msgget (IPC_PRIVATE, 0666 | IPC_CREAT);
|
|
if (tempmsg == -1)
|
|
{
|
|
printf ("%s: msgget failed: %s\n", __FUNCTION__, strerror (errno));
|
|
exit (1);
|
|
}
|
|
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: 2nd barrier_wait failed\n", __FUNCTION__);
|
|
exit (1);
|
|
}
|
|
|
|
pthread_cleanup_push (cl, NULL);
|
|
|
|
struct
|
|
{
|
|
long int type;
|
|
char mem[1];
|
|
} m;
|
|
/* We need a positive random number. */
|
|
do
|
|
m.type = random () % 64000;
|
|
while (m.type <= 0);
|
|
msgsnd (tempmsg, (struct msgbuf *) &m, sizeof (m.mem), 0);
|
|
|
|
pthread_cleanup_pop (0);
|
|
|
|
printf ("%s: msgsnd returned\n", __FUNCTION__);
|
|
|
|
msgctl (tempmsg, IPC_RMID, NULL);
|
|
|
|
exit (1);
|
|
}
|
|
|
|
|
|
static struct
|
|
{
|
|
const char *name;
|
|
void *(*tf) (void *);
|
|
int nb;
|
|
int only_early;
|
|
} tests[] =
|
|
{
|
|
#define ADD_TEST(name, nbar, early) { #name, tf_##name, nbar, early }
|
|
ADD_TEST (read, 2, 0),
|
|
ADD_TEST (readv, 2, 0),
|
|
ADD_TEST (select, 2, 0),
|
|
ADD_TEST (pselect, 2, 0),
|
|
ADD_TEST (poll, 2, 0),
|
|
ADD_TEST (ppoll, 2, 0),
|
|
ADD_TEST (write, 2, 0),
|
|
ADD_TEST (writev, 2, 0),
|
|
ADD_TEST (sleep, 2, 0),
|
|
ADD_TEST (usleep, 2, 0),
|
|
ADD_TEST (nanosleep, 2, 0),
|
|
ADD_TEST (wait, 2, 0),
|
|
ADD_TEST (waitid, 2, 0),
|
|
ADD_TEST (waitpid, 2, 0),
|
|
ADD_TEST (sigpause, 2, 0),
|
|
ADD_TEST (sigsuspend, 2, 0),
|
|
ADD_TEST (sigwait, 2, 0),
|
|
ADD_TEST (sigwaitinfo, 2, 0),
|
|
ADD_TEST (sigtimedwait, 2, 0),
|
|
ADD_TEST (pause, 2, 0),
|
|
ADD_TEST (accept, 2, 0),
|
|
ADD_TEST (send, 2, 0),
|
|
ADD_TEST (recv, 2, 0),
|
|
ADD_TEST (recvfrom, 2, 0),
|
|
ADD_TEST (recvmsg, 2, 0),
|
|
ADD_TEST (open, 2, 1),
|
|
ADD_TEST (close, 2, 1),
|
|
ADD_TEST (pread, 2, 1),
|
|
ADD_TEST (pwrite, 2, 1),
|
|
ADD_TEST (fsync, 2, 1),
|
|
ADD_TEST (msync, 2, 1),
|
|
ADD_TEST (sendto, 2, 1),
|
|
ADD_TEST (sendmsg, 2, 1),
|
|
ADD_TEST (creat, 2, 1),
|
|
ADD_TEST (connect, 2, 1),
|
|
ADD_TEST (tcdrain, 2, 1),
|
|
ADD_TEST (msgrcv, 2, 0),
|
|
ADD_TEST (msgsnd, 2, 1),
|
|
};
|
|
#define ntest_tf (sizeof (tests) / sizeof (tests[0]))
|
|
|
|
|
|
static int
|
|
do_test (void)
|
|
{
|
|
int val;
|
|
socklen_t len;
|
|
|
|
if (socketpair (AF_UNIX, SOCK_STREAM, PF_UNIX, fds) != 0)
|
|
{
|
|
perror ("socketpair");
|
|
exit (1);
|
|
}
|
|
|
|
val = 1;
|
|
len = sizeof(val);
|
|
setsockopt (fds[1], SOL_SOCKET, SO_SNDBUF, &val, sizeof(val));
|
|
if (getsockopt (fds[1], SOL_SOCKET, SO_SNDBUF, &val, &len) < 0)
|
|
{
|
|
perror ("getsockopt");
|
|
exit (1);
|
|
}
|
|
if (val >= WRITE_BUFFER_SIZE)
|
|
{
|
|
puts ("minimum write buffer size too large");
|
|
exit (1);
|
|
}
|
|
setsockopt (fds[1], SOL_SOCKET, SO_SNDBUF, &val, sizeof(val));
|
|
|
|
int result = 0;
|
|
size_t cnt;
|
|
for (cnt = 0; cnt < ntest_tf; ++cnt)
|
|
{
|
|
if (tests[cnt].only_early)
|
|
continue;
|
|
|
|
if (pthread_barrier_init (&b2, NULL, tests[cnt].nb) != 0)
|
|
{
|
|
puts ("b2 init failed");
|
|
exit (1);
|
|
}
|
|
|
|
/* Reset the counter for the cleanup handler. */
|
|
cl_called = 0;
|
|
|
|
pthread_t th;
|
|
if (pthread_create (&th, NULL, tests[cnt].tf, NULL) != 0)
|
|
{
|
|
printf ("create for '%s' test failed\n", tests[cnt].name);
|
|
result = 1;
|
|
continue;
|
|
}
|
|
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
result = 1;
|
|
continue;
|
|
}
|
|
|
|
struct timespec ts = { .tv_sec = 0, .tv_nsec = 100000000 };
|
|
while (nanosleep (&ts, &ts) != 0)
|
|
continue;
|
|
|
|
if (pthread_cancel (th) != 0)
|
|
{
|
|
printf ("cancel for '%s' failed\n", tests[cnt].name);
|
|
result = 1;
|
|
continue;
|
|
}
|
|
|
|
void *status;
|
|
if (pthread_join (th, &status) != 0)
|
|
{
|
|
printf ("join for '%s' failed\n", tests[cnt].name);
|
|
result = 1;
|
|
continue;
|
|
}
|
|
if (status != PTHREAD_CANCELED)
|
|
{
|
|
printf ("thread for '%s' not canceled\n", tests[cnt].name);
|
|
result = 1;
|
|
continue;
|
|
}
|
|
|
|
if (pthread_barrier_destroy (&b2) != 0)
|
|
{
|
|
puts ("barrier_destroy failed");
|
|
result = 1;
|
|
continue;
|
|
}
|
|
|
|
if (cl_called == 0)
|
|
{
|
|
printf ("cleanup handler not called for '%s'\n", tests[cnt].name);
|
|
result = 1;
|
|
continue;
|
|
}
|
|
if (cl_called > 1)
|
|
{
|
|
printf ("cleanup handler called more than once for '%s'\n",
|
|
tests[cnt].name);
|
|
result = 1;
|
|
continue;
|
|
}
|
|
|
|
printf ("in-time cancel test of '%s' successful\n", tests[cnt].name);
|
|
|
|
if (tempfd != -1)
|
|
{
|
|
close (tempfd);
|
|
tempfd = -1;
|
|
}
|
|
if (tempfd2 != -1)
|
|
{
|
|
close (tempfd2);
|
|
tempfd2 = -1;
|
|
}
|
|
if (tempfname != NULL)
|
|
{
|
|
unlink (tempfname);
|
|
free (tempfname);
|
|
tempfname = NULL;
|
|
}
|
|
if (tempmsg != -1)
|
|
{
|
|
msgctl (tempmsg, IPC_RMID, NULL);
|
|
tempmsg = -1;
|
|
}
|
|
}
|
|
|
|
for (cnt = 0; cnt < ntest_tf; ++cnt)
|
|
{
|
|
if (pthread_barrier_init (&b2, NULL, tests[cnt].nb) != 0)
|
|
{
|
|
puts ("b2 init failed");
|
|
exit (1);
|
|
}
|
|
|
|
/* Reset the counter for the cleanup handler. */
|
|
cl_called = 0;
|
|
|
|
pthread_t th;
|
|
if (pthread_create (&th, NULL, tests[cnt].tf, (void *) 1l) != 0)
|
|
{
|
|
printf ("create for '%s' test failed\n", tests[cnt].name);
|
|
result = 1;
|
|
continue;
|
|
}
|
|
|
|
int r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
result = 1;
|
|
continue;
|
|
}
|
|
|
|
if (pthread_cancel (th) != 0)
|
|
{
|
|
printf ("cancel for '%s' failed\n", tests[cnt].name);
|
|
result = 1;
|
|
continue;
|
|
}
|
|
|
|
r = pthread_barrier_wait (&b2);
|
|
if (r != 0 && r != PTHREAD_BARRIER_SERIAL_THREAD)
|
|
{
|
|
printf ("%s: barrier_wait failed\n", __FUNCTION__);
|
|
result = 1;
|
|
continue;
|
|
}
|
|
|
|
void *status;
|
|
if (pthread_join (th, &status) != 0)
|
|
{
|
|
printf ("join for '%s' failed\n", tests[cnt].name);
|
|
result = 1;
|
|
continue;
|
|
}
|
|
if (status != PTHREAD_CANCELED)
|
|
{
|
|
printf ("thread for '%s' not canceled\n", tests[cnt].name);
|
|
result = 1;
|
|
continue;
|
|
}
|
|
|
|
if (pthread_barrier_destroy (&b2) != 0)
|
|
{
|
|
puts ("barrier_destroy failed");
|
|
result = 1;
|
|
continue;
|
|
}
|
|
|
|
if (cl_called == 0)
|
|
{
|
|
printf ("cleanup handler not called for '%s'\n", tests[cnt].name);
|
|
result = 1;
|
|
continue;
|
|
}
|
|
if (cl_called > 1)
|
|
{
|
|
printf ("cleanup handler called more than once for '%s'\n",
|
|
tests[cnt].name);
|
|
result = 1;
|
|
continue;
|
|
}
|
|
|
|
printf ("early cancel test of '%s' successful\n", tests[cnt].name);
|
|
|
|
if (tempfd != -1)
|
|
{
|
|
close (tempfd);
|
|
tempfd = -1;
|
|
}
|
|
if (tempfd2 != -1)
|
|
{
|
|
close (tempfd2);
|
|
tempfd2 = -1;
|
|
}
|
|
if (tempfname != NULL)
|
|
{
|
|
unlink (tempfname);
|
|
free (tempfname);
|
|
tempfname = NULL;
|
|
}
|
|
if (tempmsg != -1)
|
|
{
|
|
msgctl (tempmsg, IPC_RMID, NULL);
|
|
tempmsg = -1;
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
#define TIMEOUT 60
|
|
#define TEST_FUNCTION do_test ()
|
|
#include "../test-skeleton.c"
|