Clean up machine.run loops for a bit better efficiency

Author: pjkundert

server/enip/device.py

@@ -1897,8 +1897,8 @@ def closure():
                     log.detail( "%s Parsing: %3d-%3d of %r", target, beg, end, reqdata )
                 req		= dotdict()
                 req.input	= reqdata[beg:end]
+                source		= peekable( req.input )
                 with target.parser as machine:
-                    source	= peekable( req.input )
                     with contextlib.closing( machine.run( source=source, data=req )) as engine:
                         for m,s in engine:
                             pass
@@ -2259,8 +2259,12 @@ def request( self, data, addr=None ):
                 source		= rememberable( data.request.input )
                 with self.parser_service_path as machine:
                     with contextlib.closing( machine.run( source=source, data=targetpath )) as engine:
-                        for i,(m,s) in enumerate( engine ):
+                        for m,s in engine:
                             pass
+                        # for i,(m,s) in enumerate( engine ):
+                        #     log.detail( "%s #%3d -> %10.10s; next byte %3d: %-10.10r: %s",
+                        #                 machine.name_centered(), i, s, source.sent, source.peek(),
+                        #                 repr( data ) if log.getEffectiveLevel() < logging.DETAIL else misc.reprlib.repr( data ))
             if log.isEnabledFor( logging.DETAIL ):
                 log.detail( "%s Routing request to target Object at address %s", self, enip_format( targetpath ))
             # We have the service and path. Find the target Object (see state_multiple_service.closure)
@@ -2275,12 +2279,13 @@ def request( self, data, addr=None ):
             assert target, "Unknown CIP Object in request: %s" % ( enip_format( targetpath ))
             source		= rememberable( data.request.input )
             with target.parser as machine:
-                with contextlib.closing( machine.run( path='request', source=source, data=data )) as engine:
-                    for i,(m,s) in enumerate( engine ):
+                with contextlib.closing( machine.run( source=source, data=data.request )) as engine:
+                    for m,s in engine:
                         pass
-                        #log.detail( "%s #%3d -> %10.10s; next byte %3d: %-10.10r: %s",
-                        #            machine.name_centered(), i, s, source.sent, source.peek(),
-                        #            repr( data ) if log.getEffectiveLevel() < logging.DETAIL else misc.reprlib.repr( data ))
+                    # for i,(m,s) in enumerate( engine ):
+                    #     log.detail( "%s #%3d -> %10.10s; next byte %3d: %-10.10r: %s",
+                    #                 machine.name_centered(), i, s, source.sent, source.peek(),
+                    #                 repr( data ) if log.getEffectiveLevel() < logging.DETAIL else misc.reprlib.repr( data ))
 
             target.request( data.request, addr=addr )
         except:

server/enip/logix.py

@@ -31,6 +31,7 @@
 
 """
 
+import contextlib
 import json
 import logging
 import sys
@@ -958,11 +959,13 @@ def process( addr, data, **kwds ):
             if 'input' in data.request.enip:
                 source.chain( data.request.enip.input )
             with ucmm.parser as machine:
-                for i,(m,s) in enumerate( machine.run( path='request.enip', source=source, data=data )):
-                    #log.detail( "%s #%3d -> %10.10s; next byte %3d: %-10.10r: %s",
-                    #            machine.name_centered(), i, s, source.sent, source.peek(),
-                    #            repr( data ) if log.getEffectiveLevel() < logging.DETAIL else misc.reprlib.repr( data ))
-                    pass
+                with contextlib.closing( machine.run( source=source, data=data.request.enip )) as engine:
+                    for m,s in engine:
+                        pass
+                    # for i,(m,s) in enumerate( engine ):
+                    #     log.detail( "%s #%3d -> %10.10s; next byte %3d: %-10.10r: %s",
+                    #                 machine.name_centered(), i, s, source.sent, source.peek(),
+                    #                 repr( data ) if log.getEffectiveLevel() < logging.DETAIL else misc.reprlib.repr( data ))
         if log.isEnabledFor( logging.DETAIL ):
             log.detail( "EtherNet/IP CIP Request  (Client %16s): %s", addr, enip_format( data.request ))
 

server/enip/main.py

@@ -635,9 +635,7 @@ def enip_srv_udp( conn, name, enip_process, **kwds ):
                 # Exception (dfa exits in non-terminal state).  Build data.request.enip:
                 begun		= misc.timer() # waiting for next transaction
                 addr,stats	= None,None
-                with contextlib.closing( machine.run(
-                        path='request', source=source, data=data )) as engine:
-                    # PyPy compatibility; avoid deferred destruction of generators
+                with contextlib.closing( machine.run( source=source, data=data.request )) as engine:
                     for mch,sta in engine:
                         if sta is not None:
                             # No more transitions available.  Wait for input.  
@@ -738,9 +736,7 @@ def enip_srv_tcp( conn, addr, name, enip_process, delay=None, **kwds ):
                 # If no/partial EtherNet/IP header received, parsing will fail with a NonTerminal
                 # Exception (dfa exits in non-terminal state).  Build data.request.enip:
                 begun		= misc.timer()
-                with contextlib.closing( machine.run(
-                        path='request', source=source, data=data )) as engine:
-                    # PyPy compatibility; avoid deferred destruction of generators
+                with contextlib.closing( machine.run( source=source, data=data.request )) as engine:
                     for mch,sta in engine:
                         if sta is not None:
                             continue

server/enip/parser.py

@@ -1891,6 +1891,7 @@ def __init__( self, name=None, **kwds ):
         slct			= octets_noop(	'sel_CIP' )
         for cmd,cls in self.COMMAND_PARSERS.items():
 
+            '''
             def recog_CIP( path=None, data=None, cmd=cmd, **kwds ):
                 found		= data[path+'..command'] in cmd
                 log.isEnabledFor( logging.INFO ) and log.info(
@@ -1902,12 +1903,12 @@ def recog_CIP( path=None, data=None, cmd=cmd, **kwds ):
                         enip_format( data ))
                 )
                 return data[path+'..command'] in cmd
-
+            '''
             slct[None]		= decide(
                 cls.__name__,
                 state		= cls( limit='...length', terminal=True ),
-                predicate	= recog_CIP,
-                #predicate	= lambda path=None, data=None, cmd=cmd, **kwds: data[path+'..command'] in cmd
+                #predicate	= recog_CIP,
+                predicate	= lambda path=None, data=None, cmd=cmd, **kwds: data[path+'..command'] in cmd,
             )
 
         def unrec_CIP( path=None, data=None, **kwds ):