i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup of some bad language and style within bitfield counting optimization as per axel; made addr_bitcount static

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40362 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Alexander von Gluck IV
2011-02-05 16:15:58 +00:00
parent 4ce1d206b2
commit 96a8b92d21
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/network/libnetapi/NetworkAddress.cpp
+7 -6
View File
@@ -21,14 +21,15 @@
* Benefits include faster execution time as the builtin * Benefits include faster execution time as the builtin
* uses a bitcounting cpu instruction if it exists * uses a bitcounting cpu instruction if it exists
*/ */
#if __GNUC__ >= 4 #if __GNUC__ > 3
# define BitCount(buffer) __builtin_popcount(buffer) # define addr_bitcount(bitfield) __builtin_popcount(bitfield)
#else #else
ssize_t BitCount(uint32 buf) static ssize_t
addr_bitcount(uint32 bitfield)
{ {
ssize_t result = 0; ssize_t result = 0;
for (uint8 i = 32; i > 0; i--) { for (uint8 i = 32; i > 0; i--) {
if ((buf & (1 << (i - 1))) == 0) if ((bitfield & (1 << (i - 1))) == 0)
break; break;
result++; result++;
} }
@@ -784,14 +785,14 @@ BNetworkAddress::PrefixLength() const
sockaddr_in& mask = (sockaddr_in&)fAddress; sockaddr_in& mask = (sockaddr_in&)fAddress;
uint32 hostMask = ntohl(mask.sin_addr.s_addr); uint32 hostMask = ntohl(mask.sin_addr.s_addr);
return BitCount(hostMask); return addr_bitcount(hostMask);
} }
case AF_INET6: case AF_INET6:
{ {
sockaddr_in6& mask = (sockaddr_in6&)fAddress; sockaddr_in6& mask = (sockaddr_in6&)fAddress;
// TODO : see if we can use the optimized BitCount for this // TODO : see if we can use the optimized addr_bitcount for this
ssize_t result = 0; ssize_t result = 0;
for (uint8 i = 0; i < sizeof(in6_addr); i++) { for (uint8 i = 0; i < sizeof(in6_addr); i++) {
for (uint8 j = 0; j < 8; j++) { for (uint8 j = 0; j < 8; j++) {