plan9: Merge pull request #1332 from svinota/p11-plan9-call-improvements

plan9 call improvements

Bug-Url: #1332

Author: svinota

pyroute2/fixtures/plan9.py

@@ -1,3 +1,4 @@
+import time
 from collections.abc import AsyncGenerator
 from socket import socketpair
 
@@ -7,6 +8,10 @@
 from pyroute2.plan9.server import Plan9ServerSocket
 
 
+def test_time():
+    return time.time_ns()
+
+
 class AsyncPlan9Context:
 
     server = None
@@ -19,8 +24,11 @@ def __init__(self):
         self.server = Plan9ServerSocket(use_socket=self.server_sock)
         self.client = Plan9ClientSocket(use_socket=self.client_sock)
         self._task = None
-        inode = self.server.filesystem.create('test_file')
-        inode.data.write(self.sample_data)
+        with self.server.filesystem.create('test_file') as i:
+            i.data.write(self.sample_data)
+        with self.server.filesystem.create('test_time') as i:
+            i.metadata.call_on_read = True
+            i.register_function(test_time, loader=lambda x: {})
 
     async def ensure_session(self):
         self._task = await self.server.async_run()

pyroute2/plan9/filesystem.py

@@ -4,13 +4,14 @@
 import os
 import pwd
 import time
+from dataclasses import dataclass
 from functools import partial
 
 from pyroute2.plan9 import Plan9Exit, Qid, Stat, Tcall, Tread, Twrite
 
 
 def _publish_function_w(session, inode, request, response):
-    inode.metadata['dirty'] = True
+    inode.metadata.dirty = True
     inode.data.seek(0)
     inode.data.truncate()
     inode.data.write(request['data'])
@@ -21,11 +22,11 @@ def _publish_function_w(session, inode, request, response):
 def _publish_function_r(
     func, loader, dumper, session, inode, request, response
 ):
-    if request['offset'] == 0 and inode.metadata.get('dirty'):
+    if request['offset'] == 0 and inode.metadata.has_new_data():
         try:
             kwarg = loader(inode.data.getvalue())
             ret = func(**kwarg)
-            inode.metadata['dirty'] = False
+            inode.metadata.dirty = False
         except Plan9Exit:
             raise
         except Exception as e:
@@ -62,6 +63,15 @@ def _publish_function_c(
     return response
 
 
+@dataclass
+class InodeMetadata:
+    call_on_read: bool = False
+    dirty: bool = False
+
+    def has_new_data(self) -> bool:
+        return self.dirty or self.call_on_read
+
+
 class Inode:
     children = None
     parents = None
@@ -86,7 +96,7 @@ def __init__(
         self.parents = parents if parents is not None else set()
         self.children = children if children is not None else set()
         self.callbacks = {}
-        self.metadata = {}
+        self.metadata = InodeMetadata()
         self.stat = Stat()
         self.qid = Qid(qtype, 0, path)
         self.stat['uid'] = (
@@ -108,6 +118,12 @@ def __init__(
         self.stat['name'] = name
         self.sync()
 
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        pass
+
     def sync(self):
         self.stat['length'] = len(self.data.getvalue())
 

tests/test_core/test_plan9/test_basic.py

@@ -1,3 +1,5 @@
+import time
+
 import pytest
 
 
@@ -8,6 +10,17 @@ async def test_server_data_read(async_p9_context):
     assert response['data'] == async_p9_context.sample_data
 
 
+@pytest.mark.asyncio
+async def test_server_time_read(async_p9_context):
+    ts = time.time_ns()
+    fid = await async_p9_context.client.fid('test_time')
+    responses = [await async_p9_context.client.read(fid) for _ in range(5)]
+    times = {int(x['data'].decode('utf-8')) for x in responses}
+    assert len(times) == 5
+    assert min(times) > ts
+    assert max(times) < time.time_ns()
+
+
 @pytest.mark.asyncio
 async def test_server_data_write(async_p9_context):
     new_sample = b'aevei3PhaeGeiseh'