fly/terragear
1
0
Fork 0
Code Activity

Merge commit 'hypersphere-rgerlich/master'

Browse source
This commit is contained in:
Ralf Gerlich 2008-01-03 13:25:03 +01:00
commit 4ff56cacf3
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/BuildTiles/Parallel/client.cxx
View file

@ -159,7 +159,7 @@ long int get_next_task( const string& host, int port, long int last_tile ) {
FD_SET(sock, &ready); FD_SET(sock, &ready);
// block until input from sock // block until input from sock
select(32, &ready, 0, 0, NULL); select(sock+1, &ready, 0, 0, NULL);
cout << " received reply" << endl; cout << " received reply" << endl;
if ( FD_ISSET(sock, &ready) ) { if ( FD_ISSET(sock, &ready) ) {
@ -239,10 +239,12 @@ static bool must_generate( const SGBucket& b ) {
} }
if ( have_btg && src_stat.st_mtime>btg_stat.st_mtime ) { if ( have_btg && src_stat.st_mtime>btg_stat.st_mtime ) {
cout << " File " << file << " is newer than btg-file => rebuild\n"; cout << " File " << file << " is newer than btg-file => rebuild\n";
closedir(loaddir);
return true; return true;
} }
if ( have_stg && src_stat.st_mtime>stg_stat.st_mtime ) { if ( have_stg && src_stat.st_mtime>stg_stat.st_mtime ) {
cout << " File " << file << " is newer than stg-file => rebuild\n"; cout << " File " << file << " is newer than stg-file => rebuild\n";
closedir(loaddir);
return true; return true;
} }
/* Ignore elevation data, as it is not used if we have no /* Ignore elevation data, as it is not used if we have no
@ -253,6 +255,7 @@ static bool must_generate( const SGBucket& b ) {
continue; continue;
if ( !(have_stg && have_btg) ) { if ( !(have_stg && have_btg) ) {
cout << " There is source-data (" << file << ") for tile " << b.gen_index_str() << " but .btg or .stg is missing => build\n"; cout << " There is source-data (" << file << ") for tile " << b.gen_index_str() << " but .btg or .stg is missing => build\n";
closedir(loaddir);
return true; return true;
} }
} }
@ -286,6 +289,10 @@ bool construct_tile( const SGBucket& b,
system( command.c_str() ); system( command.c_str() );
FILE *fp = fopen( result_file.c_str(), "r" ); FILE *fp = fopen( result_file.c_str(), "r" );
if ( fp == NULL) {
cout << "Missing results file " << result_file << endl;
return false;
}
char line[256]; char line[256];
while ( fgets( line, 256, fp ) != NULL ) { while ( fgets( line, 256, fp ) != NULL ) {
string line_str = line; string line_str = line;

3
src/BuildTiles/Parallel/server.cxx
View file

@ -364,7 +364,7 @@ int main( int argc, char **argv ) {
FD_SET(sock, &ready); FD_SET(sock, &ready);
// block until we get some input on sock // block until we get some input on sock
select(32, &ready, 0, 0, NULL); select(sock+1, &ready, 0, 0, NULL);
if ( FD_ISSET(sock, &ready) ) { if ( FD_ISSET(sock, &ready) ) {
// printf("%d %d Incomming message --> ", getpid(), pid); // printf("%d %d Incomming message --> ", getpid(), pid);
@ -409,6 +409,7 @@ int main( int argc, char **argv ) {
} }
} else { } else {
// This is the child // This is the child
close(sock);
// cout << "new process started to handle new connection for " // cout << "new process started to handle new connection for "
// << next_tile << endl; // << next_tile << endl;