LBRYCommunity/cpuminer
1
0
Fork 0
Code Issues 3 Pull requests Packages Projects Releases Wiki Activity

Speed up hex2bin function

Browse source 
The existing function uses `strtol`, which is not very fast.

This replaces the function with a custom hex decoder.
This commit is contained in:
Axel Gembe 2020-11-10 16:39:37 +07:00
parent 173a497e60
commit efbceb7bc9
No known key found for this signature in database
GPG key ID: 1CB3AA2143109AAC
1 changed files with 33 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
util.c
View file

@ -475,29 +475,42 @@ char *abin2hex(const unsigned char *p, size_t len)
bool hex2bin(unsigned char *p, const char *hexstr, size_t len) bool hex2bin(unsigned char *p, const char *hexstr, size_t len)
{ {
char hex_byte[3]; if(hexstr == NULL)
char *ep; return false;
hex_byte[2] = '\0'; size_t hexstr_len = strlen(hexstr);
if((hexstr_len % 2) != 0) {
while (*hexstr && len) { applog(LOG_ERR, "hex2bin str truncated");
if (!hexstr[1]) { return false;
applog(LOG_ERR, "hex2bin str truncated");
return false;
}
hex_byte[0] = hexstr[0];
hex_byte[1] = hexstr[1];
*p = (unsigned char) strtol(hex_byte, &ep, 16);
if (*ep) {
applog(LOG_ERR, "hex2bin failed on '%s'", hex_byte);
return false;
}
p++;
hexstr += 2;
len--;
} }
return (len == 0 && *hexstr == 0) ? true : false; size_t bin_len = hexstr_len / 2;
if (bin_len > len) {
applog(LOG_ERR, "hex2bin buffer too small");
return false;
}
memset(p, 0, len);
size_t i = 0;
while (i < hexstr_len) {
char c = hexstr[i];
unsigned char nibble;
if(c >= '0' && c <= '9') {
nibble = (c - '0');
} else if (c >= 'A' && c <= 'F') {
nibble = (10 + (c - 'A'));
} else if (c >= 'a' && c <= 'f') {
nibble = (10 + (c - 'a'));
} else {
applog(LOG_ERR, "hex2bin invalid hex");
return false;
}
p[(i / 2)] |= (nibble << ((1 - (i % 2)) * 4));
i++;
}
return true;
} }
int varint_encode(unsigned char *p, uint64_t n) int varint_encode(unsigned char *p, uint64_t n)