add stubs for UploaderState

Signed-off-by: Gunwant Jain <mail@wantguns.dev>
oscarmcnulty · Nov 26, 2022 · 5b53312 · 5b53312
1 parent 1c7638b
commit 5b53312
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/SConscript b/SConscript
@@ -28,7 +28,7 @@ env.SharedLibrary('cereal_shared', cereal_objects)
 
 # Build messaging
 
-services_h = env.Command(['services.h'], ['services.py'], 'python3 ' + cereal_dir.path + '/services.py > $TARGET')
+services_h = env.Command(['services.h'], ['services.py', 'resources/services.yaml'], 'python3 ' + cereal_dir.path + '/services.py > $TARGET')
 
 messaging_objects = env.SharedObject([
   'messaging/messaging.cc',

diff --git a/log.capnp b/log.capnp
@@ -1037,6 +1037,18 @@ struct LiveParametersData {
   roll @14 :Float32;
 }
 
+struct UploaderState {
+  immediateQueueSize @0 :UInt32;
+  immediateQueueCount @1 :UInt32;
+  rawQueueSize @2 :UInt32;
+  rawQueueCount @3 :UInt32;
+
+  # stats for last successfully uploaded file
+  lastTime @4 :Float32;  # s
+  lastSpeed @5 :Float32; # MB/s
+  lastFilename @6 :Text;
+}
+
 struct Event {
   logMonoTime @33 :UInt64;  # nanoseconds
   valid @34 :Bool = true;
@@ -1079,5 +1091,6 @@ struct Event {
     ubloxRaw @36 :Data;
     liveTracks @37 :List(LiveTracks);
     sentinel @38 :Sentinel;
+    uploaderState @39 :UploaderState;
   }
 }
diff --git a/messaging/messaging.h b/messaging/messaging.h
@@ -1,8 +1,10 @@
 #pragma once
 #include <cstddef>
+#include <ctime>
 #include <map>
 #include <string>
 #include <vector>
+#include <time.h>
 #include <capnp/serialize.h>
 #include "../gen/cpp/log.capnp.h"
 

diff --git a/resources/services.yaml b/resources/services.yaml
@@ -150,6 +150,12 @@ services:
         expectedFreq: 2
         decimation: 1
 
+    uploaderState:
+        keepLast: true
+        log: true
+        expectedFreq: 2
+        decimation: 1
+
     carEvents:
         keepLast: true
         log: true