From 397d29e3375fa342f33c298b6b8be1de64c5fa72 Mon Sep 17 00:00:00 2001
From: Thibault Duplessis <thibault.duplessis@gmail.com>
Date: Tue, 1 Oct 2013 22:37:11 +0200
Subject: [PATCH] monitor AI remotes

---
 app/AiStresser.scala                 | 12 ++++++------
 app/controllers/Monitor.scala        |  2 +-
 app/views/monitor/monitor.scala.html |  3 ++-
 modules/ai/src/main/Env.scala        |  2 ++
 public/javascripts/monitor.js        | 28 ++++++++++++++++++----------
 5 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/app/AiStresser.scala b/app/AiStresser.scala
index ad706a70ce..af752d4f50 100644
--- a/app/AiStresser.scala
+++ b/app/AiStresser.scala
@@ -12,16 +12,16 @@ private[app] final class AiStresser(env: lila.ai.Env, system: ActorSystem) {
 
   def apply {
 
-    (1 to 10) foreach { i ⇒
+    (1 to 20) foreach { i ⇒
       system.scheduler.scheduleOnce((i * 97) millis) {
         play(i % 8 + 1, true)
       }
     }
-    (1 to 3) foreach { i ⇒
-      system.scheduler.scheduleOnce((i * 131) millis) {
-        analyse(true)
-      }
-    }
+    // (1 to 3) foreach { i ⇒
+    //   system.scheduler.scheduleOnce((i * 131) millis) {
+    //     analyse(true)
+    //   }
+    // }
 
   }
 
diff --git a/app/controllers/Monitor.scala b/app/controllers/Monitor.scala
index f8c93494d6..9f614cfe83 100644
--- a/app/controllers/Monitor.scala
+++ b/app/controllers/Monitor.scala
@@ -14,7 +14,7 @@ object Monitor extends LilaController {
   private def env = Env.monitor
 
   def index = Action {
-    Ok(views.html.monitor.monitor())
+    Ok(views.html.monitor.monitor(Env.ai.nbStockfishRemotes))
   }
 
   def websocket = Socket[JsValue] { implicit ctx ⇒
diff --git a/app/views/monitor/monitor.scala.html b/app/views/monitor/monitor.scala.html
index 7b47ee90de..ab6ca5d292 100644
--- a/app/views/monitor/monitor.scala.html
+++ b/app/views/monitor/monitor.scala.html
@@ -1,4 +1,4 @@
-@()
+@(nbAi: Int)
 
 @layout("Lichess monitor") {
 <a class="back" href="@routes.Lobby.home">&lt; back to lichess</a>
@@ -10,6 +10,7 @@
   <a href="#" id="shutdown">Emergency reactor shutdown - DON'T CLICK</a>
 </div>
 <script>
+  var nbAi = @nbAi;
   window.document.getElementById("shutdown").onclick = function() {
   alert("Was worth trying. I guess.");
   };
diff --git a/modules/ai/src/main/Env.scala b/modules/ai/src/main/Env.scala
index f754d852b2..830b64d10b 100644
--- a/modules/ai/src/main/Env.scala
+++ b/modules/ai/src/main/Env.scala
@@ -78,6 +78,8 @@ final class Env(
     queue = stockfishQueue,
     config = stockfishConfig)
 
+  def nbStockfishRemotes = StockfishRemotes.size
+
   private lazy val stockfishQueue = system.actorOf(Props(
     new stockfish.Queue(stockfishConfig, system)
   ) withDispatcher StockfishQueueDispatcher, name = StockfishQueueName)
diff --git a/public/javascripts/monitor.js b/public/javascripts/monitor.js
index 84916cf77a..bd9cc25adc 100644
--- a/public/javascripts/monitor.js
+++ b/public/javascripts/monitor.js
@@ -48,7 +48,7 @@
         1500,
         "ease-in"
         );
-    if (val > (this.threshold * this.maxVal)) {
+    if (parseInt(val) + "" == "NaN" || val > (this.threshold * this.maxVal)) {
       this.elt.className = "monitor alert";
     } else {
       this.elt.className = "monitor";
@@ -151,25 +151,28 @@
       container : container
     });
 
-    app.ai = new SpeedOMeter({
-      name : "AI LOAD",
+    app.mps = new SpeedOMeter({
+      name : "MOVES",
       maxVal : 100,
-      threshold: 0.8,
       container : container
     });
 
+    app.ais = [];
+    for (i=1;i<=nbAi;i++) {
+      app.ais.push(new SpeedOMeter({
+        name : "AI " + i + " LOAD",
+        maxVal : 100,
+        threshold: 0.8,
+        container : container
+      }));
+    }
+
     // app.lag = new SpeedOMeter({
     //   name : "LAG",
     //   maxVal : 200,
     //   container : container
     // });
 
-    app.mps = new SpeedOMeter({
-      name : "MOVES",
-      maxVal : 100,
-      container : container
-    });
-
     function setStatus(s) {
       window.document.body.className = s;
     }
@@ -188,6 +191,11 @@
           if (d.length == 2) {
             if (typeof app[d[1]] != "undefined") {
               app[d[1]].update(d[0]);
+            } else if (d[1] == 'ai') {
+              var ais = d[0].split(',');
+              for (i=0;i<ais.length;i++) {
+                app.ais[i].update(ais[i]);
+              }
             }
           }
         }