test

[freerainbowtables] / Client Applications / rcracki_mt / MemoryPool.cpp

diff --git a/Client Applications/rcracki_mt/MemoryPool.cpp b/Client Applications/rcracki_mt/MemoryPool.cpp
index 2129daa1884970c007dc6628fd512deaeb6506aa..10e235c4b8485e4b4883d3571fd13c9c0358c4ad 100644 (file)
--- a/Client Applications/rcracki_mt/MemoryPool.cpp
+++ b/Client Applications/rcracki_mt/MemoryPool.cpp
@@ -1,41 +1,70 @@
 /*
-   RainbowCrack - a general propose implementation of Philippe Oechslin's faster time-memory trade-off technique.
-
-   Copyright (C) Zhu Shuanglei <shuanglei@hotmail.com>
-*/
+ * 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 bytesForChainWalkSet)
+CMemoryPool::CMemoryPool(unsigned int bytesSaved, bool bDebug, uint64 maxMem)
 {
        m_pMem = NULL;
        m_nMemSize = 0;
+       debug = bDebug;
+
+       uint64 nAvailPhys = GetAvailPhysMemorySize();
 
-       unsigned int nAvailPhys = GetAvailPhysMemorySize();
-       if (nAvailPhys < 32 * 1024 * 1024)
+       if ( debug )
        {
-               nAvailPhys = 256 * 1024 * 1024; // There is atleast 256 mb available (Some Linux distros returns a really low GetAvailPhysMemorySize())
+               #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 - bytesForChainWalkSet;  // Leave memory for CChainWalkSet       
+       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;
+               delete [] m_pMem;
                m_pMem = NULL;
                m_nMemSize = 0;
        }
 }
 
-unsigned char* CMemoryPool::Allocate(unsigned int nFileLen, unsigned int& nAllocatedSize)
+unsigned char* CMemoryPool::Allocate(unsigned int nFileLen, uint64& nAllocatedSize)
 {
        if (nFileLen <= m_nMemSize)
        {
@@ -52,7 +81,7 @@ unsigned char* CMemoryPool::Allocate(unsigned int nFileLen, unsigned int& nAlloc
        // Free existing memory
        if (m_pMem != NULL)
        {
-               delete m_pMem;
+               delete [] m_pMem;
                m_pMem = NULL;
                m_nMemSize = 0;
        }