mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-22 17:35:59 +03:00
Hotfix to stop harness busylooping
Harness seems to be able to busyloop in while cycle and not moving forward for certain buffer - so check whethere there was some progress. This fix allows to continue after failed cluster test. Fix gcc warning for hiding global variable 's' -> sig.
This commit is contained in:
parent
a8de276520
commit
d044827d9a
@ -54,10 +54,10 @@ static struct subst subst[2];
|
||||
#define FAILED 2
|
||||
#define WARNED 3
|
||||
|
||||
static void handler( int s ) {
|
||||
signal( s, SIG_DFL );
|
||||
kill( pid, s );
|
||||
die = s;
|
||||
static void handler( int sig ) {
|
||||
signal( sig, SIG_DFL );
|
||||
kill( pid, sig );
|
||||
die = sig;
|
||||
}
|
||||
|
||||
static int outline(char *buf, int start, int force) {
|
||||
@ -110,10 +110,12 @@ static int outline(char *buf, int start, int force) {
|
||||
}
|
||||
|
||||
static void dump(void) {
|
||||
int counter = 0;
|
||||
int counter_last, counter = 0;
|
||||
|
||||
while ( counter < readbuf_used )
|
||||
counter = outline( readbuf, counter, 1 );
|
||||
while ( counter < readbuf_used && counter != counter_last ) {
|
||||
counter_last = counter;
|
||||
counter = outline( readbuf, counter, 1 );
|
||||
}
|
||||
}
|
||||
|
||||
static void clear(void) {
|
||||
|
Loading…
Reference in New Issue
Block a user