*/
#include "system.h"
-
-#if defined(HAVE_PTHREAD_H) && !defined(__LCLINT__)
+
+#if defined(__LCLINT__)
+#define _BITS_SIGTHREAD_H /* XXX avoid __sigset_t heartburn. */
+
+/*@-incondefs -protoparammatch@*/
+/*@-exportheader@*/
+/*@constant int SA_SIGINFO@*/
+extern int sighold(int sig)
+ /*@globals errno, systemState @*/;
+extern int sigignore(int sig)
+ /*@globals errno, systemState @*/;
+extern int sigpause(int sig)
+ /*@globals errno, systemState @*/;
+extern int sigrelse(int sig)
+ /*@globals errno, systemState @*/;
+extern void (*sigset(int sig, void (*disp)(int)))(int)
+ /*@globals errno, systemState @*/;
+
+struct qelem;
+extern void insque(struct qelem * __elem, struct qelem * __prev)
+ /*@modifies __elem, __prev @*/;
+extern void remque(struct qelem * __elem)
+ /*@modifies __elem @*/;
+
+extern pthread_t pthread_self(void)
+ /*@*/;
+extern int pthread_equal(pthread_t t1, pthread_t t2)
+ /*@*/;
+
+extern int pthread_create(/*@out@*/ pthread_t *restrict thread,
+ const pthread_attr_t *restrict attr,
+ void *(*start_routine)(void*), void *restrict arg)
+ /*@modifies *thread @*/;
+extern int pthread_join(pthread_t thread, /*@out@*/ void **value_ptr)
+ /*@modifies *value_ptr @*/;
+
+extern int pthread_setcancelstate(int state, /*@out@*/ int *oldstate)
+ /*@globals internalState @*/
+ /*@modifies *oldstate, internalState @*/;
+extern int pthread_setcanceltype(int type, /*@out@*/ int *oldtype)
+ /*@globals internalState @*/
+ /*@modifies *oldtype, internalState @*/;
+extern void pthread_testcancel(void)
+ /*@globals internalState @*/
+ /*@modifies internalState @*/;
+extern void pthread_cleanup_pop(int execute)
+ /*@globals internalState @*/
+ /*@modifies internalState @*/;
+extern void pthread_cleanup_push(void (*routine)(void*), void *arg)
+ /*@globals internalState @*/
+ /*@modifies internalState @*/;
+extern void _pthread_cleanup_pop(/*@out@*/ struct _pthread_cleanup_buffer *__buffer, int execute)
+ /*@globals internalState @*/
+ /*@modifies internalState @*/;
+extern void _pthread_cleanup_push(/*@out@*/ struct _pthread_cleanup_buffer *__buffer, void (*routine)(void*), /*@out@*/ void *arg)
+ /*@globals internalState @*/
+ /*@modifies internalState @*/;
+
+extern int pthread_mutexattr_destroy(pthread_mutexattr_t *attr)
+ /*@globals errno, internalState @*/
+ /*@modifies *attr, errno, internalState @*/;
+extern int pthread_mutexattr_init(/*@out@*/ pthread_mutexattr_t *attr)
+ /*@globals errno, internalState @*/
+ /*@modifies *attr, errno, internalState @*/;
+
+int pthread_mutexattr_gettype(const pthread_mutexattr_t *restrict attr,
+ /*@out@*/ int *restrict type)
+ /*@modifies *type @*/;
+int pthread_mutexattr_settype(pthread_mutexattr_t *attr, int type)
+ /*@globals errno, internalState @*/
+ /*@modifies *attr, errno, internalState @*/;
+
+extern int pthread_mutex_destroy(pthread_mutex_t *mutex)
+ /*@modifies *mutex @*/;
+extern int pthread_mutex_init(/*@out@*/ pthread_mutex_t *restrict mutex,
+ /*@null@*/ const pthread_mutexattr_t *restrict attr)
+ /*@globals errno, internalState @*/
+ /*@modifies *mutex, errno, internalState @*/;
+
+extern int pthread_mutex_lock(pthread_mutex_t *mutex)
+ /*@globals errno @*/
+ /*@modifies *mutex, errno @*/;
+extern int pthread_mutex_trylock(pthread_mutex_t *mutex)
+ /*@globals errno @*/
+ /*@modifies *mutex, errno @*/;
+extern int pthread_mutex_unlock(pthread_mutex_t *mutex)
+ /*@globals errno @*/
+ /*@modifies *mutex, errno @*/;
+
+extern int pthread_cond_destroy(pthread_cond_t *cond)
+ /*@modifies *cond @*/;
+extern int pthread_cond_init(/*@out@*/ pthread_cond_t *restrict cond,
+ const pthread_condattr_t *restrict attr)
+ /*@globals errno, internalState @*/
+ /*@modifies *cond, errno, internalState @*/;
+
+extern int pthread_cond_timedwait(pthread_cond_t *restrict cond,
+ pthread_mutex_t *restrict mutex,
+ const struct timespec *restrict abstime)
+ /*@modifies *cond, *mutex @*/;
+extern int pthread_cond_wait(pthread_cond_t *restrict cond,
+ pthread_mutex_t *restrict mutex)
+ /*@modifies *cond, *mutex @*/;
+extern int pthread_cond_broadcast(pthread_cond_t *cond)
+ /*@globals errno, internalState @*/
+ /*@modifies *cond, errno, internalState @*/;
+extern int pthread_cond_signal(pthread_cond_t *cond)
+ /*@globals errno, internalState @*/
+ /*@modifies *cond, errno, internalState @*/;
+
+/*@=exportheader@*/
+/*@=incondefs =protoparammatch@*/
+#endif
+
+#include <signal.h>
+#include <sys/signal.h>
+#include <sys/wait.h>
+#include <search.h>
+
+#if defined(HAVE_PTHREAD_H)
#include <pthread.h>
+#ifndef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+/*@unchecked@*/
+static pthread_mutex_t rpmsigTbl_lock = PTHREAD_MUTEX_INITIALIZER;
+#else
+/*@unchecked@*/
+/*@-type@*/
+static pthread_mutex_t rpmsigTbl_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
+/*@=type@*/
+#endif
+
#define DO_LOCK() pthread_mutex_lock(&rpmsigTbl_lock);
#define DO_UNLOCK() pthread_mutex_unlock(&rpmsigTbl_lock);
#define INIT_LOCK() \
- { pthread_mutexattr_t attr; \
- pthread_mutexattr_init(&attr); \
- pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); \
- pthread_mutex_init (&rpmsigTbl_lock, &attr); \
- pthread_mutexattr_destroy(&attr); \
+ { pthread_mutexattr_t attr; \
+ (void) pthread_mutexattr_init(&attr); \
+ (void) pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); \
+ (void) pthread_mutex_init (&rpmsigTbl_lock, &attr); \
+ (void) pthread_mutexattr_destroy(&attr); \
rpmsigTbl_sigchld->active = 0; \
- }
+ }
#define ADD_REF(__tbl) (__tbl)->active++
#define SUB_REF(__tbl) --(__tbl)->active
#define CLEANUP_HANDLER(__handler, __arg, __oldtypeptr) \
- pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, (__oldtypeptr)); \
+ (void) pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, (__oldtypeptr));\
pthread_cleanup_push((__handler), (__arg));
#define CLEANUP_RESET(__execute, __oldtype) \
- pthread_cleanup_pop(__execute); \
- pthread_setcanceltype ((__oldtype), &(__oldtype));
+ pthread_cleanup_pop(__execute); \
+ (void) pthread_setcanceltype ((__oldtype), &(__oldtype));
#define SAME_THREAD(_a, _b) pthread_equal(((pthread_t)_a), ((pthread_t)_b))
#define DO_LOCK()
#define DO_UNLOCK()
#define INIT_LOCK()
-#define ADD_REF(__tbl)
-#define SUB_REF(__tbl)
+#define ADD_REF(__tbl) /*@-noeffect@*/ (0) /*@=noeffect@*/
+#define SUB_REF(__tbl) /*@-noeffect@*/ (0) /*@=noeffect@*/
#define CLEANUP_HANDLER(__handler, __arg, __oldtypeptr)
#define CLEANUP_RESET(__execute, __oldtype)
#define SAME_THREAD(_a, _b) (42)
-#define ME() (((void *))getpid())
+#define ME() (((void *)getpid()))
#endif /* HAVE_PTHREAD_H */
/*@unchecked@*/
static struct rpmsqElem rpmsqRock;
+
+/*@-compmempass@*/
/*@unchecked@*/
rpmsq rpmsqQueue = &rpmsqRock;
+/*@=compmempass@*/
int rpmsqInsert(void * elem, void * prev)
{
if (sq != NULL) {
#ifdef _RPMSQ_DEBUG
-/*@-modfilesys@*/
if (_rpmsq_debug)
fprintf(stderr, " Insert(%p): %p\n", ME(), sq);
-/*@=modfilesys@*/
#endif
ret = sighold(SIGCHLD);
if (ret == 0) {
sq->child = 0;
sq->reaped = 0;
sq->status = 0;
- sq->reaper = 1;
+ sq->reaper = 0;
+/*@-bounds@*/
sq->pipes[0] = sq->pipes[1] = -1;
+/*@=bounds@*/
sq->id = ME();
ret = pthread_mutex_init(&sq->mutex, NULL);
ret = pthread_cond_init(&sq->cond, NULL);
- insque(elem, (prev ? prev : rpmsqQueue));
+ insque(elem, (prev != NULL ? prev : rpmsqQueue));
ret = sigrelse(SIGCHLD);
}
}
if (elem != NULL) {
#ifdef _RPMSQ_DEBUG
-/*@-modfilesys@*/
if (_rpmsq_debug)
fprintf(stderr, " Remove(%p): %p\n", ME(), sq);
-/*@=modfilesys@*/
#endif
ret = sighold (SIGCHLD);
if (ret == 0) {
ret = pthread_cond_destroy(&sq->cond);
ret = pthread_mutex_destroy(&sq->mutex);
sq->id = NULL;
- if (sq->pipes[1]) close(sq->pipes[1]);
- if (sq->pipes[0]) close(sq->pipes[0]);
+/*@-bounds@*/
+ if (sq->pipes[1]) ret = close(sq->pipes[1]);
+ if (sq->pipes[0]) ret = close(sq->pipes[0]);
sq->pipes[0] = sq->pipes[1] = -1;
+/*@=bounds@*/
+#ifdef NOTYET /* rpmpsmWait debugging message needs */
sq->reaper = 1;
sq->status = 0;
sq->reaped = 0;
sq->child = 0;
+#endif
ret = sigrelse(SIGCHLD);
}
}
sigset_t rpmsqCaught;
/*@unchecked@*/
-static pthread_mutex_t rpmsigTbl_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
-
-/*@unchecked@*/
/*@-fullinitblock@*/
static struct rpmsig_s {
int signum;
- void (*handler) (int signum, siginfo_t * info, void * context);
+ void (*handler) (int signum, void * info, void * context);
int active;
struct sigaction oact;
} rpmsigTbl[] = {
};
/*@=fullinitblock@*/
-/*@-incondefs@*/
-void rpmsqAction(int signum, siginfo_t * info, void * context)
+void rpmsqAction(int signum,
+ /*@unused@*/ void * info, /*@unused@*/ void * context)
{
int save = errno;
rpmsig tbl;
}
errno = save;
}
-/*@=incondefs@*/
int rpmsqEnable(int signum, /*@null@*/ rpmsqAction_t handler)
+ /*@globals rpmsigTbl @*/
+ /*@modifies rpmsigTbl @*/
{
int tblsignum = (signum >= 0 ? signum : -signum);
struct sigaction sa;
rpmsig tbl;
int ret = -1;
- DO_LOCK ();
+ (void) DO_LOCK ();
if (rpmsqQueue->id == NULL)
rpmsqQueue->id = ME();
for (tbl = rpmsigTbl; tbl->signum >= 0; tbl++) {
if (signum >= 0) { /* Enable. */
if (ADD_REF(tbl) <= 0) {
(void) sigdelset(&rpmsqCaught, tbl->signum);
- sigemptyset (&sa.sa_mask);
+
+ /* XXX Don't set a signal handler if already SIG_IGN */
+ (void) sigaction(tbl->signum, NULL, &tbl->oact);
+ if (tbl->oact.sa_handler == SIG_IGN)
+ continue;
+
+ (void) sigemptyset (&sa.sa_mask);
sa.sa_flags = SA_SIGINFO;
+#if defined(__LCLINT__) /* XXX glibc has union to track handler prototype. */
+ sa.sa_handler = (handler != NULL ? handler : tbl->handler);
+#else
sa.sa_sigaction = (handler != NULL ? handler : tbl->handler);
+#endif
if (sigaction(tbl->signum, &sa, &tbl->oact) < 0) {
SUB_REF(tbl);
break;
ret = tbl->active;
break;
}
- DO_UNLOCK ();
+ (void) DO_UNLOCK ();
return ret;
}
if (sq->reaper) {
xx = rpmsqInsert(sq, NULL);
#ifdef _RPMSQ_DEBUG
-/*@-modfilesys@*/
if (_rpmsq_debug)
fprintf(stderr, " Enable(%p): %p\n", ME(), sq);
-/*@=modfilesys@*/
#endif
xx = rpmsqEnable(SIGCHLD, NULL);
}
pid = fork();
if (pid < (pid_t) 0) { /* fork failed. */
+/*@-bounds@*/
xx = close(sq->pipes[0]);
xx = close(sq->pipes[1]);
sq->pipes[0] = sq->pipes[1] = -1;
+/*@=bounds@*/
goto out;
} else if (pid == (pid_t) 0) { /* Child. */
int yy;
- /* Block to permit parent to wait. */
+ /* Block to permit parent time to wait. */
+/*@-bounds@*/
xx = close(sq->pipes[1]);
xx = read(sq->pipes[0], &yy, sizeof(yy));
xx = close(sq->pipes[0]);
sq->pipes[0] = sq->pipes[1] = -1;
+/*@=bounds@*/
#ifdef _RPMSQ_DEBUG
-/*@-modfilesys@*/
if (_rpmsq_debug)
fprintf(stderr, " Child(%p): %p child %d\n", ME(), sq, getpid());
-/*@=modfilesys@*/
#endif
} else { /* Parent. */
sq->child = pid;
#ifdef _RPMSQ_DEBUG
-/*@-modfilesys@*/
if (_rpmsq_debug)
fprintf(stderr, " Parent(%p): %p child %d\n", ME(), sq, sq->child);
-/*@=modfilesys@*/
#endif
- /* Unblock child. */
- xx = close(sq->pipes[0]);
- xx = close(sq->pipes[1]);
- sq->pipes[0] = sq->pipes[1] = -1;
-
}
out:
/**
* Wait for child process to be reaped, and unregister SIGCHLD handler.
+ * @todo Rewrite to use waitpid on helper thread.
* @param sq scriptlet queue element
* @return 0 on success
*/
static int rpmsqWaitUnregister(rpmsq sq)
/*@globals fileSystem, internalState @*/
- /*@modifies fileSystem, internalState @*/
+ /*@modifies sq, fileSystem, internalState @*/
{
- int same_thread = 0;
+ int nothreads = 0;
int ret = 0;
int xx;
- if (same_thread) ret = sighold(SIGCHLD);
+ /* Protect sq->reaped from handler changes. */
+ ret = sighold(SIGCHLD);
+
+ /* Initialize the cond var mutex. */
+ if (!nothreads)
+ ret = pthread_mutex_lock(&sq->mutex);
+
+ /* Start the child, linux often runs child before parent. */
+/*@-bounds@*/
+ if (sq->pipes[0] >= 0)
+ xx = close(sq->pipes[0]);
+ if (sq->pipes[1] >= 0)
+ xx = close(sq->pipes[1]);
+ sq->pipes[0] = sq->pipes[1] = -1;
+/*@=bounds@*/
+
+ /* Put a stopwatch on the time spent waiting to measure performance gain. */
+ (void) rpmswEnter(&sq->op, -1);
+ /* Wait for handler to receive SIGCHLD. */
/*@-infloops@*/
while (ret == 0 && sq->reaped != sq->child) {
- if (same_thread) {
+ if (nothreads)
+ /* Note that sigpause re-enables SIGCHLD. */
ret = sigpause(SIGCHLD);
- } else {
- ret = pthread_mutex_lock(&sq->mutex);
+ else {
+ xx = sigrelse(SIGCHLD);
ret = pthread_cond_wait(&sq->cond, &sq->mutex);
- xx = pthread_mutex_unlock(&sq->mutex);
+ xx = sighold(SIGCHLD);
}
}
/*@=infloops@*/
- if (same_thread) xx = sigrelse(SIGCHLD);
+ /* Accumulate stopwatch time spent waiting, potential performance gain. */
+ sq->ms_scriptlets += rpmswExit(&sq->op, -1)/1000;
+
+ /* Tear down cond var mutex, our child has been reaped. */
+ if (!nothreads)
+ xx = pthread_mutex_unlock(&sq->mutex);
+ xx = sigrelse(SIGCHLD);
#ifdef _RPMSQ_DEBUG
-/*@-modfilesys@*/
if (_rpmsq_debug)
fprintf(stderr, " Wake(%p): %p child %d reaper %d ret %d\n", ME(), sq, sq->child, sq->reaper, ret);
-/*@=modfilesys@*/
#endif
+ /* Remove processed SIGCHLD item from queue. */
xx = rpmsqRemove(sq);
+
+ /* Disable SIGCHLD handler on refcount == 0. */
xx = rpmsqEnable(-SIGCHLD, NULL);
#ifdef _RPMSQ_DEBUG
-/*@-modfilesys@*/
if (_rpmsq_debug)
fprintf(stderr, " Disable(%p): %p\n", ME(), sq);
-/*@=modfilesys@*/
#endif
return ret;
{
#ifdef _RPMSQ_DEBUG
-/*@-modfilesys@*/
if (_rpmsq_debug)
fprintf(stderr, " Wait(%p): %p child %d reaper %d\n", ME(), sq, sq->child, sq->reaper);
-/*@=modfilesys@*/
#endif
if (sq->reaper) {
sq->reaped = reaped;
sq->status = status;
#ifdef _RPMSQ_DEBUG
-/*@-modfilesys@*/
if (_rpmsq_debug)
fprintf(stderr, " Waitpid(%p): %p child %d reaped %d\n", ME(), sq, sq->child, sq->reaped);
-/*@=modfilesys@*/
#endif
}
#ifdef _RPMSQ_DEBUG
-/*@-modfilesys@*/
if (_rpmsq_debug)
fprintf(stderr, " Fini(%p): %p child %d status 0x%x\n", ME(), sq, sq->child, sq->status);
-/*@=modfilesys@*/
#endif
return sq->reaped;
}
-int rpmsqThread(void * (*start) (void * arg), void * arg)
+void * rpmsqThread(void * (*start) (void * arg), void * arg)
{
pthread_t pth;
int ret;
ret = pthread_create(&pth, NULL, start, arg);
- if (ret == 0) {
-#if 0
-fprintf(stderr, " Thread(%p): %p\n", ME(), pth);
-#endif
- ret = pthread_join(pth, NULL);
- }
- return ret;
+ return (ret == 0 ? (void *)pth : NULL);
+}
+
+int rpmsqJoin(void * thread)
+{
+ pthread_t pth = (pthread_t) thread;
+ if (thread == NULL)
+ return EINVAL;
+ return pthread_join(pth, NULL);
+}
+
+int rpmsqThreadEqual(void * thread)
+{
+ pthread_t t1 = (pthread_t) thread;
+ pthread_t t2 = pthread_self();
+ return pthread_equal(t1, t2);
}
/**
*/
static void
sigchld_cancel (void *arg)
+ /*@globals rpmsigTbl, fileSystem, internalState @*/
+ /*@modifies rpmsigTbl, fileSystem, internalState @*/
{
pid_t child = *(pid_t *) arg;
pid_t result;
result = waitpid(child, NULL, 0);
} while (result == (pid_t)-1 && errno == EINTR);
- DO_LOCK ();
+ (void) DO_LOCK ();
if (SUB_REF (rpmsigTbl_sigchld) == 0) {
(void) rpmsqEnable(-SIGQUIT, NULL);
(void) rpmsqEnable(-SIGINT, NULL);
}
- DO_UNLOCK ();
+ (void) DO_UNLOCK ();
}
/**
*/
int
rpmsqExecve (const char ** argv)
+ /*@globals rpmsigTbl @*/
+ /*@modifies rpmsigTbl @*/
{
int oldtype;
int status = -1;
- pid_t pid;
+ pid_t pid = 0;
pid_t result;
sigset_t newMask, oldMask;
rpmsq sq = memset(alloca(sizeof(*sq)), 0, sizeof(*sq));
- DO_LOCK ();
+#ifndef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+ INIT_LOCK ();
+#endif
+
+ (void) DO_LOCK ();
if (ADD_REF (rpmsigTbl_sigchld) == 0) {
if (rpmsqEnable(SIGINT, NULL) < 0) {
SUB_REF (rpmsigTbl_sigchld);
goto out_restore_sigint;
}
}
- DO_UNLOCK ();
+ (void) DO_UNLOCK ();
- sigemptyset (&newMask);
- sigaddset (&newMask, SIGCHLD);
+ (void) sigemptyset (&newMask);
+ (void) sigaddset (&newMask, SIGCHLD);
if (sigprocmask (SIG_BLOCK, &newMask, &oldMask) < 0) {
- DO_LOCK ();
+ (void) DO_LOCK ();
if (SUB_REF (rpmsigTbl_sigchld) == 0)
goto out_restore_sigquit_and_sigint;
goto out;
CLEANUP_RESET(0, oldtype);
- DO_LOCK ();
+ (void) DO_LOCK ();
if ((SUB_REF (rpmsigTbl_sigchld) == 0 &&
(rpmsqEnable(-SIGINT, NULL) < 0 || rpmsqEnable (-SIGQUIT, NULL) < 0))
|| sigprocmask (SIG_SETMASK, &oldMask, NULL) != 0)
out_restore_sigint:
(void) rpmsqEnable(-SIGINT, NULL);
out:
- DO_UNLOCK ();
+ (void) DO_UNLOCK ();
return status;
}
projects / platform / upstream / rpm.git / blobdiff