Commit 94f1dae6 authored by Geoff Simmons's avatar Geoff Simmons

trackrdrd: fixed bug in the queue full wait condition

           fixed cksum in regression test
parent 28ff7f06
...@@ -22,7 +22,7 @@ CMD="../trackrdrd -D -f varnish.binlog -l - -d -c test.conf" ...@@ -22,7 +22,7 @@ CMD="../trackrdrd -D -f varnish.binlog -l - -d -c test.conf"
# the user running it # the user running it
CKSUM=$( $CMD | sed -e 's/\(initializing\) \(.*\)/\1/' | sed -e 's/\(Running as\) \([a-zA-Z0-9]*\)$/\1/' | grep -v 'Not running as root' | cksum) CKSUM=$( $CMD | sed -e 's/\(initializing\) \(.*\)/\1/' | sed -e 's/\(Running as\) \([a-zA-Z0-9]*\)$/\1/' | grep -v 'Not running as root' | cksum)
if [ "$CKSUM" != '1675646904 232318' ]; then if [ "$CKSUM" != '2764833651 232316' ]; then
echo "ERROR: Regression test incorrect cksum: $CKSUM" echo "ERROR: Regression test incorrect cksum: $CKSUM"
exit 1 exit 1
fi fi
......
...@@ -122,7 +122,7 @@ submit(unsigned xid) ...@@ -122,7 +122,7 @@ submit(unsigned xid)
tbl.wait_qfull++; tbl.wait_qfull++;
LOG_Log(LOG_ALERT, "%s", "Internal queue full, waiting for dequeue"); LOG_Log(LOG_ALERT, "%s", "Internal queue full, waiting for dequeue");
AZ(pthread_mutex_lock(&spmcq_nonfull_lock)); AZ(pthread_mutex_lock(&spmcq_nonfull_lock));
AZ(pthread_cond_wait(&spmcq_nonfull_cond, &spmcq_nonempty_lock)); AZ(pthread_cond_wait(&spmcq_nonfull_cond, &spmcq_nonfull_lock));
} }
AZ(pthread_cond_signal(&spmcq_nonempty_cond)); AZ(pthread_cond_signal(&spmcq_nonempty_cond));
tbl.submitted++; tbl.submitted++;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment