Merge pull request #6 from ut-issl/cop-state-machene

Cop state machene

Author: shunsuke-shimomura

gaia-stub/proto/cop.proto

@@ -101,6 +101,7 @@ message CopTaskStatus {
   tco_tmiv.Tco tco = 2;
   CopTaskStatusPattern status = 3;
   google.protobuf.Timestamp timestamp = 4;
+  bool is_confirm_command = 5;
 }
 
 enum CopTaskStatusPattern {
@@ -116,8 +117,8 @@ enum CopTaskStatusPattern {
 
 message CopWorkerStatus {
   CopWorkerStatusPattern state = 1;
-  bool is_auto_retransmit_enabled = 2;
-  uint64 timeout_sec = 3;
+  uint64 timeout_sec = 2;
+  uint32 max_executing = 3;
   google.protobuf.Timestamp timestamp = 4;
 }
 
@@ -126,11 +127,12 @@ enum CopWorkerStatusPattern {
   WORKER_IDLE = 1;
   WORKER_INITIALIZE = 2;
   WORKER_ACTIVE = 3;
-  WORKER_LOCKOUT = 4;
-  WORKER_UNLOCKING = 5;
-  WORKER_TIMEOUT = 6;
-  WORKER_FAILED = 7;
-  WORKER_CANCELED = 8;
+  WORKER_AUTO_RETRANSMIT_OFF = 4;
+  WORKER_LOCKOUT = 5;
+  WORKER_UNLOCKING = 6;
+  WORKER_TIMEOUT = 7;
+  WORKER_FAILED = 8;
+  WORKER_CANCELED = 9;
 }
 
 message CopQueueStatusSet {
@@ -141,6 +143,7 @@ message CopQueueStatusSet {
   uint32 vs_at_id0 = 5;
   google.protobuf.Timestamp oldest_arrival_time = 6;
   google.protobuf.Timestamp timestamp = 7;
+  uint32 confirm_inc = 8;
 }
 
 message CopQueueStatus {
@@ -155,8 +158,12 @@ message CopCommand {
     CopTerminateCommand terminate = 2;
     CopUnlockCommand unlock = 3;
     CopSetTimeoutCommand set_timeout = 4;
-    CopSetAutoRetransmitEnableCommand set_auto_retransmit_enable = 5;
-    CopSetAutoRetransmitDisableCommand set_auto_retransmit_disable = 6;
+    CopSetMaxExecutingCommand set_max_executing = 5;
+    CopSetAutoRetransmitEnableCommand set_auto_retransmit_enable = 6;
+    CopSetAutoRetransmitDisableCommand set_auto_retransmit_disable = 7;
+    CopSendSetVRCommand send_set_vr = 8;
+    CopSendUnlockCommand send_unlock = 9;
+    CopStatusUpdateCommand status_update = 10;
   }
 }
 
@@ -174,8 +181,22 @@ message CopSetTimeoutCommand {
   uint32 timeout_sec = 1;
 }
 
+message CopSetMaxExecutingCommand {
+  uint32 max_executing = 1;
+}
+
 message CopSetAutoRetransmitEnableCommand {
 }
 
 message CopSetAutoRetransmitDisableCommand {
 }
+
+message CopSendSetVRCommand {
+  uint32 vr = 1;
+}
+
+message CopSendUnlockCommand {
+}
+
+message CopStatusUpdateCommand {
+}

gaia-stub/proto/tco_tmiv.proto

@@ -3,6 +3,7 @@ syntax = "proto3";
 package tco_tmiv;
 
 import "google/protobuf/timestamp.proto";
+import "google/protobuf/wrappers.proto";
 
 message Tco {
   string name = 1;

gaia-stub/src/lib.rs

@@ -47,6 +47,7 @@ pub mod cop {
                 super::CopWorkerStatusPattern::WorkerClcwUnreceived => "CLCW_UNRECEIVED".to_string(),
                 super::CopWorkerStatusPattern::WorkerIdle => "IDLE".to_string(),
                 super::CopWorkerStatusPattern::WorkerActive => "ACTIVE".to_string(),
+                super::CopWorkerStatusPattern::WorkerAutoRetransmitOff => "AUTO_RETRANSMIT_OFF".to_string(),
                 super::CopWorkerStatusPattern::WorkerInitialize => "INITIALIZE".to_string(),
                 super::CopWorkerStatusPattern::WorkerCanceled => "CANCELED".to_string(),
                 super::CopWorkerStatusPattern::WorkerFailed => "FAILED".to_string(),

gaia-tmtc/src/cop.rs

@@ -85,7 +85,7 @@ impl CopStatusStore {
         let id = status.task_id;
         let pattern = status.status();
         match pattern {
-            CopTaskStatusPattern::Accepted | CopTaskStatusPattern::Canceled => {
+            CopTaskStatusPattern::Accepted | CopTaskStatusPattern::Canceled | CopTaskStatusPattern::Failed | CopTaskStatusPattern::Lockout | CopTaskStatusPattern::Timeout => {
                 let pop_item = {
                     let mut completed = self.completed.write().await;
                     if completed.len() == self.capacity {
@@ -108,15 +108,15 @@ impl CopStatusStore {
     }
 
     pub async fn set_worker(&self, status: &CopWorkerStatus) {
-        self.worker_status.write().await.clone_from(&status);
+        self.worker_status.write().await.clone_from(status);
     }
 
     pub async fn set_queue(&self, status: &CopQueueStatusSet) {
-        self.queue_status.write().await.clone_from(&status);
+        self.queue_status.write().await.clone_from(status);
     }
 
     pub async fn set_vsvr(&self, status: &CopVsvr) {
-        self.vsvr.write().await.clone_from(&status);
+        self.vsvr.write().await.clone_from(status);
     }
 }
 
@@ -201,15 +201,11 @@ impl<C> CopService<C> {
     }
 }
 
-pub trait IsTimeout {
-    fn is_timeout(&self) -> bool;
-}
-
 #[tonic::async_trait]
 impl<C> Cop for CopService<C>
 where
     C: super::Handle<Arc<CopCommand>> + Send + Sync + 'static,
-    C::Response: Send + IsTimeout + 'static,
+    C::Response: Send + 'static,
 {
     type OpenTaskStatusStreamStream = stream::BoxStream<'static, Result<CopTaskStatusStreamResponse, Status>>;
     type OpenWorkerStatusStreamStream = stream::BoxStream<'static, Result<CopWorkerStatusStreamResponse, Status>>;
@@ -343,20 +339,12 @@ where
             Status::internal(format!("{:?}", e))
         }
 
-        let time_out: bool = self
-            .cop_handler
+        self.cop_handler
             .lock()
             .await
             .handle(Arc::new(cop_command))
             .await
-            .map_err(internal_error)?
-            .is_timeout();
-
-        if time_out {
-            return Err(Status::deadline_exceeded(
-                "command was not completed on time",
-            ));
-        }
+            .map_err(internal_error)?;
 
         Ok(Response::new(PostCopCommandResponse {}))
     }