Fixed RTI2 format

diff --git a/Client Applications/converti2/converti2.cpp b/Client Applications/converti2/converti2.cpp
index dec2b6494f108f9e6625a32abb913df251cf94db..a73fd95ed05a0bbb52139f6ba01ce1c9f1ffdbac 100644 (file)
--- a/Client Applications/converti2/converti2.cpp
+++ b/Client Applications/converti2/converti2.cpp
@@ -11,6 +11,7 @@
 #include <time.h>
 #include <math.h>
 #include <vector>
+#include <conio.h>
 #include "Public.h"
 #include "MemoryPool.h"
 using namespace std;
@@ -461,6 +462,13 @@ void ConvertRainbowTable(string sPathName, string sResultFileName, unsigned int
                                                //printf("Diffsize is %u\n", diffSize);
 
                                                // then write the distance amount of 00's
+                                               if(diffSize > 1000) {
+                                                       printf("WARNING! The distance to the next prefix is %i. Do you want to continue writing %i bytes of 0x00? Press y to continue", diffSize, diffSize);
+                                                       if(getch() != 'y') {
+                                                               printf("Aborting...");
+                                                               exit(1);
+                                                       }
+                                               }
                                                for(int j = 1; j < diffSize; j++)
                                                {                                                               
                                                        fwrite(&zero, 1, m_indexrowsizebytes, pFileIndex);
@@ -612,7 +620,7 @@ int main(int argc, char* argv[])
                        sResultFile = vPathName[i].substr(n+1, vPathName[i].length()) + "i2";
                else 
                        sResultFile = vPathName[i] + "i2"; // Resulting file is .rt, not .rti
-               printf("Using %i of 64 bits\n", (sptl + eptl + usecp));
+               printf("Using %i of 64 bits. sptl: %i, eptl: %i, cp: %i. Chains will be %i bytes in size\n", (sptl + eptl + usecp), sptl, eptl, usecp, ((sptl + eptl + usecp) / 8));
                if(sptl + eptl + usecp > 64)
                {
                        exit(1);

diff --git a/Client Applications/converti2/converti2.suo b/Client Applications/converti2/converti2.suo
index 396b14aa5cef31a45ec9949147359085dc43e82a..3e8c05bffc20e45ebcd64ac799113065b3ddce7a 100644 (file)
Binary files a/Client Applications/converti2/converti2.suo and b/Client Applications/converti2/converti2.suo differ

diff --git a/Client Applications/converti2/converti2.vcproj b/Client Applications/converti2/converti2.vcproj
index dbbdaf0388b1725256e9e6100ad51ee552d77dcc..0103995a93bbc887a4317b775a5c79ed4cba4900 100644 (file)
--- a/Client Applications/converti2/converti2.vcproj
+++ b/Client Applications/converti2/converti2.vcproj
@@ -41,7 +41,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../rt api"
+                               AdditionalIncludeDirectories="../../Common/rt api"
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -115,7 +115,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                EnableIntrinsicFunctions="true"
-                               AdditionalIncludeDirectories="../../rt api"
+                               AdditionalIncludeDirectories="../../Common/rt api"
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
                                RuntimeLibrary="0"
                                EnableFunctionLevelLinking="true"
@@ -177,11 +177,11 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\..\rt api\MemoryPool.cpp"
+                               RelativePath="..\..\Common\rt api\MemoryPool.cpp"
                                >
                        </File>
                        <File
-                               RelativePath=".\Public.cpp"
+                               RelativePath="..\..\Common\rt api\Public.cpp"
                                >
                        </File>
                </Filter>
@@ -191,11 +191,11 @@
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
                        >
                        <File
-                               RelativePath="..\..\rt api\MemoryPool.h"
+                               RelativePath="..\..\Common\rt api\MemoryPool.h"
                                >
                        </File>
                        <File
-                               RelativePath=".\Public.h"
+                               RelativePath="..\..\Common\rt api\Public.h"
                                >
                        </File>
                </Filter>

diff --git a/Client Applications/rti2rto/rti2rto.suo b/Client Applications/rti2rto/rti2rto.suo
index 3fdc2e636becf77ecc90c7a86e3ea6c3ca3d1ffc..023dd88423dd5610734f0721985fa9b1175e088d 100644 (file)
Binary files a/Client Applications/rti2rto/rti2rto.suo and b/Client Applications/rti2rto/rti2rto.suo differ

diff --git a/Client Applications/rti2rto/rti2rto.vcproj b/Client Applications/rti2rto/rti2rto.vcproj
index 6dc598672ebd2739cb6dbcaabc790d6f83677226..2dc3546e3d257029b6e64c912dc78191f8d3d9cd 100644 (file)
--- a/Client Applications/rti2rto/rti2rto.vcproj
+++ b/Client Applications/rti2rto/rti2rto.vcproj
@@ -41,7 +41,7 @@
                        <Tool
                                Name="VCCLCompilerTool"
                                Optimization="0"
-                               AdditionalIncludeDirectories="../../rt api"
+                               AdditionalIncludeDirectories="../../common/rt api"
                                PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
                                MinimalRebuild="true"
                                BasicRuntimeChecks="3"
@@ -115,7 +115,7 @@
                                Name="VCCLCompilerTool"
                                Optimization="2"
                                EnableIntrinsicFunctions="true"
-                               AdditionalIncludeDirectories="..\..\rt api"
+                               AdditionalIncludeDirectories="../../common/rt api"
                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
                                RuntimeLibrary="0"
                                EnableFunctionLevelLinking="true"
@@ -173,19 +173,19 @@
                        UniqueIdentifier="{4FC737F1-C7A5-4376-A066-2A32D752A2FF}"
                        >
                        <File
-                               RelativePath="..\..\rt api\BaseRTReader.cpp"
+                               RelativePath="..\..\Common\rt api\BaseRTReader.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\rt api\MemoryPool.cpp"
+                               RelativePath="..\..\Common\rt api\MemoryPool.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\converti2\Public.cpp"
+                               RelativePath="..\..\Common\rt api\Public.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\rt api\RTI2Reader.cpp"
+                               RelativePath="..\..\Common\rt api\RTI2Reader.cpp"
                                >
                        </File>
                        <File
@@ -193,11 +193,11 @@
                                >
                        </File>
                        <File
-                               RelativePath="..\..\rt api\RTIReader.cpp"
+                               RelativePath="..\..\Common\rt api\RTIReader.cpp"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\rt api\RTReader.cpp"
+                               RelativePath="..\..\Common\rt api\RTReader.cpp"
                                >
                        </File>
                </Filter>
@@ -207,27 +207,27 @@
                        UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
                        >
                        <File
-                               RelativePath="..\..\rt api\BaseRTReader.h"
+                               RelativePath="..\..\Common\rt api\BaseRTReader.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\rt api\MemoryPool.h"
+                               RelativePath="..\..\Common\rt api\MemoryPool.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\converti2\Public.h"
+                               RelativePath="..\..\Common\rt api\Public.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\rt api\RTI2Reader.h"
+                               RelativePath="..\..\Common\rt api\RTI2Reader.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\rt api\RTIReader.h"
+                               RelativePath="..\..\Common\rt api\RTIReader.h"
                                >
                        </File>
                        <File
-                               RelativePath="..\..\rt api\RTReader.h"
+                               RelativePath="..\..\Common\rt api\RTReader.h"
                                >
                        </File>
                </Filter>

diff --git a/Common/rt api/Public.cpp b/Common/rt api/Public.cpp
index 60d7072d8f5c590efa26f55b69fd17114bbe58c2..f917d3720fa69301ba8767697ca46289ea4d0431 100644 (file)
--- a/Common/rt api/Public.cpp
+++ b/Common/rt api/Public.cpp
@@ -9,7 +9,9 @@
 #endif
 
 #ifdef _WIN32
-#include "boinc_win.h"
+       #ifdef BOINC
+               #include "boinc_win.h"
+       #endif
 #else
 #include "config.h"
 #include <cstdio>
@@ -21,9 +23,10 @@
 #include <unistd.h>
 
 #endif
-#include "filesys.h"
-#include "boinc_api.h"
-
+#ifdef BOINC
+       #include "filesys.h"
+       #include "boinc_api.h"
+#endif
 #include "Public.h"
 
 #ifdef _WIN32
@@ -88,7 +91,8 @@ bool GetHybridCharsets(string sCharset, vector<tCharset>& vCharset)
        }
        return true;
 }
-bool ReadLinesFromFile(string sPathName, vector<string>& vLine)
+#ifdef BOINC
+bool boinc_ReadLinesFromFile(string sPathName, vector<string>& vLine)
 {
        vLine.clear();
     char input_path[512];
@@ -134,6 +138,46 @@ bool ReadLinesFromFile(string sPathName, vector<string>& vLine)
 
        return true;
 }
+#endif 
+bool ReadLinesFromFile(string sPathName, vector<string>& vLine)
+{
+       vLine.clear();
+    FILE *file = fopen(sPathName.c_str(), "rb");
+       if (file != NULL)
+       {
+               unsigned int len = GetFileLen(file);
+               char* data = new char[len + 1];
+               fread(data, 1, len, file);
+               data[len] = '\0';
+               string content = data;
+               content += "\n";
+               delete data;
+
+               unsigned int i;
+               for (i = 0; i < content.size(); i++)
+               {
+                       if (content[i] == '\r')
+                               content[i] = '\n';
+               }
+
+               int n;
+               while ((n = content.find("\n", 0)) != -1)
+               {
+                       string line = content.substr(0, n);
+                       line = TrimString(line);
+                       if (line != "")
+                               vLine.push_back(line);
+                       content = content.substr(n + 1);
+               }
+
+               fclose(file);
+       }
+       else
+               return false;
+
+       return true;
+}
+
 
 bool SeperateString(string s, string sSeperator, vector<string>& vPart)
 {

diff --git a/Common/rt api/Public.h b/Common/rt api/Public.h
index a2f5657fcb5d485e3a7f0994fb2726560dc31554..3a315ae56fc55db6d886d1f52d7c386118156704 100644 (file)
--- a/Common/rt api/Public.h
+++ b/Common/rt api/Public.h
@@ -70,6 +70,7 @@ typedef struct
 
 unsigned int GetFileLen(FILE* file);
 string TrimString(string s);
+bool boinc_ReadLinesFromFile(string sPathName, vector<string>& vLine);
 bool ReadLinesFromFile(string sPathName, vector<string>& vLine);
 bool SeperateString(string s, string sSeperator, vector<string>& vPart);
 string uint64tostr(uint64 n);

diff --git a/Common/rt api/RTIReader.cpp b/Common/rt api/RTIReader.cpp
index d96edc365c83569775c51e509f18b91dae400e8e..b72dbe2d214c4fdcee088957bbe6e32ef9ec3d21 100644 (file)
--- a/Common/rt api/RTIReader.cpp
+++ b/Common/rt api/RTIReader.cpp
@@ -4,7 +4,16 @@ RTIReader::RTIReader(string Filename)
 {
        m_pIndex = NULL;
        m_pFile = fopen(Filename.c_str(), "rb");
-       FILE *pFileIndex = fopen(Filename.append(".index").c_str(), "rb");
+       if(m_pFile == NULL) {
+               printf("could not open file %s\n", Filename.c_str());
+               return;         
+       }
+       string sIndex = Filename.append(".index").c_str();
+       FILE *pFileIndex = fopen(sIndex.c_str(), "rb");
+       if(pFileIndex == NULL) {
+               printf("could not open index file %s\n", sIndex.c_str());
+               return;
+       }
        m_chainPosition = 0;
 
        // Load the index file