optimisation: don't resend unchanged game status for each move

kmap2 · Apr 1, 2015 · 5819413 · 5819413
1 parent 575b28a
commit 5819413
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 17 deletions.
diff --git a/modules/game/src/main/Event.scala b/modules/game/src/main/Event.scala
@@ -179,16 +179,18 @@ object Event {
   case class State(
       color: Color,
       turns: Int,
-      status: Status,
+      status: Option[Status],
       whiteOffersDraw: Boolean,
       blackOffersDraw: Boolean) extends Event {
     def typ = "state"
     def data = Json.obj(
       "color" -> color.name,
       "turns" -> turns,
-      "status" -> Json.obj(
-        "id" -> status.id,
-        "name" -> status.name),
+      "status" -> status.map { s =>
+        Json.obj(
+          "id" -> s.id,
+          "name" -> s.name)
+      },
       "wDraw" -> whiteOffersDraw.option(true),
       "bDraw" -> blackOffersDraw.option(true)
     ).noNull

diff --git a/modules/game/src/main/Game.scala b/modules/game/src/main/Game.scala
@@ -138,18 +138,6 @@ case class Game(
     blur: Boolean = false): Progress = {
     val (history, situation) = (game.board.history, game.situation)
 
-    val events = (players collect {
-      case p if p.isHuman => Event.possibleMoves(situation, p.color)
-    }) :::
-      Event.State(
-        situation.color,
-        game.turns,
-        status,
-        whiteOffersDraw = whitePlayer.isOfferingDraw,
-        blackOffersDraw = blackPlayer.isOfferingDraw) ::
-        (Event fromMove move) :::
-        (Event fromSituation situation)
-
     def copyPlayer(player: Player) = player.copy(
       blurs = math.min(
         playerMoves(player.color),
@@ -176,6 +164,18 @@ case class Game(
       status = situation.status | status,
       clock = game.clock)
 
+    val events = (players collect {
+      case p if p.isHuman => Event.possibleMoves(situation, p.color)
+    }) :::
+      Event.State(
+        situation.color,
+        game.turns,
+        (status != updated.status) option status,
+        whiteOffersDraw = whitePlayer.isOfferingDraw,
+        blackOffersDraw = blackPlayer.isOfferingDraw) ::
+        (Event fromMove move) :::
+        (Event fromSituation situation)
+
     val clockEvent = updated.clock map Event.Clock.apply orElse {
       updated.correspondenceClock map Event.CorrespondenceClock.apply
     }

diff --git a/ui/round/src/socket.js b/ui/round/src/socket.js
@@ -23,7 +23,7 @@ module.exports = function(send, ctrl) {
       });
       ctrl.data.game.player = o.color;
       ctrl.data.game.turns = o.turns;
-      ctrl.data.game.status = o.status;
+      if (o.status) ctrl.data.game.status = o.status;
       ctrl.data[ctrl.data.player.color === 'white' ? 'player' : 'opponent'].offeringDraw = o.wDraw;
       ctrl.data[ctrl.data.player.color === 'black' ? 'player' : 'opponent'].offeringDraw = o.bDraw;
       m.redraw();