commit aadad3991d586cb1e6ee0edaebb8054fa49f4031 Author: David Fifield david@bamsoftware.com Date: Sun Apr 8 17:58:51 2012 -0700

Add a faster numpy-based apply_mask. --- connector.py | 27 ++++++++++++++++++++++++++- 1 files changed, 26 insertions(+), 1 deletions(-)

diff --git a/connector.py b/connector.py index dad0071..d101a30 100755 --- a/connector.py +++ b/connector.py @@ -24,6 +24,11 @@ except ImportError: # Python 2.4 uses this name. from sha import sha as sha1

+try: + import numpy +except ImportError: + numpy = None + DEFAULT_REMOTE_ADDRESS = "0.0.0.0" DEFAULT_REMOTE_PORT = 9000 DEFAULT_LOCAL_ADDRESS = "127.0.0.1" @@ -130,7 +135,22 @@ def format_addr(addr):

-def apply_mask(payload, mask_key): +def apply_mask_numpy(payload, mask_key): + if len(payload) == 0: + return "" + payload_a = numpy.frombuffer(payload, dtype="|u4", count=len(payload)//4) + m, = numpy.frombuffer(mask_key, dtype="|u4", count=1) + result = numpy.bitwise_xor(payload_a, m).tostring() + i = len(payload) // 4 * 4 + if i < len(payload): + remainder = [] + while i < len(payload): + remainder.append(chr(ord(payload[i]) ^ ord(mask_key[i % 4]))) + i += 1 + result = result + "".join(remainder) + return result + +def apply_mask_py(payload, mask_key): result = array.array("B", payload) m = array.array("B", mask_key) i = 0 @@ -149,6 +169,11 @@ def apply_mask(payload, mask_key): i += 1 return result.tostring()

+if numpy is not None: + apply_mask = apply_mask_numpy +else: + apply_mask = apply_mask_py + class WebSocketFrame(object): def __init__(self): self.fin = False