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

Clean up naming conventions in CRC32 code

Browse Source
This commit is contained in:
Patrick Niklaus 2016-04-29 00:11:14 +02:00
parent d078ed67ca
commit b796033473
No known key found for this signature in database
GPG Key ID: E426891B5F978B1B
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/contractor/crc32_processor.hpp
View File

@ -17,9 +17,9 @@ namespace contractor
class IteratorbasedCRC32 class IteratorbasedCRC32
{ {
public: public:
bool using_hardware() const { return use_hardware_implementation; } bool UsingHardware() const { return use_hardware_implementation; }
IteratorbasedCRC32() : crc(0) { use_hardware_implementation = detect_hardware_support(); } IteratorbasedCRC32() : crc(0) { use_hardware_implementation = DetectHardwareSupport(); }
template <class Iterator> unsigned operator()(Iterator iter, const Iterator end) template <class Iterator> unsigned operator()(Iterator iter, const Iterator end)
{ {
@ -31,11 +31,11 @@ class IteratorbasedCRC32
if (use_hardware_implementation) if (use_hardware_implementation)
{ {
crc = compute_in_hardware(data, sizeof(value_type)); crc = ComputeInHardware(data, sizeof(value_type));
} }
else else
{ {
crc = compute_in_software(data, sizeof(value_type)); crc = ComputeInSoftware(data, sizeof(value_type));
} }
++iter; ++iter;
} }
@ -43,7 +43,7 @@ class IteratorbasedCRC32
} }
private: private:
bool detect_hardware_support() const bool DetectHardwareSupport() const
{ {
static const int sse42_bit = 0x00100000; static const int sse42_bit = 0x00100000;
const unsigned ecx = cpuid(); const unsigned ecx = cpuid();
@ -51,14 +51,14 @@ class IteratorbasedCRC32
return sse42_found; return sse42_found;
} }
unsigned compute_in_software(const char *str, unsigned len) unsigned ComputeInSoftware(const char *str, unsigned len)
{ {
crc_processor.process_bytes(str, len); crc_processor.process_bytes(str, len);
return crc_processor.checksum(); return crc_processor.checksum();
} }
// adapted from http://byteworm.com/2010/10/13/crc32/ // adapted from http://byteworm.com/2010/10/13/crc32/
unsigned compute_in_hardware(const char *str, unsigned len) unsigned ComputeInHardware(const char *str, unsigned len)
{ {
#if defined(__x86_64__) #if defined(__x86_64__)
unsigned q = len / sizeof(unsigned); unsigned q = len / sizeof(unsigned);
@ -114,7 +114,7 @@ struct RangebasedCRC32
return crc32(std::begin(iterable), std::end(iterable)); return crc32(std::begin(iterable), std::end(iterable));
} }
bool using_hardware() const { return crc32.using_hardware(); } bool UsingHardware() const { return crc32.UsingHardware(); }
private: private:
IteratorbasedCRC32 crc32; IteratorbasedCRC32 crc32;