- macosx: change to --prefix=/usr rather than /opt/local.

[platform/upstream/rpm.git] / rpmio / rpmsq.c

diff --git a/rpmio/rpmsq.c b/rpmio/rpmsq.c
index 8d05caa..c49e9cd 100644 (file)
--- a/rpmio/rpmsq.c
+++ b/rpmio/rpmsq.c
@@ -126,10 +126,15 @@ extern int pthread_cond_signal(pthread_cond_t *cond)
 
 #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);
@@ -147,7 +152,7 @@ static pthread_mutex_t rpmsigTbl_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
     (void) pthread_setcanceltype (PTHREAD_CANCEL_ASYNCHRONOUS, (__oldtypeptr));\
        pthread_cleanup_push((__handler), (__arg));
 #define        CLEANUP_RESET(__execute, __oldtype) \
-    (void) pthread_cleanup_pop(__execute); \
+    pthread_cleanup_pop(__execute); \
     (void) pthread_setcanceltype ((__oldtype), &(__oldtype));
 
 #define        SAME_THREAD(_a, _b)     pthread_equal(((pthread_t)_a), ((pthread_t)_b))
@@ -201,7 +206,7 @@ fprintf(stderr, "    Insert(%p): %p\n", ME(), sq);
            sq->child = 0;
            sq->reaped = 0;
            sq->status = 0;
-           sq->reaper = 1;
+           sq->reaper = 0;
 /*@-bounds@*/
            sq->pipes[0] = sq->pipes[1] = -1;
 /*@=bounds@*/
@@ -341,15 +346,23 @@ int rpmsqEnable(int signum, /*@null@*/ rpmsqAction_t handler)
        if (signum >= 0) {                      /* Enable. */
            if (ADD_REF(tbl) <= 0) {
                (void) sigdelset(&rpmsqCaught, tbl->signum);
+
+               /* 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);
-/*@-compdef -type @*/
                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;
                }
-/*@=compdef =type @*/
                tbl->active = 1;                /* XXX just in case */
                if (handler != NULL)
                    tbl->handler = handler;
@@ -398,7 +411,7 @@ fprintf(stderr, "    Enable(%p): %p\n", ME(), sq);
     } 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));
@@ -429,6 +442,7 @@ 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
  */
@@ -436,16 +450,18 @@ static int rpmsqWaitUnregister(rpmsq sq)
        /*@globals fileSystem, internalState @*/
        /*@modifies sq, fileSystem, internalState @*/
 {
-    int same_thread = 0;
+    int nothreads = 0;
     int ret = 0;
     int xx;
 
-    if (same_thread)
-       ret = sighold(SIGCHLD);
-    else
+    /* 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. */
+    /* Start the child, linux often runs child before parent. */
 /*@-bounds@*/
     if (sq->pipes[0] >= 0)
        xx = close(sq->pipes[0]);
@@ -454,30 +470,40 @@ static int rpmsqWaitUnregister(rpmsq sq)
     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
+       else {
+           xx = sigrelse(SIGCHLD);
            ret = pthread_cond_wait(&sq->cond, &sq->mutex);
+           xx = sighold(SIGCHLD);
+       }
     }
     /*@=infloops@*/
 
+    /* Accumulate stopwatch time spent waiting, potential performance gain. */
     sq->ms_scriptlets += rpmswExit(&sq->op, -1)/1000;
 
-    if (same_thread)
-       xx = sigrelse(SIGCHLD);
-    else
+    /* Tear down cond var mutex, our child has been reaped. */
+    if (!nothreads)
        xx = pthread_mutex_unlock(&sq->mutex);
+    xx = sigrelse(SIGCHLD);
 
 #ifdef _RPMSQ_DEBUG
 if (_rpmsq_debug)
 fprintf(stderr, "      Wake(%p): %p child %d reaper %d ret %d\n", ME(), sq, sq->child, sq->reaper, ret);
 #endif
 
+    /* Remove processed SIGCHLD item from queue. */
     xx = rpmsqRemove(sq);
+
+    /* Disable SIGCHLD handler on refcount == 0. */
     xx = rpmsqEnable(-SIGCHLD, NULL);
 #ifdef _RPMSQ_DEBUG
 if (_rpmsq_debug)
@@ -583,6 +609,10 @@ rpmsqExecve (const char ** argv)
     sigset_t newMask, oldMask;
     rpmsq sq = memset(alloca(sizeof(*sq)), 0, sizeof(*sq));
 
+#ifndef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+       INIT_LOCK ();
+#endif
+
     (void) DO_LOCK ();
     if (ADD_REF (rpmsigTbl_sigchld) == 0) {
        if (rpmsqEnable(SIGINT, NULL) < 0) {