table counter support

Cargo.toml

@@ -13,7 +13,7 @@ dlpi = { git = "https://github.com/oxidecomputer/dlpi-sys", branch = "main" }
 indicatif = "0.17.2"
 libc = "0.2.137"
 libloading = "0.7.3"
-p4rs = { git = "https://github.com/oxidecomputer/p4", branch = "main" }
+p4rs = { git = "https://github.com/oxidecomputer/p4", branch = "counter" }
 p9ds = { git = "https://github.com/oxidecomputer/p9fs", branch = "main" }
 p9kp = { git = "https://github.com/oxidecomputer/p9fs", branch = "main" }
 serde = { version = "1.0.147", features = ["derive"] }

src/mgmt.rs

@@ -19,13 +19,21 @@ pub enum ManagementRequest {
     RadixRequest,
     TableAdd(TableAdd),
     TableRemove(TableRemove),
+    TableCounters(TableCounters),
     DumpRequest,
 }
 
 #[derive(Debug, Serialize, Deserialize)]
 pub enum ManagementResponse {
     RadixResponse(u16),
     DumpResponse(BTreeMap<String, Vec<TableEntry>>),
+    TableCountersResponse(Option<Vec<TableCounter>>),
+}
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct TableCounter {
+    pub key: Vec<u8>,
+    pub value: u128,
 }
 
 #[derive(Debug, Default, Serialize, Deserialize)]
@@ -42,6 +50,11 @@ pub struct TableRemove {
     pub keyset_data: Vec<u8>,
 }
 
+#[derive(Debug, Default, Serialize, Deserialize)]
+pub struct TableCounters {
+    pub table: String,
+}
+
 pub async fn handle_management_message(
     msg: ManagementRequest,
     pipeline: Arc<Mutex<Box<dyn Pipeline>>>,
@@ -65,6 +78,24 @@ pub async fn handle_management_message(
         ManagementRequest::TableRemove(tm) => {
             pl.remove_table_entry(&tm.table, &tm.keyset_data);
         }
+        ManagementRequest::TableCounters(tc) => {
+            let response = match pl.get_table_counters(&tc.table) {
+                None => ManagementResponse::TableCountersResponse(None),
+                Some(counters) => {
+                    let entries = counters
+                        .entries
+                        .lock()
+                        .unwrap()
+                        .clone()
+                        .into_iter()
+                        .map(|(k, v)| TableCounter { key: k, value: v })
+                        .collect();
+                    ManagementResponse::TableCountersResponse(Some(entries))
+                }
+            };
+            let buf = serde_json::to_vec(&response).unwrap();
+            uds.send_to(&buf, uds_dst).await.unwrap();
+        }
         ManagementRequest::RadixRequest => {
             let response = ManagementResponse::RadixResponse(radix as u16);
             let buf = serde_json::to_vec(&response).unwrap();