retracesoftware-proxy 0.1.19__py3-none-any.whl → 0.1.21__py3-none-any.whl

retracesoftware/install/patcher.py

@@ -337,20 +337,20 @@ class Patcher:
     @patch
     def patch_exec(self, exec):
 
-        def exec_wrapper2(source, globals = None, locals = None):
-            if isinstance(source, types.CodeType) and source.co_name == '<module>':
-                module = sys.modules[globals['__name__']]
-                self(module)
+        def is_module(source, *args):
+            return isinstance(source, types.CodeType) and source.co_name == '<module>'
+        
+        def after_exec(source, globals = None, locals = None):
+            self(sys.modules[globals['__name__']])
         
         def first(x): return x[0]
             
-        wrapped_exec = functional.sequence(
-            functional.vector(
-                self.thread_state.wrap('internal', exec),
-                exec_wrapper2),
-            first)
-
-        return self.thread_state.dispatch(exec, internal = wrapped_exec)
+        def disable(func): return self.thread_state.wrap('disabled', func)
+    
+        return self.thread_state.dispatch(
+            exec, 
+            internal = functional.sequence(
+                functional.vector(exec, functional.when(is_module, disable(after_exec))), first))
     
     # self.thread_state.wrap(desired_state = 'disabled', function = exec_wrapper)
 
@@ -416,14 +416,21 @@ class Patcher:
     @patch
     def patch_extension_exec(self, exec):
         
-        def wrapper(module):
-            with self.thread_state.select('internal'):
-                res = exec(module)
+        def first(x): return x[0]
 
-            self(module)
-            return res
+        def disable(func): return self.thread_state.wrap('disabled', func)
+    
+        return self.thread_state.dispatch(exec, 
+                                   internal = functional.sequence(functional.vector(exec, disable(self)), first))
+        
+        # def wrapper(module):
+        #     with self.thread_state.select('internal'):
+        #         res = exec(module)
+
+        #     self(module)
+        #     return res
 
-        return wrapper
+        # return wrapper
 
     @patch
     def path_predicates(self, func, param):
@@ -524,7 +531,7 @@ class Patcher:
                 self.post_commit(mod_name, updates)
 
     def __call__(self, module):
-        
+                
         if not hasattr(module, '__retrace__'):
 
             configs = list(self.configs(module))
@@ -638,21 +645,19 @@ def install(mode):
 
     threading.current_thread().__retrace__ = system
 
-    def is_entry_frame(frame):
-        return frame.globals.get("__name__", None) == "__main__"
+    # original = atexit.register
 
-    original = atexit.register
+    # def atexit_register(function):
+    #     return original(thread_state.wrap('internal', function))
 
-    def atexit_register(function):
-        if thread_state.value == 'internal':
-            return original(thread_state.wrap('internal', function))
-        else:
-            return original(function)
+    def wrap_internal(func): return thread_state.wrap('internal', func)
 
-    atexit.register = atexit_register
+    atexit.register = \
+        thread_state.dispatch(atexit.register, internal = functional.sequence(wrap_internal, atexit.register))
 
     def disable_after_main(frame):
-        if is_entry_frame(frame):
+        if system.is_entry_frame(frame):
+            print('enabling retrace!!!!')
             # utils.intercept_frame_eval(None)
             thread_state.value = 'internal'
             
@@ -669,5 +674,5 @@ def install(mode):
     utils.intercept_frame_eval(disable_after_main)
 
     # utils.sigtrap(None)
-
+    print(f'retrace installed: {thread_state}')
     return system

retracesoftware/install/record.py

@@ -70,6 +70,10 @@ def record_system(thread_state, immutable_types, config):
     with open(recording_path / 'tracing_config.json', 'w') as f:
         json.dump(tracing_config, f, indent=2)
 
+    def write_main_path(path):
+        with open(recording_path / 'mainscript', 'w') as f:
+            f.write(path)
+
     # writer = stream.writer(path = recording_path / 'trace.bin')
     
     # os.register_at_fork(
@@ -106,4 +110,5 @@ def record_system(thread_state, immutable_types, config):
     return RecordProxySystem(thread_state = thread_state,
                              immutable_types = immutable_types, 
                              tracing_config = tracing_config,
+                             write_main_path = write_main_path,
                              path = recording_path / 'trace.bin')

retracesoftware/install/replay.py

@@ -48,7 +48,11 @@ def replay_system(thread_state, immutable_types, config):
     with open(recording_path / "tracing_config.json", "r", encoding="utf-8") as f:
         tracing_config = json.load(f)
 
