diff --git a/src/benchmark.py b/src/benchmark.py --- a/src/benchmark.py +++ b/src/benchmark.py @@ -5,21 +5,21 @@ import threading from hashtree import HashTree -def timeF(f): +def time_f(f): start = time() f() end = time() print((end-start), "s") -def fullRead(): +def full_read(): block = True with open("/home/laman/ext2.img", mode="rb") as f: while block: block = f.read(HashTree.BLOCK_SIZE) -def selectedRead(): +def selected_read(): with open("/home/laman/blocks.txt") as f: blocks = [int(x) for x in f] with open("/home/laman/ext2.img", mode="rb") as f: @@ -31,7 +31,7 @@ def selectedRead(): i1 = i2 -def lessSelectedRead(): +def less_selected_read(): with open("/home/laman/blocks.txt") as f: blocks = [int(x) for x in f] with open("/home/laman/ext2.img", mode="rb") as f: @@ -45,19 +45,19 @@ def lessSelectedRead(): i1 = i2 -def shortSockets(): +def short_sockets(): def _server(): - serverSock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - serverSock.bind(("", 12329)) - serverSock.listen(1) + server_sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + server_sock.bind(("", 12329)) + server_sock.listen(1) for i in range(10000): - sock, address = serverSock.accept() + sock, address = server_sock.accept() with sock.makefile(mode="rb") as fr, sock.makefile(mode="wb") as fw: fr.readline() sock.shutdown(socket.SHUT_RDWR) sock.close() - serverSock.close() + server_sock.close() def _client(): for i in range(10000): @@ -77,12 +77,12 @@ def shortSockets(): c.join() -def longSockets(): +def long_sockets(): def _server(): - serverSock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) - serverSock.bind(("", 12330)) - serverSock.listen(1) - sock, address = serverSock.accept() + server_sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) + server_sock.bind(("", 12330)) + server_sock.listen(1) + sock, address = server_sock.accept() with sock.makefile(mode="rb") as fr, sock.makefile(mode="wb") as fw: for i in range(10000): @@ -90,15 +90,15 @@ def longSockets(): sock.shutdown(socket.SHUT_RDWR) sock.close() - serverSock.close() + server_sock.close() def _client(): sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock.connect(("127.0.0.1", 12330)) with sock.makefile(mode="rb") as fr, sock.makefile(mode="wb") as fw: for i in range(10000): - fw.write(b"x"*4096+b"\n") - fw.flush() + fw.write(b"x"*4096+b"\n") + fw.flush() sock.shutdown(socket.SHUT_RDWR) sock.close() @@ -110,9 +110,9 @@ def longSockets(): c.join() -# timeF(fullRead) # 85.40341448783875 s -# timeF(selectedRead) # 6.774365186691284 s -# timeF(lessSelectedRead) # 5.930811405181885 s +# time_f(full_read) # 85.40341448783875 s +# time_f(selected_read) # 6.774365186691284 s +# time_f(less_selected_read) # 5.930811405181885 s -# timeF(shortSockets) # 3.928339719772339 s -# timeF(longSockets) # 0.15576839447021484 s +# time_f(short_sockets) # 3.928339719772339 s +# time_f(long_sockets) # 0.15576839447021484 s