Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Typo in CRC32 data length

Browse Source
This commit is contained in:
DennisOSRM 2012-02-16 16:18:13 +01:00
parent 3c8cea2af6
commit ac41c3b06c
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Algorithms/CRC32.cpp
View File

@ -26,7 +26,7 @@ CRC32::CRC32() : crc(0) {
unsigned CRC32::SoftwareBasedCRC32(char *str, unsigned len, unsigned crc) { unsigned CRC32::SoftwareBasedCRC32(char *str, unsigned len, unsigned crc) {
boost::crc_optimal<32, 0x1EDC6F41, 0x0, 0x0, true, true> CRC32_Processor; boost::crc_optimal<32, 0x1EDC6F41, 0x0, 0x0, true, true> CRC32_Processor;
CRC32_Processor.process_bytes( str, 100000000); CRC32_Processor.process_bytes( str, len);
return CRC32_Processor.checksum(); return CRC32_Processor.checksum();
} }
@ -62,8 +62,10 @@ CRC32::CRC32CFunctionPtr CRC32::detectBestCRC32C() {
unsigned ecx = cpuid(1); unsigned ecx = cpuid(1);
bool hasSSE42 = ecx & (1 << SSE42_BIT); bool hasSSE42 = ecx & (1 << SSE42_BIT);
if (hasSSE42) { if (hasSSE42) {
std::cout << "sse based" << std::endl;
return &CRC32::SSEBasedCRC32; //crc32 hardware accelarated; return &CRC32::SSEBasedCRC32; //crc32 hardware accelarated;
} else { } else {
std::cout << "softbased" << std::endl;
return &CRC32::SoftwareBasedCRC32; //crc32cSlicingBy8; return &CRC32::SoftwareBasedCRC32; //crc32cSlicingBy8;
} }
} }

1
Algorithms/CRC32.h
View File

@ -22,6 +22,7 @@
#define CRC32_H_ #define CRC32_H_
#include <boost/crc.hpp> // for boost::crc_32_type #include <boost/crc.hpp> // for boost::crc_32_type
#include <iostream>
class CRC32 { class CRC32 {
private: private:

2
SConstruct
View File

@ -198,7 +198,7 @@ env.Append(CCFLAGS = ['-fopenmp'])
env.Append(LINKFLAGS = ['-fopenmp']) env.Append(LINKFLAGS = ['-fopenmp'])
env.Program(target = 'osrm-extract', source = ["extractor.cpp", Glob('DataStructures/pbf-proto/*.pb.cc'), Glob('Util/*.cpp')]) env.Program(target = 'osrm-extract', source = ["extractor.cpp", Glob('DataStructures/pbf-proto/*.pb.cc'), Glob('Util/*.cpp')])
env.Program(target = 'osrm-prepare', source = ["createHierarchy.cpp", 'Contractor/EdgeBasedGraphFactory.cpp', Glob('Util/SRTMLookup/*.cpp')]) env.Program(target = 'osrm-prepare', source = ["createHierarchy.cpp", 'Contractor/EdgeBasedGraphFactory.cpp', Glob('Util/SRTMLookup/*.cpp'), Glob('Algorithms/*.cpp')])
env.Append(CCFLAGS = ['-lboost_regex', '-lboost_iostreams', '-lbz2', '-lz', '-lprotobuf']) env.Append(CCFLAGS = ['-lboost_regex', '-lboost_iostreams', '-lbz2', '-lz', '-lprotobuf'])
env.Append(LINKFLAGS = ['-lboost_system']) env.Append(LINKFLAGS = ['-lboost_system'])
env.Program(target = 'osrm-routed', source = ["routed.cpp", 'Descriptors/DescriptionFactory.cpp', Glob('ThirdParty/*.cc')], CCFLAGS = ['-DROUTED']) env.Program(target = 'osrm-routed', source = ["routed.cpp", 'Descriptors/DescriptionFactory.cpp', Glob('ThirdParty/*.cc')], CCFLAGS = ['-DROUTED'])