aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src
diff options
context:
space:
mode:
authoronefang2021-08-04 15:08:28 +1000
committeronefang2021-08-04 15:08:28 +1000
commitbc796aef942b02826ed5a14c3778fc5b45960f4a (patch)
tree1956f75b1f465633d26b191d55806c5e9597052c /src
parentStart tmux with a huge screen size, to work around OpenSim bug. (diff)
downloadopensim-SC-bc796aef942b02826ed5a14c3778fc5b45960f4a.zip
opensim-SC-bc796aef942b02826ed5a14c3778fc5b45960f4a.tar.gz
opensim-SC-bc796aef942b02826ed5a14c3778fc5b45960f4a.tar.bz2
opensim-SC-bc796aef942b02826ed5a14c3778fc5b45960f4a.tar.xz
Halve the bulkSims value each time we wait.
Coz by this time lots of sims are likely still starting up.
Diffstat (limited to '')
-rw-r--r--src/sledjchisl/sledjchisl.c24
1 files changed, 12 insertions, 12 deletions
diff --git a/src/sledjchisl/sledjchisl.c b/src/sledjchisl/sledjchisl.c
index 65f51f0..698a251 100644
--- a/src/sledjchisl/sledjchisl.c
+++ b/src/sledjchisl/sledjchisl.c
@@ -8095,20 +8095,20 @@ fcgiDone:
8095 { 8095 {
8096 I("Tmux tab [%d:%s](pane %d) tmux ID %s, from %s/sim%d - %s is starting.", window, type, pane, simd->paneID, scTemp, count, simd->name); 8096 I("Tmux tab [%d:%s](pane %d) tmux ID %s, from %s/sim%d - %s is starting.", window, type, pane, simd->paneID, scTemp, count, simd->name);
8097 doTmuxCmd("select-pane -t %s:%s -T '%s'", Tconsole, simd->paneID, simd->tab); 8097 doTmuxCmd("select-pane -t %s:%s -T '%s'", Tconsole, simd->paneID, simd->tab);
8098 { 8098 snprintf(toybuf, sizeof(toybuf), "mono OpenSim.exe -inidirectory=%s/sim%d", scTemp, count);
8099 snprintf(toybuf, sizeof(toybuf), "mono OpenSim.exe -inidirectory=%s/sim%d", scTemp, count); 8099 sendTmuxCmd(simd->paneID, toybuf);
8100 sendTmuxCmd(simd->paneID, toybuf);
8101// TODO - some compromise, do a premptive load check if we are not doing a wait anyway. 8100// TODO - some compromise, do a premptive load check if we are not doing a wait anyway.
8102 if (0 == doWait) 8101 if (0 == doWait)
8103 { 8102 {
8104 snprintf(toybuf, sizeof(toybuf), "INITIALIZATION COMPLETE FOR %s", simd->name); 8103// doTmuxCmd("select-window -t %s:%d", Tconsole, simd->window);
8105 waitTmuxText(simd->paneID, toybuf); 8104 snprintf(toybuf, sizeof(toybuf), "INITIALIZATION COMPLETE FOR %s", simd->name);
8106 I("%s is done starting up.", simd->name); 8105 waitTmuxText(simd->paneID, toybuf);
8107 la = waitLoadAverage(la, loadAverageInc, simTimeOut); 8106 I("%s is done starting up.", simd->name);
8108 } 8107 la = waitLoadAverage(la, loadAverageInc, simTimeOut);
8109 count++; 8108 if (1 < bulkSims)
8110 doWait = (count % bulkSims); 8109 bulkSims = bulkSims / 2;
8111 } 8110 }
8111 doWait = ((count + 1) % bulkSims);
8112 } 8112 }
8113 break; 8113 break;
8114 } 8114 }