Modified to use ByteBufferRentalService

Author: zanella

core/src/main/java/com/turn/ttorrent/common/Torrent.java

@@ -676,21 +676,25 @@ private static class CallableChunkHasher implements Callable<String> {
 
 		private final MessageDigest md;
 		private final ByteBuffer data;
+		private final ByteBufferRentalService bbrs;
 
-		CallableChunkHasher(ByteBuffer buffer) throws NoSuchAlgorithmException {
+		CallableChunkHasher(ByteBuffer rentedBuffer, ByteBufferRentalService bbrs) throws NoSuchAlgorithmException {
 			this.md = MessageDigest.getInstance("SHA-1");
 
-			this.data = ByteBuffer.allocate(buffer.remaining());
-			buffer.mark();
-			this.data.put(buffer);
-			this.data.clear();
-			buffer.reset();
+			rentedBuffer.mark();
+			rentedBuffer.reset();
+			this.data = rentedBuffer;
+
+			this.bbrs = bbrs;
 		}
 
 		@Override
-		public String call() throws UnsupportedEncodingException {
+		public String call() throws UnsupportedEncodingException, InterruptedException {
 			this.md.reset();
-			this.md.update(this.data.array());
+			this.md.update(this.data);
+
+			bbrs.put( this.data );
+
 			return new String(md.digest(), Torrent.BYTE_ENCODING);
 		}
 	}
@@ -719,13 +723,14 @@ private static String hashFiles(List<File> files, int pieceLenght)
 		throws InterruptedException, IOException, NoSuchAlgorithmException {
 		int threads = getHashingThreadsCount();
 		ExecutorService executor = Executors.newFixedThreadPool(threads);
-		ByteBuffer buffer = ByteBuffer.allocate(pieceLenght);
+		final ByteBufferRentalService bbrs = new ByteBufferRentalService(threads + 1, pieceLenght);
 		List<Future<String>> results = new LinkedList<Future<String>>();
 		StringBuilder hashes = new StringBuilder();
 
 		long length = 0L;
 		int pieces = 0;
 
+		ByteBuffer buffer = null;
 		long start = System.nanoTime();
 		for (File file : files) {
 			logger.info("Hashing data from {} with {} threads ({} pieces)...",
@@ -743,10 +748,13 @@ private static String hashFiles(List<File> files, int pieceLenght)
 			int step = 10;
 
 			try {
+				buffer = bbrs.take();
+
 				while (channel.read(buffer) > 0) {
 					if (buffer.remaining() == 0) {
 						buffer.clear();
-						results.add(executor.submit(new CallableChunkHasher(buffer)));
+						results.add(executor.submit(new CallableChunkHasher(buffer, bbrs)));
+						buffer = bbrs.take();
 					}
 
 					if (results.size() >= threads) {
@@ -765,10 +773,10 @@ private static String hashFiles(List<File> files, int pieceLenght)
 		}
 
 		// Hash the last bit, if any
-		if (buffer.position() > 0) {
+		if ((buffer != null) && (buffer.position() > 0)) {
 			buffer.limit(buffer.position());
 			buffer.position(0);
-			results.add(executor.submit(new CallableChunkHasher(buffer)));
+			results.add(executor.submit(new CallableChunkHasher(buffer, bbrs)));
 		}
 
 		pieces += accumulateHashes(hashes, results);