09b6455432
* configure.ac: Require libgpg-error 1.17. No longer check for pthread. * doc/gpgme.texi: Document removed neccessity for thread safe gpgme flavours. * src/sema.h (DEFINE_GLOBAL_LOCK), (DEFINE_STATIC_LOCK, INIT_LOCK, DECLARE_LOCK) (DESTROY_LOCK, LOCK, UNLOCK): Change to gpgrt equivalents. * src/posix-sema.c, src/w32-sema.c: Removed. * src/Makefile.am: Remove libpthread and Update accordingly. * src/ath.c, src/ath.h (ath_mutex_init) (ath_mutex_destroy, ath_mutex_lock, ath_mutex_unlock): Removed. * src/ath.h (ATH_MUTEX_INITIALIZER): Removed. * src/version.c (do_subsystem_inits): sema_subsystem_init is no longer required. * tests/gpg/Makefile.am: Add new threading tests. (t_thread1_LDADD, t_cancel_LDADD): Use just gpgme. * tests/gpg/t-thread-keylist-verify.c, tests/gpg/t-thread-keylist.c: New. * src/gpgme-config.in: Use -lgpgme for thread-model pthread. -- Using gpgrt locks instead of pthread locks removes the neccessity to link pthread directly to gpgme and have a different, thread safe flavor of gpgme. Now gpgme is thread-safe if the conditions mentioned in the doc are met. As the cpp bindings linked against libgpgme and not libgpgme-pthread this fixes threading problems with them. libgpgme-pthread is removed but gpgme-config still supports --thread=pthread for compatibility with find scripts.
89 lines
2.8 KiB
C
89 lines
2.8 KiB
C
/* ath.h - Interfaces for thread-safeness library.
|
||
Copyright (C) 2002, 2003, 2004 g10 Code GmbH
|
||
|
||
This file is part of GPGME.
|
||
|
||
GPGME 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.
|
||
|
||
GPGME is distributed in the hope that it will be useful, but
|
||
WITHOUT ANY WARRANTY; without even the implied warranty of
|
||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||
Lesser General Public License for more details.
|
||
|
||
You should have received a copy of the GNU Lesser General Public
|
||
License along with this program; if not, write to the Free Software
|
||
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
|
||
02111-1307, USA. */
|
||
|
||
#ifndef ATH_H
|
||
#define ATH_H
|
||
|
||
#ifdef HAVE_STDINT_H
|
||
#include <stdint.h>
|
||
#endif
|
||
#ifdef HAVE_W32_SYSTEM
|
||
/* fixme: Check how we did it in libgcrypt. */
|
||
struct msghdr { int dummy; };
|
||
typedef int socklen_t;
|
||
# if defined(HAVE_W32CE_SYSTEM) && defined(_MSC_VER)
|
||
# include <winsock2.h>
|
||
# endif
|
||
# include <windows.h>
|
||
# include <io.h>
|
||
|
||
#else /*!HAVE_W32_SYSTEM*/
|
||
|
||
# ifdef HAVE_SYS_SELECT_H
|
||
# include <sys/select.h>
|
||
# else
|
||
# ifdef HAVE_SYS_TIME_H
|
||
# include <sys/time.h>
|
||
# endif
|
||
# endif
|
||
# ifdef HAVE_SYS_TYPES_H
|
||
# include <sys/types.h>
|
||
# endif
|
||
# include <sys/socket.h>
|
||
|
||
#endif /*!HAVE_W32_SYSTEM*/
|
||
|
||
|
||
|
||
/* Define _ATH_EXT_SYM_PREFIX if you want to give all external symbols
|
||
a prefix. */
|
||
#define _ATH_EXT_SYM_PREFIX _gpgme_
|
||
|
||
#ifdef _ATH_EXT_SYM_PREFIX
|
||
#define _ATH_PREFIX1(x,y) x ## y
|
||
#define _ATH_PREFIX2(x,y) _ATH_PREFIX1(x,y)
|
||
#define _ATH_PREFIX(x) _ATH_PREFIX2(_ATH_EXT_SYM_PREFIX,x)
|
||
#define ath_read _ATH_PREFIX(ath_read)
|
||
#define ath_write _ATH_PREFIX(ath_write)
|
||
#define ath_select _ATH_PREFIX(ath_select)
|
||
#define ath_waitpid _ATH_PREFIX(ath_waitpid)
|
||
#define ath_connect _ATH_PREFIX(ath_connect)
|
||
#define ath_accept _ATH_PREFIX(ath_accept)
|
||
#define ath_sendmsg _ATH_PREFIX(ath_sendmsg)
|
||
#define ath_recvmsg _ATH_PREFIX(ath_recvmsg)
|
||
#endif
|
||
|
||
|
||
uintptr_t ath_self (void);
|
||
|
||
/* Replacement for the POSIX functions, which can be used to allow
|
||
other (user-level) threads to run. */
|
||
gpgme_ssize_t ath_read (int fd, void *buf, size_t nbytes);
|
||
gpgme_ssize_t ath_write (int fd, const void *buf, size_t nbytes);
|
||
gpgme_ssize_t ath_select (int nfd, fd_set *rset, fd_set *wset, fd_set *eset,
|
||
struct timeval *timeout);
|
||
gpgme_ssize_t ath_waitpid (pid_t pid, int *status, int options);
|
||
int ath_accept (int s, struct sockaddr *addr, socklen_t *length_ptr);
|
||
int ath_connect (int s, const struct sockaddr *addr, socklen_t length);
|
||
int ath_sendmsg (int s, const struct msghdr *msg, int flags);
|
||
int ath_recvmsg (int s, struct msghdr *msg, int flags);
|
||
|
||
#endif /* ATH_H */
|