loose: Track and honour cseq_loose in client

Not used yet

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/daemon/session.rs b/daemon/session.rs
index ae46c5a6fc3fd6964fe6ef56ac3f0f571a92ec12..46406a250d03ab9d14914d7ce9694f9252235f8a 100644 (file)
--- a/daemon/session.rs
+++ b/daemon/session.rs
@@ -51,6 +51,7 @@ struct SessionPieceLoadJson<'r> {
   desc: Html,
   uos: &'r [UoDescription],
   moveable: PieceMoveable,
+  cseq_loose: Option<Generation>,
   rotateable: bool,
   occregion: Option<JsonString<&'r Region>>,
   pub bbox: &'r Rect,
@@ -158,6 +159,7 @@ fn session_inner(form: Json<SessionForm>,
         desc,
         bbox: &bbox,
         moveable: gpc.moveable(),
+        cseq_loose: None,
         rotateable: gpc.rotateable(),
         uos: &pri.ui_operations(&ig.gs, gpc, ipc)?,
         occregion,

diff --git a/templates/script.ts b/templates/script.ts
index 2050db21ea9702e1e05174c50e58d86f8e758db5..fc4dcd0b10d985b1c622ec3fc0f064b51fa6db9c 100644 (file)
--- a/templates/script.ts
+++ b/templates/script.ts
@@ -68,7 +68,8 @@ type ZCoord = string;
 
 type PieceInfo = {
   held : PlayerId | null,
-  cseq : number | null,
+  cseq_main : number | null,
+  cseq_loose: number | null,
   cseq_updatesvg : number | null,
   z : ZCoord,
   zg : Generation,
@@ -248,7 +249,12 @@ function api_piece_x(f: (meth: string, payload: Object) => void,
                     op: Object) {
   clear_halo(piece,p);
   cseq += 1;
-  p.cseq = cseq;
+  if (loose) {
+    p.cseq_loose = cseq;
+  } else {
+    p.cseq_main = cseq;
+    p.cseq_loose = null;
+  }
   f(meth, {
     ctoken : ctoken,
     piece : piece,
@@ -490,7 +496,8 @@ function some_keydown(e: KeyboardEvent) {
     let p = pieces[piece]!;
     api_piece('k', piece, p, { opname: uo.opname, wrc: uo.wrc });
     if (uo.wrc == 'UpdateSvg') {
-      p.cseq_updatesvg = p.cseq;
+      // No UpdateSvg is loose, so no need to check p.cseq_loose
+      p.cseq_updatesvg = p.cseq_main;
       redisplay_ancillaries(piece,p);
     }
   }
@@ -1978,9 +1985,8 @@ messages.Recorded = <MessageHandler>function
 }
 
 function piece_recorded_cseq(p: PieceInfo, j: { cseq: ClientSeq }) {
-  if (p.cseq != null && j.cseq >= p.cseq) {
-    p.cseq = null;
-  }
+  if (p.cseq_main  != null && j.cseq >= p.cseq_main ) { p.cseq_main  = null; }
+  if (p.cseq_loose != null && j.cseq >= p.cseq_loose) { p.cseq_loose = null; }
 }
 
 messages.RecordedUnpredictable = <MessageHandler>function
@@ -2015,20 +2021,46 @@ update_error_handlers.PieceOpError = <MessageHandler>function
     // Our gen was high enough we we sent this, that it ought to have
     // worked.  Report it as a problem, then.
     add_log_message('Problem manipulating piece: ' + m.error_msg);
-    p.cseq = null; // Well, we don't have anything outstanding now
+    p.cseq_main = null; // Well, we don't have anything outstanding now
+    p.cseq_loose = null;
   }
   handle_piece_update(m.state);
 }
 
 function piece_checkconflict_nrda(piece: PieceId, p: PieceInfo): boolean {
-  if (p.cseq != null) {
-    p.cseq = null;
+  // Our state machine for cseq:
+  //
+  // When we send an update (api_piece_x) we always set cseq.  If the
+  // update is loose we also set cseq_beforeloose.  Whenever we
+  // clear cseq we clear cseq_beforeloose too.
+  //
+  // The result is that if cseq_beforeloose is non-null precisely if
+  // the last op we sent was loose.
+  //
+  // We track separately the last loose, and the last non-loose,
+  // outstanding API request.  (We discard our idea of the last
+  // loose request if we follow it with a non-loose one.)
+  //
+  // So
+  //     cseq_main > cseq_loose         one loose request then some non-loose
+  //     cseq_main, no cseq_loose       just non-loose requests
+  //     no cseq_main, but cseq_loose   just one loose request
+  //     neither                        no outstanding requests
+  //
+  // If our only outstanding update is loose, we ignore a detected
+  // conflict.  We expect the server to send us a proper
+  // (non-Conflict) error later.
+  if (p.cseq_main != null || p.cseq_loose != null) {
     if (drag_pieces.some(function(dp) { return dp.piece == piece; })) {
       console.log('drag end due to conflict');
       drag_end();
     }
+  }
+  if (p.cseq_main != null) {
     add_log_message('Conflict! - simultaneous update');
   }
+  p.cseq_main = null;
+  p.cseq_loose = null;
   return false;
 }