+    with open(recording_path / "mainscript", "r", encoding="utf-8") as f:
+        mainscript = f.read()
+
     return ReplayProxySystem(thread_state = thread_state, 
                                 immutable_types = immutable_types,
                                 tracing_config = tracing_config,
+                                mainscript = mainscript,
                                 path = recording_path / 'trace.bin')

retracesoftware/proxy/proxysystem.py

@@ -205,6 +205,9 @@ class ProxySystem:
 
         return extended
 
+    def is_entry_frame(self, frame):
+        return frame.globals.get("__name__", None) == "__main__"
+
     def __call__(self, obj):
         assert not isinstance(obj, BaseException)
         assert not isinstance(obj, Proxy)

retracesoftware/proxy/record.py

@@ -75,12 +75,20 @@ class RecordProxySystem(ProxySystem):
         utils.set_thread_id(self.writer.handle(ThreadSwitch(id)))
         # utils.set_thread_id(id)
 
+    def is_entry_frame(self, frame):
+        if super().is_entry_frame(frame):
+            self.write_main_path(frame.function.__code__.co_filename)
+            return True
+        return False
+
     def __init__(self, thread_state, 
                  immutable_types, 
                  tracing_config,
+                 write_main_path,
                  path):
         
         self.fork_counter = 0
+        self.write_main_path = write_main_path
 
         self.getpid = thread_state.wrap(
             desired_state = 'disabled', function = os.getpid)
@@ -123,8 +131,10 @@ class RecordProxySystem(ProxySystem):
 
         sync_handle = self.writer.handle('SYNC')
 
+        write_sync = thread_state.dispatch(utils.noop, internal = functional.lazy(sync_handle))
+
         self.sync = lambda function: \
-            utils.observer(on_call = functional.lazy(sync_handle), function = function)
+            utils.observer(on_call = write_sync, function = function)
 
         error = self.writer.handle('ERROR')
 

retracesoftware/proxy/replay.py

@@ -230,15 +230,23 @@ class ReplayProxySystem(ProxySystem):
         print(f'on_thread_exit!!!!')
         self.reader.wake_pending()
 
+    def is_entry_frame(self, frame):
+        if super().is_entry_frame(frame) and frame.function.__code__.co_filename == self.mainscript:
+            return True
+        return False
+
     def __init__(self, 
                  thread_state,
                  immutable_types,
                  tracing_config,
+                 mainscript,
                  path,
                  fork_path = []):
         
         # self.messages_read = 0
 
+        self.mainscript = mainscript
+
         self.reader = stream.reader(path, 
                                     thread = thread_id,
                                     timeout_seconds = 60)
@@ -278,7 +286,7 @@ class ReplayProxySystem(ProxySystem):
         self.reader.type_deserializer[StubRef] = self.stub_factory
         self.reader.type_deserializer[GlobalRef] = lambda ref: ref()
                 
-        read_sync = functional.lazy(thread_state.wrap('disabled', self.read_required), 'SYNC')
+        read_sync = thread_state.dispatch(utils.noop, internal = functional.lazy(thread_state.wrap('disabled', self.read_required), 'SYNC'))
 
         self.sync = lambda function: utils.observer(on_call = read_sync, function = function)
 

