[Sumover-dev] [svn commit] r4135 - rat/trunk

[sumover-dev at cs.ucl.ac.uk]

Author: piers
Date: Thu Apr  3 19:28:28 2008
New Revision: 4135

Modified:
   rat/trunk/main_control.c
   rat/trunk/main_engine.c
   rat/trunk/main_ui.c

Log:
Tweaked timeout limits down to 20 secs - we may need to play with these.
Also removed a test Sleep() [windows only] call.

Modified: rat/trunk/main_control.c
==============================================================================
--- rat/trunk/main_control.c	(original)
+++ rat/trunk/main_control.c	Thu Apr  3 19:28:28 2008
@@ -511,7 +511,7 @@
 	if (ui_enabled) {
 		token_u[0] = generate_token();
 		fork_process(UI_NAME, c_addr, &pid_ui, 1, token_u);
-                if ((u_addr = mbus_rendezvous_waiting(m, "()", token_u[0], m, 300000000)) == NULL) {
+                if ((u_addr = mbus_rendezvous_waiting(m, "()", token_u[0], m, 20000000)) == NULL) {
                     fatal_error("RAT v" RAT_VERSION, "MBUS Failed to rendezvous with UI - Likely firewall/VPN issue");
                     return FALSE;
                 }
@@ -523,7 +523,7 @@
         should_exit = FALSE;
 	for (i = 0; i < num_sessions; i++) {
 		debug_msg("Waiting for %s from media engine...\n", token_e[i]);
-                if ((e_addr[i] = mbus_rendezvous_waiting(m, "()", token_e[i], m, 200000000)) == NULL ) {
+                if ((e_addr[i] = mbus_rendezvous_waiting(m, "()", token_e[i], m, 20000000)) == NULL ) {
                     fatal_error("RAT v" RAT_VERSION, "Failed to rendezvous with UI - Likely firewall/VPN issue");
                     return FALSE;
                 }
@@ -534,14 +534,14 @@
 		char	*peer;
 
 		if (ui_enabled) {
-                    if ((peer = mbus_rendezvous_go(m, token_u[0], (void *) m, 200000000)) == NULL) {
+                    if ((peer = mbus_rendezvous_go(m, token_u[0], (void *) m, 20000000)) == NULL) {
                                fatal_error("RAT v" RAT_VERSION, "Failed to rendezvous with UI - Likely firewall/VPN issue");
                                return FALSE;
                     }
                     debug_msg("User interface is %s\n", peer);
 		}
 		for (i = 0; i < num_sessions; i++) {
-                    if ((peer = mbus_rendezvous_go(m, token_e[i], (void *) m, 200000000)) == NULL) {
+                    if ((peer = mbus_rendezvous_go(m, token_e[i], (void *) m, 20000000)) == NULL) {
                                fatal_error("RAT v" RAT_VERSION, "Failed to rendezvous with UI - Likely firewall/VPN issue");
                                return FALSE;
                     }

Modified: rat/trunk/main_engine.c
==============================================================================
--- rat/trunk/main_engine.c	(original)
+++ rat/trunk/main_engine.c	Thu Apr  3 19:28:28 2008
@@ -215,8 +215,6 @@
 
         debug_msg("Ratmedia started\n");
 
-        Sleep(10000);
-
 #ifdef WIN32
 	SetThreadPriority(GetCurrentThread(), THREAD_PRIORITY_ABOVE_NORMAL);
 #else

Modified: rat/trunk/main_ui.c
==============================================================================
--- rat/trunk/main_ui.c	(original)
+++ rat/trunk/main_ui.c	Thu Apr  3 19:28:28 2008
@@ -127,7 +127,7 @@
 	/* us an mbus.waiting(foo) where "foo" is the same as the "-token" argument we were */
 	/* passed on startup. We respond with mbus.go(foo) sent reliably to the controller. */
 	debug_msg("Waiting for mbus.waiting(%s) from controller...\n", token);
-        if (mbus_rendezvous_go(m, token, (void *) m, 200000000) == NULL) {
+        if (mbus_rendezvous_go(m, token, (void *) m, 20000000) == NULL) {
             fatal_error("RAT v" RAT_VERSION, "UI failed mbus.waiting rendezvous with controller");
             return FALSE;
         }
@@ -139,7 +139,7 @@
 	/* We do mbus.waiting(foo) where "foo" is the original token. The controller will */
 	/* eventually respond with mbus.go(foo) when it has finished sending us commands. */
 	debug_msg("Waiting for mbus.go(%s) from controller...\n", token);
-        if ((mbus_rendezvous_waiting(m, c_addr, token, (void *) m, 200000000)) == NULL) {
+        if ((mbus_rendezvous_waiting(m, c_addr, token, (void *) m, 20000000)) == NULL) {
             fatal_error("RAT v" RAT_VERSION, "UI failed mbus.go rendezvous with controller");
             return FALSE;
         }