Morevna Changeset - 0b67ddd4455a

Changeset - 0b67ddd4455a

Parent rev.

Child rev.

[Not reviewed]

default

0 4 0

Laman - 7 years ago 2018-01-22 01:04:39

split batchSize parameter

4 files changed with 15 insertions and 8 deletions:

config-example.json

src/client.py

src/config.py

src/tests/test_overall.py

0 comments (0 inline, 0 general)

config-example.json

➞

Show inline comments

+{
 	"hosts": ["127.0.0.1"],
 	"port": 9901,
 	"batchSize": 64
 	"batchSize": {
 		"hash": 256,
 		"data": 64
+	}
+}

src/client.py

➞

Show inline comments

@@ @@ -71,13 +71,13 @@ class Client(NetNode): @@
 		# determine which blocks to send
 		print(datetime.now(), "negotiating:")
 		progress=Progress(localTree.leafCount)
 		while len(nodeStack)>0:
 			indices=[]
 			for i in range(conf.batchSize):
+			for i in range(conf.batchSize.hash):
 				indices.append(nodeStack.pop())
 				if len(nodeStack)==0: break
 			self._outcoming.writeMsg({"command":"req", "index":indices, "dataType":"hash"})
 			jsonData,binData=self._incoming.readMsg()
 			assert jsonData["index"]==indices
@@ @@ -108,16 +108,16 @@ class Client(NetNode): @@
 		dataFile=open(self._filename, mode="rb")
 		i1=-1
 		print(datetime.now(), "sending data:")
 		progress=Progress(len(blocksToTransfer))
 		for k in range(0,len(blocksToTransfer),conf.batchSize):
+		for k in range(0,len(blocksToTransfer),conf.batchSize.data):
 			indices=[]
 			blocks=[]
 			for j in range(conf.batchSize):
+			for j in range(conf.batchSize.data):
 				if k+j>=len(blocksToTransfer): break
 				i2=blocksToTransfer[k+j]
 				if i1+1!=i2:
 					dataFile.seek(i2*HashTree.BLOCK_SIZE)
 				block=dataFile.read(HashTree.BLOCK_SIZE)
@@ @@ -145,14 +145,14 @@ class Client(NetNode): @@
 		log.info(blocksToTransfer)
 		dataFile=DataFile.open(self._filename, mode="rb+")
 		print(datetime.now(), "receiving data:")
 		progress=Progress(len(blocksToTransfer))
 		for k in range(0,len(blocksToTransfer),conf.batchSize):
 			indices=blocksToTransfer[k:k+conf.batchSize]
 		for k in range(0,len(blocksToTransfer),conf.batchSize.data):
 			indices=blocksToTransfer[k:k+conf.batchSize.data]
 			self._outcoming.writeMsg({"command":"req", "index":indices, "dataType":"data"})
 			jsonData,binData=self._incoming.readMsg()
 			assert jsonData["command"]=="send" and jsonData["index"]==indices and jsonData["dataType"]=="data", jsonData
 			for (j,i) in enumerate(indices):
 				block=binData[j*HashTree.BLOCK_SIZE:(j+1)*HashTree.BLOCK_SIZE]
 				dataFile.writeAt(i,block)

src/config.py

➞

Show inline comments

@@ @@ -24,7 +24,10 @@ if os.path.isfile(configFile): @@
 version=[0,1,0]
 lowestCompatible=[0,1,0] # tuple is more fitting but json conversion transforms it into a list anyway
 hosts=conf.get("hosts",["127.0.0.1"])
 port=conf.get("port",9901)
 batchSize=conf.get("batchSize",64)
 bSize=conf.get("batchSize",dict())
 class batchSize:
 	hash=bSize.get("hash",256)
 	data=bSize.get("data",64)

src/tests/test_overall.py

➞

Show inline comments

@@ @@ -14,13 +14,14 @@ from . import RedirectedOutput @@
 config.logger.removeHandler(config.handler)
 handler=FileHandler("/tmp/morevna.log")
 handler.setFormatter(config.formatter)
 config.logger.addHandler(handler)
 config.batchSize=8
 config.batchSize.hash=8
 config.batchSize.data=8
 dataDir=os.path.join(config.directory,"src/tests/data")
 filename=os.path.join(dataDir,"test.img")
 def compareFiles(f1,f2):

0 comments (0 inline, 0 general)