X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Client%20Applications%2Frcracki_mt%2FMemoryPool.cpp;h=5c634c02df4c8cfa5515706731f76422b9c29805;hb=0fb676244827a448dc60118d6558c4a4e346ffee;hp=2129daa1884970c007dc6628fd512deaeb6506aa;hpb=1f5948bf50f1eafad5ab3a4737f6eb3e492999e8;p=freerainbowtables

diff --git a/Client Applications/rcracki_mt/MemoryPool.cpp b/Client Applications/rcracki_mt/MemoryPool.cpp
index 2129daa..5c634c0 100644
--- a/Client Applications/rcracki_mt/MemoryPool.cpp	
+++ b/Client Applications/rcracki_mt/MemoryPool.cpp	
@@ -1,81 +1,110 @@
-/*
-   RainbowCrack - a general propose implementation of Philippe Oechslin's faster time-memory trade-off technique.
-
-   Copyright (C) Zhu Shuanglei <shuanglei@hotmail.com>
-*/
-
-#include "MemoryPool.h"
-#include "Public.h"
-
-CMemoryPool::CMemoryPool(unsigned int bytesForChainWalkSet)
-{
-	m_pMem = NULL;
-	m_nMemSize = 0;
-
-	unsigned int nAvailPhys = GetAvailPhysMemorySize();
-	if (nAvailPhys < 32 * 1024 * 1024)
-	{
-		nAvailPhys = 256 * 1024 * 1024; // There is atleast 256 mb available (Some Linux distros returns a really low GetAvailPhysMemorySize())
-	}
-	
-	m_nMemMax = nAvailPhys - bytesForChainWalkSet;	// Leave memory for CChainWalkSet	
-
-	if (m_nMemMax < 16 * 1024 * 1024)
-		m_nMemMax = 16 * 1024 * 1024;
-
-}
-
-CMemoryPool::~CMemoryPool()
-{
-	if (m_pMem != NULL)
-	{
-		delete m_pMem;
-		m_pMem = NULL;
-		m_nMemSize = 0;
-	}
-}
-
-unsigned char* CMemoryPool::Allocate(unsigned int nFileLen, unsigned int& nAllocatedSize)
-{
-	if (nFileLen <= m_nMemSize)
-	{
-		nAllocatedSize = nFileLen;
-		return m_pMem;
-	}
-
-	unsigned int nTargetSize;
-	if (nFileLen < m_nMemMax)
-		nTargetSize = nFileLen;
-	else
-		nTargetSize = m_nMemMax;
-
-	// Free existing memory
-	if (m_pMem != NULL)
-	{
-		delete m_pMem;
-		m_pMem = NULL;
-		m_nMemSize = 0;
-	}
-
-	// Allocate new memory
-	//printf("allocating %u bytes memory\n", nTargetSize);
-	m_pMem = new (nothrow) unsigned char[nTargetSize];
-	while (m_pMem == NULL && nTargetSize >= 32 * 1024 * 1024 )
-	{
-	   nTargetSize -= 16 * 1024 * 1024;
-	   m_pMem = new (nothrow) unsigned char[nTargetSize];
-	}
-
-	if (m_pMem != NULL)
-	{
-		m_nMemSize = nTargetSize;
-		nAllocatedSize = nTargetSize;
-		return m_pMem;
-	}
-	else
-	{
-		m_nMemSize = 0;
-		nAllocatedSize = 0;
-		return NULL;
-	}
-}
+/*
+ * rcracki_mt is a multithreaded implementation and fork of the original 
+ * RainbowCrack
+ *
+ * Copyright (C) Zhu Shuanglei <shuanglei@hotmail.com>
+ * Copyright Martin Westergaard Jørgensen <martinwj2005@gmail.com>
+ * Copyright 2009, 2010 Daniël Niggebrugge <niggebrugge@fox-it.com>
+ * Copyright 2009, 2010 James Nobis <frt@quelrod.net>
+ * Copyright 2010 uroskn
+ *
+ * This file is part of rcracki_mt.
+ *
+ * rcracki_mt is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * rcracki_mt is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with rcracki_mt.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "MemoryPool.h"
+#include "Public.h"
+
+CMemoryPool::CMemoryPool(unsigned int bytesSaved, bool bDebug, uint64 maxMem)
+{
+	m_pMem = NULL;
+	m_nMemSize = 0;
+	debug = bDebug;
+
+	uint64 nAvailPhys = GetAvailPhysMemorySize();
+
+	if ( debug )
+	{
+		#ifdef _WIN32
+			printf( "Debug: nAvailPhys: %I64u\n", nAvailPhys );
+		#else
+			printf( "Debug: nAvailPhys: %llu\n", nAvailPhys );
+		#endif
+		printf( "Debug: bytesSaved: %d\n", bytesSaved );
+	}
+
+	if ( maxMem > 0 && maxMem < nAvailPhys )
+		nAvailPhys = maxMem;
+	
+	m_nMemMax = nAvailPhys - bytesSaved;	// Leave memory for CChainWalkSet	
+
+	if (m_nMemMax < 16 * 1024 * 1024)
+		m_nMemMax = 16 * 1024 * 1024;
+}
+
+CMemoryPool::~CMemoryPool()
+{
+	if (m_pMem != NULL)
+	{
+		delete [] m_pMem;
+		m_pMem = NULL;
+		m_nMemSize = 0;
+	}
+}
+
+unsigned char* CMemoryPool::Allocate(unsigned int nFileLen, uint64& nAllocatedSize)
+{
+	if (nFileLen <= m_nMemSize)
+	{
+		nAllocatedSize = nFileLen;
+		return m_pMem;
+	}
+
+	unsigned int nTargetSize;
+	if (nFileLen < m_nMemMax)
+		nTargetSize = nFileLen;
+	else
+		nTargetSize = m_nMemMax;
+
+	// Free existing memory
+	if (m_pMem != NULL)
+	{
+		delete [] m_pMem;
+		m_pMem = NULL;
+		m_nMemSize = 0;
+	}
+
+	// Allocate new memory
+	//printf("allocating %u bytes memory\n", nTargetSize);
+	m_pMem = new (nothrow) unsigned char[nTargetSize];
+	while (m_pMem == NULL && nTargetSize >= 32 * 1024 * 1024 )
+	{
+		nTargetSize -= 16 * 1024 * 1024;
+		m_pMem = new (nothrow) unsigned char[nTargetSize];
+	}
+
+	if (m_pMem != NULL)
+	{
+		m_nMemSize = nTargetSize;
+		nAllocatedSize = nTargetSize;
+		return m_pMem;
+	}
+	else
+	{
+		m_nMemSize = 0;
+		nAllocatedSize = 0;
+		return NULL;
+	}
+}