projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
build version update
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
renderfarmclient.C
diff --git
a/cinelerra-5.1/cinelerra/renderfarmclient.C
b/cinelerra-5.1/cinelerra/renderfarmclient.C
index 7a3507a87f0e5e988e332f202e6917669070b3a8..24eee2a6af6cf970fc5ff6d99e4278dd2885cc83 100644
(file)
--- a/
cinelerra-5.1/cinelerra/renderfarmclient.C
+++ b/
cinelerra-5.1/cinelerra/renderfarmclient.C
@@
-552,10
+552,12
@@
void RenderFarmClientThread::run()
// Get the pid of the fork if inside the fork
pid = getpid();
BC_Signals::set_trap_hook(trap_hook, this);
// Get the pid of the fork if inside the fork
pid = getpid();
BC_Signals::set_trap_hook(trap_hook, this);
+ TheList::reset();
int socket_fd = this->socket_fd;
int socket_fd = this->socket_fd;
-
- init_client_keepalive();
+ int watchdog_timeout = client->boot_preferences->renderfarm_watchdog_timeout;
+ if( watchdog_timeout > 0 )
+ init_client_keepalive(watchdog_timeout);
// Get command to run
int command;
// Get command to run
int command;
@@
-579,11
+581,11
@@
void RenderFarmClientThread::run()
}
}
-void RenderFarmClientThread::init_client_keepalive()
+void RenderFarmClientThread::init_client_keepalive(
int timeout_secs
)
{
keep_alive = new RenderFarmKeepalive(this);
keep_alive->start();
{
keep_alive = new RenderFarmKeepalive(this);
keep_alive->start();
- watchdog = new RenderFarmWatchdog(0, this);
+ watchdog = new RenderFarmWatchdog(
timeout_secs,
0, this);
watchdog->start();
}
watchdog->start();
}
@@
-711,8
+713,7
@@
void RenderFarmKeepalive::run()
enable_cancel();
sleep(5);
disable_cancel();
enable_cancel();
sleep(5);
disable_cancel();
- if(!done)
- {
+ if( !done ) {
//printf("RenderFarmKeepalive::run 1\n");
// watchdog thread kills this if it gets stuck
client_thread->ping_server();
//printf("RenderFarmKeepalive::run 1\n");
// watchdog thread kills this if it gets stuck
client_thread->ping_server();