Changeset - 8ad57a925d81
[Not reviewed]
default
0 2 0
Laman - 8 years ago 2017-05-06 19:44:40

optimized some unnecessary disk seeks
2 files changed with 16 insertions and 8 deletions:
0 comments (0 inline, 0 general)
src/client.py
Show inline comments
 
@@ -13,73 +13,76 @@ filename=sys.argv[1]
 
def connect():
 
	s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 
	s.connect((conf.hosts[0], conf.port))
 
	fr=s.makefile(mode='rb')
 
	fw=s.makefile(mode='wb')
 
 
	networkReader=NetworkReader(fr)
 
	networkReader.start()
 
	networkWriter=NetworkWriter(fw)
 
	networkWriter.start()
 
 
	incoming=networkReader.output # synchronized message queue
 
	outcoming=networkWriter.input
 
 
	return (s,incoming,outcoming)
 
 
 
def negotiate(incoming,outcoming):
 
	localTree=HashTree.fromFile(open(filename,mode="rb"))
 
	blocksToTransfer=[]
 
	nodeStack=collections.deque([0]) # root
 
 
	# initialize session
 
	jsonData={"command":"init", "blockSize":localTree.BLOCK_SIZE, "blockCount":localTree.leafCount, "version":conf.version}
 
	outcoming.put((jsonData,b""))
 
 
	# determine which blocks to send
 
	while len(nodeStack)>0:
 
		i=nodeStack.pop()
 
		jsonData={"command":"req", "index":i}
 
		outcoming.put((jsonData,b""))
 
 
		jsonData,binData=incoming.get(timeout=2)
 
		assert jsonData["index"]==i
 
		assert jsonData["dataType"]=="hash"
 
 
		if localTree.store[i]!=binData:
 
			if 2*i+3<len(localTree.store): # inner node
 
				nodeStack.append(2*i+2)
 
				nodeStack.append(2*i+1)
 
			else: blocksToTransfer.append(i-localTree.leafStart) # leaf
 
 
	return blocksToTransfer
 
 
 
def sendData(outcoming,blocksToTransfer):
 
	print(blocksToTransfer)
 
	dataFile=open(filename,mode="rb")
 
	i1=-1
 
 
	for i in blocksToTransfer:
 
		jsonData={"command":"send", "index":i, "dataType":"data"}
 
		dataFile.seek(i*HashTree.BLOCK_SIZE)
 
	for i2 in blocksToTransfer:
 
		jsonData={"command":"send", "index":i2, "dataType":"data"}
 
		if i1+1!=i2:
 
			dataFile.seek(i2*HashTree.BLOCK_SIZE)
 
		binData=dataFile.read(HashTree.BLOCK_SIZE)
 
 
		print("block #{0}: {1}...{2}".format(i,binData[:5],binData[-5:]))
 
		print("block #{0}: {1}...{2}".format(i2,binData[:5],binData[-5:]))
 
 
		outcoming.put((jsonData,binData),timeout=2)
 
		i1=i2
 
 
	jsonData={"command":"end"}
 
	outcoming.put((jsonData,b""),timeout=2)
 
 
	outcoming.put(None)
 
	print("closing...")
 
	dataFile.close()
 
 
 
if __name__=="__main__":
 
	sock,incoming,outcoming = connect()
 
	blocksToTransfer=negotiate(incoming,outcoming)
 
	sendData(outcoming,blocksToTransfer)
 
 
	sock.close()
 
	sys.exit(0)
src/server.py
Show inline comments
 
import socket
 
from hashtree import HashTree
 
from networkers import NetworkReader,NetworkWriter
 
import collections
 
import sys
 
 
# debug copy default file
 
import shutil
 
origFilename=sys.argv[1]
 
filename=origFilename+"_"
 
shutil.copyfile(origFilename,filename)
 
 
 
localTree=HashTree.fromFile(open(filename,mode="rb"))
 
 
HOST = ''								 # Symbolic name meaning all available interfaces
 
PORT = 50009							# Arbitrary non-privileged port
 
s = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
 
s.bind((HOST, PORT))
 
s.listen(1)
 
conn, addr = s.accept()
 
print('Connected by', addr)
 
fr=conn.makefile(mode="rb")
 
fw=conn.makefile(mode="wb")
 
 
networkReader=NetworkReader(fr)
 
networkReader.start()
 
networkWriter=NetworkWriter(fw)
 
networkWriter.start()
 
 
blocksToTransfer=[]
 
nodeStack=collections.deque([0])
 
incoming=networkReader.output # synchronized message queue
 
outcoming=networkWriter.input
 
 
i1=-1
 
 
 
while True:
 
	jsonData,binData=incoming.get(timeout=2)
 
	dataFile=open(filename,mode="rb+")
 
	
 
	if jsonData["command"]=="init":
 
		assert jsonData["blockSize"]==localTree.BLOCK_SIZE
 
		assert jsonData["blockCount"]==localTree.leafCount
 
		
 
	elif jsonData["command"]=="req": # !! index out of range
 
		print("received request for node #{0}".format(jsonData["index"]))
 
		nodeHash=localTree.store[jsonData["index"]]
 
		
 
		jsonResponse={"command":"send", "index":jsonData["index"], "dataType":"hash"}
 
		binResponse=nodeHash
 
		
 
		outcoming.put((jsonResponse,binResponse),timeout=2)
 
	
 
	elif jsonData["command"]=="send" and jsonData["dataType"]=="data": # needlessly allow hashes and data in mixed order
 
		print("received data block #{0}: {1}...{2}".format(jsonData["index"],binData[:5],binData[-5:]))
 
		
 
		dataFile=open(filename,mode="rb+")
 
		dataFile.seek(jsonData["index"]*localTree.BLOCK_SIZE)
 
 
		i2=jsonData["index"]
 
		if i1+1!=i2:
 
			dataFile.seek(i2*localTree.BLOCK_SIZE)
 
		dataFile.write(binData)
 
		dataFile.close()
 
		i1=i2
 
		
 
		# never update the hash tree
 
		
 
	elif jsonData["command"]=="end":
 
		print("closing...")
 
		break
 
	
 
	else: pass # !! error
 
 
# fr.close()
 
# fw.close()
 
dataFile.close()
 
conn.close()
 
sys.exit(0)
0 comments (0 inline, 0 general)