shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

test: Only force an IO sync when the testcase has finished.

Browse Source
This commit is contained in:
Petr Rockai 2014-10-01 11:27:44 +02:00
parent 72ee3f920b
commit c96e42006d
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
test/lib/brick-shelltest.h
View File

@ -339,7 +339,7 @@ struct TimedBuffer {
struct Sink {
virtual void outline( bool ) {}
virtual void push( std::string x ) = 0;
virtual void sync() {}
virtual void sync( bool ) {}
virtual ~Sink() {}
};
@ -410,11 +410,11 @@ struct FdSink : Sink {
write( fd, out.c_str(), out.length() );
}
virtual void sync() {
virtual void sync( bool force ) {
if ( killed )
return;
while ( !stream.empty( true ) )
outline( true );
while ( !stream.empty( force ) )
outline( force );
}
virtual void push( std::string x ) {
@ -429,13 +429,13 @@ struct FileSink : FdSink {
std::string file;
FileSink( std::string n ) : FdSink( -1 ), file( n ) {}
void sync() {
void sync( bool force ) {
if ( fd < 0 && !killed ) {
fd = open( file.c_str(), O_WRONLY | O_CREAT | O_TRUNC | O_CLOEXEC, 0644 );
if ( fd < 0 )
killed = true;
}
FdSink::sync();
FdSink::sync( force );
}
~FileSink() {
@ -561,12 +561,12 @@ struct IO : Sink {
(*i)->push( x );
}
void sync() {
void sync( bool force ) {
for ( Sources::iterator i = sources.begin(); i != sources.end(); ++i )
(*i)->sync( this );
for ( Sinks::iterator i = sinks.begin(); i != sinks.end(); ++i )
(*i)->sync();
(*i)->sync( force );
}
void close() {
@ -717,7 +717,7 @@ struct TestCase {
}
if ( wait4(pid, &status, WNOHANG, &usage) != 0 ) {
io.sync();
io.sync( true );
return false;
}
@ -732,7 +732,7 @@ struct TestCase {
waitpid( pid, &status, 0 );
}
timeout = true;
io.sync();
io.sync( true );
return false;
}
@ -755,7 +755,7 @@ struct TestCase {
if ( select( nfds, &set, NULL, NULL, &wait ) > 0 )
silent_start = end; /* something happened */
io.sync();
io.sync( false );
return true;
}