{retracesoftware_proxy-0.1.19.dist-info → retracesoftware_proxy-0.1.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: retracesoftware_proxy
-Version: 0.1.19
+Version: 0.1.21
 License: Apache-2.0
 Requires-Dist: retracesoftware_utils
 Requires-Dist: retracesoftware_functional

{retracesoftware_proxy-0.1.19.dist-info → retracesoftware_proxy-0.1.21.dist-info}/RECORD

@@ -6,24 +6,24 @@ retracesoftware/install/config.py,sha256=EzE5ifQF2lo--hu2njI4T0FJ-zlnWDJV6i7x0DM
 retracesoftware/install/edgecases.py,sha256=NR3lyvad9sRsyeDv_Ya8V4xMgPsMPOi9rMcnFOJGOEA,6330
 retracesoftware/install/globals.py,sha256=F8XvIoZQQ10gSRalk30dvdKllxlwxkaggYY6FogLDxY,510
 retracesoftware/install/install.py,sha256=HCD_ji8XCr96b5fNzNdL_8qcEp0Jf05Em7T6GA6u8HU,4969
-retracesoftware/install/patcher.py,sha256=Xzal6y9WZjLv5269PujaZx9ZCKb2Mbo5EBTI9qRA_Pk,21777
+retracesoftware/install/patcher.py,sha256=XwpySyqaop3bnLc8ewtowxLchAC0mOtXWDfmk5zTE_s,22195
 retracesoftware/install/predicate.py,sha256=tX7NQc0rGkyyHYO3mduYHcJHbw1wczT53m_Dpkzo6do,2679
-retracesoftware/install/record.py,sha256=R2GOIA_WAggrNmVwZJh9r1xp-GVu43iKq-ykQ1VKEHE,3408
+retracesoftware/install/record.py,sha256=mjk4bien8uWp8c-vWNw3Y4BRR5xO4AWsZi1aodkW5yc,3590
 retracesoftware/install/references.py,sha256=A-G651IDOfuo00MkbAdpbIQh_15ChvJ7uAVTSmE6zd4,1721
-retracesoftware/install/replay.py,sha256=VUiHvQK3mgAJEGmtE2TFs9kXzxdWtsjibEcGkhZVCVE,1830
+retracesoftware/install/replay.py,sha256=36x40dk8pCmVjHz8zKd2OLY3B7UkP0NEb-1V1X8o3Rg,1992
 retracesoftware/install/tracer.py,sha256=MiaTPlUwcRbgL4CTNhvC4Y5mUhkb--Y7_icTPhscSmY,9014
 retracesoftware/install/typeutils.py,sha256=-oFzgUfq_nHeOkj3YKZiMLlMzQhCedg3qymLiEJNkVE,2253
 retracesoftware/proxy/__init__.py,sha256=ntIyqKhBRkKEkcW_oOPodikh-mxYl8OXRnSaj-9-Xwc,178
 retracesoftware/proxy/gateway.py,sha256=xESohWXkiNm4ZutU0RgWUwxjxcBWRQ4rQyxIGQXv_F4,1590
 retracesoftware/proxy/globalref.py,sha256=yXtJsOeBHN9xoEgJWA3MJco-jD2SQUef_fDatA4A6rg,803
 retracesoftware/proxy/proxyfactory.py,sha256=qhOqDfMJnLDNkQs26JqDB431MwjjRhGQi8xupJ45asg,12272
-retracesoftware/proxy/proxysystem.py,sha256=IicoTW06_axjJQqDVqZ8Pg3GeNUq1JsZc_fG58hCSK4,7968
+retracesoftware/proxy/proxysystem.py,sha256=zXrK4eMBJHZlmRJ2pQMltzYHF5CjnAZV6Z_teGH6DO8,8071
 retracesoftware/proxy/proxytype.py,sha256=83y5rQRSts-5rLZu_k3tT90mwX2M-Ny6RZ91l-LTJ6k,13199
-retracesoftware/proxy/record.py,sha256=47vhAYIUrR2bWo-rQ9xU_Xyg3kNrA5Lqq4-8Cxg4-zg,5463
-retracesoftware/proxy/replay.py,sha256=h5PKxG4KCgZP09zyp28fW3mE-RFX6HCmEMKPYL_kzcM,9967
+retracesoftware/proxy/record.py,sha256=AsoVhuTX0pVVAqOih9-Mgh54psyggqfAXwAYYwy7umM,5818
+retracesoftware/proxy/replay.py,sha256=mMb3jiCPS8W-Nev1JMaBIQSxRjV1sKTJYRPWAurw4i0,10264
 retracesoftware/proxy/stubfactory.py,sha256=eHlbzWR1LoQVkIRX1HoLPPQSOpYhOO_5R_p3buD4o7s,5256
 retracesoftware/proxy/thread.py,sha256=T1ME6DHB8O0xVnX3Rt1lMl7oCJ2Y0aoFT91D76yNICk,3073
-retracesoftware_proxy-0.1.19.dist-info/METADATA,sha256=NOPa-An94KcKOSi2HUGmv-dmZBlijYQogJMEJRJpeqs,203
-retracesoftware_proxy-0.1.19.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-retracesoftware_proxy-0.1.19.dist-info/top_level.txt,sha256=hYHsR6txLidmqvjBMITpIHvmJJbmoCAgr76-IpZPRz8,16
-retracesoftware_proxy-0.1.19.dist-info/RECORD,,
+retracesoftware_proxy-0.1.21.dist-info/METADATA,sha256=VgiJFRiDUgZhUA5wfe4TLOD62q0y2Dvu3jCGGuR2t4s,203
+retracesoftware_proxy-0.1.21.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+retracesoftware_proxy-0.1.21.dist-info/top_level.txt,sha256=hYHsR6txLidmqvjBMITpIHvmJJbmoCAgr76-IpZPRz8,16
+retracesoftware_proxy-0.1.21.dist-info/RECORD,,