retracesoftware-proxy 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

retracesoftware/proxy/replay.py

@@ -1,14 +1,16 @@
 import retracesoftware.functional as functional
 import retracesoftware_utils as utils
+import retracesoftware.stream as stream
 
+from retracesoftware.install.tracer import Tracer
+from retracesoftware.proxy.thread import per_thread_messages
 from retracesoftware.proxy.proxytype import dynamic_proxytype, dynamic_int_proxytype, extending_proxytype, make_extensible, dynamic_stubtype, stubtype_from_spec, Stub
-from retracesoftware.proxy.gateway import gateway_pair
-
-from retracesoftware.proxy.record import ProxyRef, ProxySpec
+# from retracesoftware.proxy.gateway import gateway_pair
+from retracesoftware.proxy.record import ProxyRef, ProxySpec, Placeholder
 from retracesoftware.proxy.proxysystem import ProxySystem
 
 import os
-
+import weakref
 # we can have a dummy method descriptor, its has a __name__ and when called, returns the next element
 
 # for types, we can patch the __new__ method
@@ -20,6 +22,8 @@ class ReplayProxySystem(ProxySystem):
     def stubtype(self, cls):
         return dynamic_proxytype(handler = self.ext_handler, cls = cls)
 
+    def create_stub(self): return True
+
     def stubtype_from_spec(self, spec):
         print (f'FOOO!!! {spec}')
         return stubtype_from_spec(
@@ -32,12 +36,12 @@ class ReplayProxySystem(ProxySystem):
     @utils.striptraceback
     def next_result(self):
         while True:
-            next = self.reader()
+            next = self.messages()
 
             if next == 'CALL':
-                func = self.reader()
-                args = self.reader()
-                kwargs = self.reader()
+                func = self.messages()
+                args = self.messages()
+                kwargs = self.messages()
 
                 try:
                     func(*args, **kwargs)
@@ -45,22 +49,104 @@ class ReplayProxySystem(ProxySystem):
                     pass
 
             elif next == 'RESULT':
-                return self.reader()
+                return self.messages()
             elif next == 'ERROR':
-                err_type = self.reader()
-                err_value = self.reader()
+                err_type = self.messages()
+                err_value = self.messages()
                 utils.raise_exception(err_type, err_value)
             else:
                 assert not isinstance(next, str)
                 return next
 
-    def __init__(self, thread_state, immutable_types, tracer, reader):
+    def bind(self, obj):
+        read = self.messages()
+        
+        assert isinstance(read, Placeholder)
+
+        self.bindings[read] = obj
+
+    # def dynamic_path(self):
+    #     if self.getpid() != self.pid:
+    #         self.pid = self.getpid()
+    #         # ok we are in child, calculate new path
+    #         self.path = self.path / f'fork-{self.fork_counter}'
+    #         self.fork_counter = 0
+        
+    #     return self.path
+
+    def after_fork_in_child(self):
+        self.reader.path = self.new_child_path(self.reader.path)
+        super().after_fork_in_child()
+
+    def __init__(self, 
+                 thread_state,
+                 immutable_types,
+                 tracing_config,
+                 path,
+                 fork_path = []):
+        
         # self.writer = writer
-        super().__init__(thread_state = thread_state)
-        self.immutable_types = immutable_types
+        # super().__init__(thread_state = thread_state)
+        reader = stream.reader(path)
+
+        self.bindings = utils.id_dict()
+        self.set_thread_id = utils.set_thread_id
+        self.fork_path = fork_path
+        deserialize = functional.walker(self.bindings.get_else_key)
+
+        self.messages = functional.sequence(per_thread_messages(reader), deserialize)
+
+        # messages = reader
+
+        def readnext():
+            try:
+                return self.messages()
+            except Exception as error:
+                self.thread_state.value = 'disabled'
+                print(f'Error reading stream: {error}')
+                os._exit(1)
+
+            # print(f'read: {obj}')
+            # return obj
+
+
+        # lookup = weakref.WeakKeyDictionary()
+        
+        # debug = debug_level(config)
+
+        # int_refs = {}
+            
+        def read_required(required):
+            obj = readnext()
+            if obj != required:
+                print(f'Expected: {required} but got: {obj}')
+                for i in range(5):
+                    print(readnext())
+
+                utils.sigtrap(None)
+                os._exit(1)
+                raise Exception(f'Expected: {required} but got: {obj}')
+
+        def trace_writer(name, *args):
+            print(f'Trace: {name} {args}')
+            
+            read_required('TRACE')
+            read_required(name)
+
+            for arg in args:
+                read_required(arg)
+
+        # self.tracer = Tracer(tracing_config, writer = trace_writer)
+        # self.immutable_types = immutable_types
+
         self.reader = reader
-        self.bind = self.reader.supply
 
+        # def foo(cls):
+        #     print(cls)
+        #     assert isinstance(cls, type)
+        #     immutable_types.add(cls)
+
+        # add_stubtype = functional.side_effect(foo)
         add_stubtype = functional.side_effect(immutable_types.add)
 
         reader.type_deserializer[ProxyRef] = functional.sequence(lambda ref: ref.resolve(), self.stubtype, add_stubtype)
@@ -69,42 +155,56 @@ class ReplayProxySystem(ProxySystem):
         # on_ext_result = functional.if_then_else(
         #     functional.is_instanceof(str), writer.handle('RESULT'), writer)
 
-        def int_proxytype(gateway):
-            return lambda cls: dynamic_int_proxytype(handler = gateway, cls = cls, bind = self.bind)
+        # def int_proxytype(gateway):
+        #     return lambda cls: dynamic_int_proxytype(handler = gateway, cls = cls, bind = self.bind)
 
         def is_stub_type(obj):
             return functional.typeof(obj) is type and issubclass(obj, Stub)
 
         create_stubs = functional.walker(functional.when(is_stub_type, lambda cls: cls()))
 
-        ext_apply = functional.repeatedly(functional.sequence(self.next_result, create_stubs))
-                
-        self.ext_handler, self.int_handler = gateway_pair(
-            thread_state,
-            tracer,
-            immutable_types = immutable_types,
-            ext_apply = ext_apply,
-            int_proxytype = int_proxytype,
-            ext_proxytype = functional.identity)
-
-    def extend_type(self, base):
+        self.ext_apply = functional.repeatedly(functional.sequence(self.next_result, create_stubs))
+        
+        def read_sync(): read_required('SYNC')
+
+        self.sync = lambda function: utils.observer(on_call = functional.always(read_sync), function = function)
+    
+        super().__init__(thread_state = thread_state, 
+                         tracer = Tracer(tracing_config, writer = trace_writer), 
+                         immutable_types = immutable_types)
+
+        # super().__init__(
+        #     thread_state=thread_state, 
+        #     immutable_types= immutable_types,
+        #     tracer=self.tracer,
+        #     ext_apply = ext_apply)
+        
+        # self.ext_handler, self.int_handler = gateway_pair(
+        #     thread_state,
+        #     self.tracer,
+        #     immutable_types = immutable_types,
+        #     ext_apply = ext_apply,
+        #     int_proxytype = int_proxytype,
+        #     ext_proxytype = functional.identity)
+
+    # def extend_type(self, base):
         
-        # ok, how to provide __getattr__ style access, 
+    #     # ok, how to provide __getattr__ style access, 
 
-        extended = extending_proxytype(
-            cls = base,
-            thread_state = self.thread_state, 
-            int_handler = self.int_handler,
-            ext_handler = self.ext_handler,
-            on_subclass_new = self.bind,
-            is_stub = True)
+    #     extended = extending_proxytype(
+    #         cls = base,
+    #         thread_state = self.thread_state, 
+    #         int_handler = self.int_handler,
+    #         ext_handler = self.ext_handler,
+    #         on_subclass_new = self.bind,
+    #         is_stub = True)
 
-        self.immutable_types.add(extended)
-        # proxytype = extending_proxytype(base)
+    #     self.immutable_types.add(extended)
+    #     # proxytype = extending_proxytype(base)
 
-        # make_extensible(cls = extended, 
-        #                 int_handler = self.int_handler, 
-        #                 ext_handler = self.ext_handler,
-        #                 on_new = self.reader.supply)
+    #     # make_extensible(cls = extended, 
+    #     #                 int_handler = self.int_handler, 
+    #     #                 ext_handler = self.ext_handler,
+    #     #                 on_new = self.reader.supply)
 
-        return extended
+    #     return extended

retracesoftware/proxy/thread.py

@@ -1,11 +1,46 @@
 import retracesoftware.functional as functional
 import retracesoftware_utils as utils
 
+# def thread_aware_writer(writer):
+#     on_thread_switch = functional.sequence(utils.thread_id(), writer.handle('THREAD_SWITCH'))
+#     return utils.threadawareproxy(on_thread_switch = on_thread_switch, target = writer)
+
 class ThreadSwitch:
-    def __init__(self, thread_id):
-        self.thread_id = thread_id
+    __slots__ = ['id']
+
+    def __init__(self, id):
+        self.id = id
+
+def set_thread_id(writer, id):
+    utils.set_thread_id(writer.handle(ThreadSwitch(id)))
+
+def write_thread_switch(writer):
+    on_thread_switch = functional.repeatedly(functional.sequence(utils.thread_id, writer))
+
+    return lambda f: utils.thread_aware_proxy(target = f, on_thread_switch = on_thread_switch, sticky = False)
+
+def prefix_with_thread_id(f, current):
+    def next():
+        nonlocal current, f
+        obj = f()
+
+        while isinstance(obj, ThreadSwitch):
+            current = obj.id
+            obj = f()
+
+        return (current, obj)
+
+    return next
+
+def per_thread_messages(messages):
+    thread_id = utils.thread_id
+    # thread_id = lambda: 'FOOOOO!!!'
 
+    demux = utils.demux(source = prefix_with_thread_id(messages, thread_id()), key_function = lambda obj: obj[0])
 
-def thread_aware_writer(writer):
-    on_thread_switch = functional.sequence(utils.thread_id(), writer.handle('THREAD_SWITCH'))
-    return utils.threadawareproxy(on_thread_switch = on_thread_switch, target = writer)
+    # def next():
+    #     thread,message = demux(thread_id())
+    #     return message
+    
+    # return next
+    return functional.repeatedly(lambda: demux(thread_id())[1])

{retracesoftware_proxy-0.1.0.dist-info → retracesoftware_proxy-0.1.1.dist-info}/METADATA

@@ -1,12 +1,7 @@
 Metadata-Version: 2.4
 Name: retracesoftware_proxy
-Version: 0.1.0
-Summary: Proxy layer for retracesoftware runtime
+Version: 0.1.1
 License: Apache-2.0
-Requires-Python: >=3.11
-Description-Content-Type: text/markdown
 Requires-Dist: retracesoftware_utils
 Requires-Dist: retracesoftware_functional
 Requires-Dist: retracesoftware_stream
-
-# proxy

retracesoftware_proxy-0.1.1.dist-info/RECORD

@@ -0,0 +1,26 @@
+retracesoftware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+retracesoftware/config.json,sha256=zhi3DZKG0pIT3Mh2EUXlzQai-U6YrknueOjMJLwNKxY,8281
+retracesoftware/install/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+retracesoftware/install/config.py,sha256=EzE5ifQF2lo--hu2njI4T0FJ-zlnWDJV6i7x0DMkVTw,1364
+retracesoftware/install/edgecases.py,sha256=NR3lyvad9sRsyeDv_Ya8V4xMgPsMPOi9rMcnFOJGOEA,6330
+retracesoftware/install/globals.py,sha256=F8XvIoZQQ10gSRalk30dvdKllxlwxkaggYY6FogLDxY,510
+retracesoftware/install/install.py,sha256=nHnXjLnZDcY2untKR7BsPJEAcwoHfvXqgCmdHLiwRPE,5104
+retracesoftware/install/patcher.py,sha256=PY4j3aXzu5l5fOGiChT8Y54nzhVpnHkWTGcxPtpe5mo,16773
+retracesoftware/install/predicate.py,sha256=tX7NQc0rGkyyHYO3mduYHcJHbw1wczT53m_Dpkzo6do,2679
+retracesoftware/install/record.py,sha256=Y-vDuUP_ZVzMC8PGhZP2fp8gLkIa5FJPhMKTBUSXi_o,3113
+retracesoftware/install/references.py,sha256=0nUY_9BkeFz2imcw97rcJNq2jqISCB8dysBbCrh1eCo,1623
+retracesoftware/install/replay.py,sha256=SV7-k05xZFiNfBaxrlLrqbB8-i01IPvnJQjRj9zuinI,1828
+retracesoftware/install/tracer.py,sha256=UUVzBD_Nd91VH4iTs7ZDzaIbp_WeiOCSQnSe76dmfjM,4588
+retracesoftware/install/typeutils.py,sha256=_a1PuwdCsYjG1Nkd77V-flqYtwbD4RkJVKn6Z-xABL4,1813
+retracesoftware/proxy/__init__.py,sha256=ZlDZIuUmKFsE9Tvfd2EKGabTepqv8nrbr5pQhCM3IKc,193
+retracesoftware/proxy/gateway.py,sha256=qRaE1xIdbRy6kBWmvvrBh-xKRmywWybO01yi1ppVdu8,6062
+retracesoftware/proxy/proxyfactory.py,sha256=2PgC0NtDbRmhmU--caTiQDsaF8s1h9tavQxvPIow_bM,11912
+retracesoftware/proxy/proxysystem.py,sha256=aX5bYqL2yf7mSgbjtDh1-n8dQ98nHZLT55kSLdVMy_c,6442
+retracesoftware/proxy/proxytype.py,sha256=RuZL0xl48hfSnOFMum74FXdde-UNJ1Urz-ILBNMs4Ts,9398
+retracesoftware/proxy/record.py,sha256=ShQrPSiNvZ9hckW6eaOoHj-w7_-X1o7R6zlaZkV_zdI,7687
+retracesoftware/proxy/replay.py,sha256=jsg0DZTe1TBU5kjRt9weqLpHl8AlDQeqakNddYhBE2E,7111
+retracesoftware/proxy/thread.py,sha256=zAqzLDJuhZxieMPtHzipTbuZ8WSO4nmRBgDBs7kPQy0,1373
+retracesoftware_proxy-0.1.1.dist-info/METADATA,sha256=QuPCODtdgePy3CzNyVoMpLZAVbScOYpeHPfpTOwTIrQ,202
+retracesoftware_proxy-0.1.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+retracesoftware_proxy-0.1.1.dist-info/top_level.txt,sha256=hYHsR6txLidmqvjBMITpIHvmJJbmoCAgr76-IpZPRz8,16
+retracesoftware_proxy-0.1.1.dist-info/RECORD,,

retracesoftware_proxy-0.1.0.dist-info/RECORD

@@ -1,26 +0,0 @@
-retracesoftware/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-retracesoftware/config.json,sha256=aedf9CXxOBkcQk3BJVrh0GuBkIAjBGBRlrTXdoRJ-MY,8108
-retracesoftware/install/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-retracesoftware/install/config.py,sha256=EzE5ifQF2lo--hu2njI4T0FJ-zlnWDJV6i7x0DMkVTw,1364
-retracesoftware/install/edgecases.py,sha256=NR3lyvad9sRsyeDv_Ya8V4xMgPsMPOi9rMcnFOJGOEA,6330
-retracesoftware/install/globals.py,sha256=F8XvIoZQQ10gSRalk30dvdKllxlwxkaggYY6FogLDxY,510
-retracesoftware/install/install.py,sha256=VNtivSf6A9wtLzIkZKJQ7thPkYTdjtTmxaIkPUOwLhg,5942
-retracesoftware/install/patcher.py,sha256=5DGzVaNM53Z_KWz-wWQxlr1WqeWuuxKoVZyN5tNGuTw,15866
-retracesoftware/install/predicate.py,sha256=tX7NQc0rGkyyHYO3mduYHcJHbw1wczT53m_Dpkzo6do,2679
-retracesoftware/install/record.py,sha256=mJyz8ZFnrveDCvrUHksTXaFZbBX10yqH6UBV1QH5EwA,4370
-retracesoftware/install/references.py,sha256=0nUY_9BkeFz2imcw97rcJNq2jqISCB8dysBbCrh1eCo,1623
-retracesoftware/install/replay.py,sha256=ox43e8k_uvn9w6vf6rt8f3KwaXcBVx2GbvWaLZpwqR4,4952
-retracesoftware/install/tracer.py,sha256=dFhXKkmvGLF-_WzQvZXxNO1Ftj6crH1SM6pGBU4cqMY,4586
-retracesoftware/install/typeutils.py,sha256=_a1PuwdCsYjG1Nkd77V-flqYtwbD4RkJVKn6Z-xABL4,1813
-retracesoftware/proxy/__init__.py,sha256=NaGsqoj4X3NpHfTAmRIfsXM16R6AGE99ciQeknj3sXc,119
-retracesoftware/proxy/gateway.py,sha256=JtSwwllXiUykpNdojbK7okyYadRnILGgpRCHxAQijZs,3911
-retracesoftware/proxy/proxyfactory.py,sha256=2PgC0NtDbRmhmU--caTiQDsaF8s1h9tavQxvPIow_bM,11912
-retracesoftware/proxy/proxysystem.py,sha256=kDdtea-vCcsqdwSwmgGBBvVrIRl6Gwb89Wgx6VSIwgQ,759
-retracesoftware/proxy/proxytype.py,sha256=P78aL3_aemG8p3NKmP4YfAcwC8IDr7LIq5-dkV4n0Ec,9038
-retracesoftware/proxy/record.py,sha256=yI8CH0oOyrAyvjy9JsawgkQh9jYTlg9sQ_CcejrFKO4,4772
-retracesoftware/proxy/replay.py,sha256=usbb2OTX6uJG_zialqHk9en0mxD2xEhjPajMZDjZnkQ,3940
-retracesoftware/proxy/thread.py,sha256=9_6gWiRbir77f9kelpvXaTWviRfZo0ACkKPdGNbrq2Q,394
-retracesoftware_proxy-0.1.0.dist-info/METADATA,sha256=c24hdDKP-miIrX6mM1yVyXCQeu0ozLP4N0ebtqiGccw,324
-retracesoftware_proxy-0.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-retracesoftware_proxy-0.1.0.dist-info/top_level.txt,sha256=hYHsR6txLidmqvjBMITpIHvmJJbmoCAgr76-IpZPRz8,16
-retracesoftware_proxy-0.1.0.dist-info/RECORD,,