OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=1

2006-12-18 23:17:44 +00:00
commit 3c349e9165
100 changed files with 10986 additions and 0 deletions
--- a/sqcondmutex.diff
+++ b/sqcondmutex.diff
@@ -0,0 +1,119 @@
+Backported fix. AFAIK needed for smart.
+
+Index: rpmio/rpmsq.c
+===================================================================
+--- rpmio/rpmsq.c.orig
+++ rpmio/rpmsq.c
+@@ -218,7 +218,6 @@ fprintf(stderr, "    Insert(%p): %p\n", 
+ 
+ 	    sq->id = ME();
+ 	    ret = pthread_mutex_init(&sq->mutex, NULL);
+-	    ret = pthread_cond_init(&sq->cond, NULL);
+ 	    insque(elem, (prev != NULL ? prev : rpmsqQueue));
+ 	    ret = sigrelse(SIGCHLD);
+ 	}
+@@ -240,8 +239,11 @@ fprintf(stderr, "    Remove(%p): %p\n", 
+ 	ret = sighold (SIGCHLD);
+ 	if (ret == 0) {
+ 	    remque(elem);
+-	    ret = pthread_cond_destroy(&sq->cond);
+-	    ret = pthread_mutex_destroy(&sq->mutex);
+	   
+	    /* Unlock the mutex and then destroy it */ 
+	    if((ret = pthread_mutex_unlock(&sq->mutex)) == 0)
+		ret = pthread_mutex_destroy(&sq->mutex);
+
+ 	    sq->id = NULL;
+ /*@-bounds@*/
+ 	    if (sq->pipes[1])	ret = close(sq->pipes[1]);
+@@ -315,11 +317,20 @@ void rpmsqAction(int signum,
+ 		     sq != NULL && sq != rpmsqQueue;
+ 		     sq = sq->q_forw)
+ 		{
+		    int ret;
+
+ 		    if (sq->child != reaped)
+ 			/*@innercontinue@*/ continue;
+ 		    sq->reaped = reaped;
+ 		    sq->status = status;
+-		    (void) pthread_cond_signal(&sq->cond);
+
+		    /* Unlock the mutex.  The waiter will then be able to 
+		     * aquire the lock.  
+		     *
+		     * XXX: jbj, wtd, if this fails? 
+		     */
+		    ret = pthread_mutex_unlock(&sq->mutex); 
+
+ 		    /*@innerbreak@*/ break;
+ 		}
+ 	    }
+@@ -391,6 +402,7 @@ pid_t rpmsqFork(rpmsq sq)
+ {
+     pid_t pid;
+     int xx;
+    int nothreads = 0;   /* XXX: Shouldn't this be a global? */
+ 
+     if (sq->reaper) {
+ 	xx = rpmsqInsert(sq, NULL);
+@@ -405,6 +417,24 @@ fprintf(stderr, "    Enable(%p): %p\n", 
+ 
+     xx = sighold(SIGCHLD);
+ 
+    /* 
+     * Initialize the cond var mutex.   We have to aquire the lock we 
+     * use for the condition before we fork.  Otherwise it is possible for
+     * the child to exit, we get sigchild and the sig handler to send 
+     * the condition signal before we are waiting on the condition.
+     */
+    if (!nothreads) {
+	if(pthread_mutex_lock(&sq->mutex)) {
+	    /* Yack we did not get the lock, lets just give up */
+/*@-bounds@*/
+	    xx = close(sq->pipes[0]);
+	    xx = close(sq->pipes[1]);
+	    sq->pipes[0] = sq->pipes[1] = -1;
+/*@=bounds@*/
+	    goto out;
+	}
+    }
+
+     pid = fork();
+     if (pid < (pid_t) 0) {		/* fork failed.  */
+ 	sq->child = (pid_t)-1;
+@@ -463,10 +493,6 @@ static int rpmsqWaitUnregister(rpmsq sq)
+     /* 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)
+@@ -487,7 +513,13 @@ static int rpmsqWaitUnregister(rpmsq sq)
+ 	    ret = sigpause(SIGCHLD);
+ 	else {
+ 	    xx = sigrelse(SIGCHLD);
+-	    ret = pthread_cond_wait(&sq->cond, &sq->mutex);
+	    
+	    /* 
+	     * We start before the fork with this mutex locked;
+	     * The only one that unlocks this the signal handler.
+	     * So if we get the lock the child has been reaped.
+	     */
+	    ret = pthread_mutex_lock(&sq->mutex);
+ 	    xx = sighold(SIGCHLD);
+ 	}
+     }
+@@ -496,9 +528,6 @@ static int rpmsqWaitUnregister(rpmsq sq)
+     /* 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