From 8f05ab2621dbff78258d38467a59f101d6e97c20 Mon Sep 17 00:00:00 2001 From: jbauch Date: Thu, 16 Mar 2017 10:34:37 -0700 Subject: [PATCH] Revert of Use native (optimized) functions for byte order conversion. (patchset #3 id:40001 of https://codereview.webrtc.org/2738063005/ ) Reason for revert: Breaks Chromium FYI bots: http://build.chromium.org/p/chromium.webrtc.fyi/builders/Mac%20Builder/builds/22469 http://build.chromium.org/p/chromium.webrtc.fyi/builders/Linux%20Builder/builds/14885 FAILED: newlib_pnacl/obj/third_party/webrtc/base/rtc_base/networkmonitor.o /b/c/goma_client/gomacc ../../native_client/toolchain/linux_x86/pnacl_newlib/bin/pnacl-clang++ -MMD -MF newlib_pnacl/obj/third_party/webrtc/base/rtc_base/networkmonitor.o.d -DNACL_TC_REV=62bfd122aee87d4eb4a7876950e18c793c626cd0 -Dtimezone=_timezone -DV8_DEPRECATION_WARNINGS -DUSE_OPENSSL_CERTS=1 -DNO_TCMALLOC -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DCHROMIUM_BUILD -DENABLE_MEDIA_ROUTER=1 -DFIELDTRIAL_TESTING_ENABLED -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -DNDEBUG -DNVALGRIND -DWEBRTC_RESTRICT_LOGGING -DEXPAT_RELATIVE_PATH -DHAVE_SCTP -DENABLE_EXTERNAL_AUTH -DHAVE_WEBRTC_VIDEO -DHAVE_WEBRTC_VOICE -DLOGGING_INSIDE_WEBRTC -DUSE_WEBRTC_DEV_BRANCH -DFEATURE_ENABLE_VOICEMAIL -DEXPAT_RELATIVE_PATH -DGTEST_RELATIVE_PATH -DNO_MAIN_THREAD_WRAPPING -DNO_SOUND_SYSTEM -DWEBRTC_CHROMIUM_BUILD -DWEBRTC_POSIX -DNO_MAIN_THREAD_WRAPPING -I../../third_party/boringssl/src/include -I../.. -Inewlib_pnacl/gen -I../../third_party/webrtc_overrides -I../../third_party -I../../third_party/boringssl/src/include -I../../native_client_sdk/src/libraries -I../../native_client_sdk/src/libraries/nacl_io/include -I../../native_client_sdk/src/libraries/third_party/newlib-extras -Wno-uninitialized -fno-strict-aliasing -Wno-builtin-macro-redefined -D__DATE__= -D__TIME__= -D__TIMESTAMP__= -fcolor-diagnostics -O2 -fno-ident -fdata-sections -ffunction-sections -g0 -fvisibility=hidden -Werror -Wno-unused-variable -Wno-missing-field-initializers -Wno-unused-parameter -Wno-c++11-narrowing -Wno-covered-switch-default -Wno-deprecated-register -Wno-unneeded-internal-declaration -Wno-inconsistent-missing-override -fvisibility-inlines-hidden -std=gnu++11 -fno-rtti -fno-exceptions -c ../../third_party/webrtc/base/networkmonitor.cc -o newlib_pnacl/obj/third_party/webrtc/base/rtc_base/networkmonitor.o In file included from ../../third_party/webrtc/base/networkmonitor.cc:11: In file included from ../../third_party/webrtc/base/networkmonitor.h:16: In file included from ../../third_party/webrtc/base/thread.h:25: In file included from ../../third_party/webrtc/base/messagequeue.h:31: In file included from ../../third_party/webrtc/base/socketserver.h:15: In file included from ../../third_party/webrtc/base/socketfactory.h:14: In file included from ../../third_party/webrtc/base/socket.h:30: In file included from ../../third_party/webrtc/base/socketaddress.h:18: In file included from ../../third_party/webrtc/base/ipaddress.h:29: ../../third_party/webrtc/base/byteorder.h:37:10: fatal error: 'endian.h' file not found #include ^ 1 error generated. Original issue's description: > Use native (optimized) functions for byte order conversion. > > Instead of manually copying single bytes, the native functions like "htobe32" > are used. > > BUG=None > > Review-Url: https://codereview.webrtc.org/2738063005 > Cr-Commit-Position: refs/heads/master@{#17277} > Committed: https://chromium.googlesource.com/external/webrtc/+/38fd44e51cbde57a277b85368ad247077642d13d TBR=tommi@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=None Review-Url: https://codereview.webrtc.org/2757703002 Cr-Commit-Position: refs/heads/master@{#17278} --- webrtc/base/byteorder.h | 142 ++++++++++++++++++++-------------------- 1 file changed, 72 insertions(+), 70 deletions(-) diff --git a/webrtc/base/byteorder.h b/webrtc/base/byteorder.h index c30711d5c1..d579e6e185 100644 --- a/webrtc/base/byteorder.h +++ b/webrtc/base/byteorder.h @@ -15,60 +15,17 @@ #include #endif -#include "webrtc/base/basictypes.h" - -#if defined(WEBRTC_MAC) -#include - -#define htobe16(v) OSSwapHostToBigInt16(v) -#define htobe32(v) OSSwapHostToBigInt32(v) -#define htobe64(v) OSSwapHostToBigInt64(v) -#define be16toh(v) OSSwapBigToHostInt16(v) -#define be32toh(v) OSSwapBigToHostInt32(v) -#define be64toh(v) OSSwapBigToHostInt64(v) - -#define htole16(v) OSSwapHostToLittleInt16(v) -#define htole32(v) OSSwapHostToLittleInt32(v) -#define htole64(v) OSSwapHostToLittleInt64(v) -#define le16toh(v) OSSwapLittleToHostInt16(v) -#define le32toh(v) OSSwapLittleToHostInt32(v) -#define le64toh(v) OSSwapLittleToHostInt64(v) -#elif defined(WEBRTC_POSIX) -#include -#elif defined(WEBRTC_WIN) +#if defined(WEBRTC_WIN) #include -#include - -#define htobe16(v) htons(v) -#define htobe32(v) htonl(v) -#define htobe64(v) htonll(v) -#define be16toh(v) ntohs(v) -#define be32toh(v) ntohl(v) -#define be64toh(v) ntohll(v) - -#if defined(RTC_ARCH_CPU_LITTLE_ENDIAN) -#define htole16(v) (v) -#define htole32(v) (v) -#define htole64(v) (v) -#define le16toh(v) (v) -#define le32toh(v) (v) -#define le64toh(v) (v) -#elif defined(RTC_ARCH_CPU_BIG_ENDIAN) -#define htole16(v) __builtin_bswap16(v) -#define htole32(v) __builtin_bswap32(v) -#define htole64(v) __builtin_bswap64(v) -#define le16toh(v) __builtin_bswap16(v) -#define le32toh(v) __builtin_bswap32(v) -#define le64toh(v) __builtin_bswap64(v) -#else -#error RTC_ARCH_CPU_BIG_ENDIAN or RTC_ARCH_CPU_LITTLE_ENDIAN must be defined. #endif -#endif // defined(WEBRTC_WIN) +#include "webrtc/base/basictypes.h" namespace rtc { // Reading and writing of little and big-endian numbers from memory +// TODO: Optimized versions, with direct read/writes of +// integers in host-endian format, when the platform supports it. inline void Set8(void* memory, size_t offset, uint8_t v) { static_cast(memory)[offset] = v; @@ -79,84 +36,129 @@ inline uint8_t Get8(const void* memory, size_t offset) { } inline void SetBE16(void* memory, uint16_t v) { - *static_cast(memory) = htobe16(v); + Set8(memory, 0, static_cast(v >> 8)); + Set8(memory, 1, static_cast(v >> 0)); } inline void SetBE32(void* memory, uint32_t v) { - *static_cast(memory) = htobe32(v); + Set8(memory, 0, static_cast(v >> 24)); + Set8(memory, 1, static_cast(v >> 16)); + Set8(memory, 2, static_cast(v >> 8)); + Set8(memory, 3, static_cast(v >> 0)); } inline void SetBE64(void* memory, uint64_t v) { - *static_cast(memory) = htobe64(v); + Set8(memory, 0, static_cast(v >> 56)); + Set8(memory, 1, static_cast(v >> 48)); + Set8(memory, 2, static_cast(v >> 40)); + Set8(memory, 3, static_cast(v >> 32)); + Set8(memory, 4, static_cast(v >> 24)); + Set8(memory, 5, static_cast(v >> 16)); + Set8(memory, 6, static_cast(v >> 8)); + Set8(memory, 7, static_cast(v >> 0)); } inline uint16_t GetBE16(const void* memory) { - return be16toh(*static_cast(memory)); + return static_cast((Get8(memory, 0) << 8) | (Get8(memory, 1) << 0)); } inline uint32_t GetBE32(const void* memory) { - return be32toh(*static_cast(memory)); + return (static_cast(Get8(memory, 0)) << 24) | + (static_cast(Get8(memory, 1)) << 16) | + (static_cast(Get8(memory, 2)) << 8) | + (static_cast(Get8(memory, 3)) << 0); } inline uint64_t GetBE64(const void* memory) { - return be64toh(*static_cast(memory)); + return (static_cast(Get8(memory, 0)) << 56) | + (static_cast(Get8(memory, 1)) << 48) | + (static_cast(Get8(memory, 2)) << 40) | + (static_cast(Get8(memory, 3)) << 32) | + (static_cast(Get8(memory, 4)) << 24) | + (static_cast(Get8(memory, 5)) << 16) | + (static_cast(Get8(memory, 6)) << 8) | + (static_cast(Get8(memory, 7)) << 0); } inline void SetLE16(void* memory, uint16_t v) { - *static_cast(memory) = htole16(v); + Set8(memory, 0, static_cast(v >> 0)); + Set8(memory, 1, static_cast(v >> 8)); } inline void SetLE32(void* memory, uint32_t v) { - *static_cast(memory) = htole32(v); + Set8(memory, 0, static_cast(v >> 0)); + Set8(memory, 1, static_cast(v >> 8)); + Set8(memory, 2, static_cast(v >> 16)); + Set8(memory, 3, static_cast(v >> 24)); } inline void SetLE64(void* memory, uint64_t v) { - *static_cast(memory) = htole64(v); + Set8(memory, 0, static_cast(v >> 0)); + Set8(memory, 1, static_cast(v >> 8)); + Set8(memory, 2, static_cast(v >> 16)); + Set8(memory, 3, static_cast(v >> 24)); + Set8(memory, 4, static_cast(v >> 32)); + Set8(memory, 5, static_cast(v >> 40)); + Set8(memory, 6, static_cast(v >> 48)); + Set8(memory, 7, static_cast(v >> 56)); } inline uint16_t GetLE16(const void* memory) { - return le16toh(*static_cast(memory)); + return static_cast((Get8(memory, 0) << 0) | (Get8(memory, 1) << 8)); } inline uint32_t GetLE32(const void* memory) { - return le32toh(*static_cast(memory)); + return (static_cast(Get8(memory, 0)) << 0) | + (static_cast(Get8(memory, 1)) << 8) | + (static_cast(Get8(memory, 2)) << 16) | + (static_cast(Get8(memory, 3)) << 24); } inline uint64_t GetLE64(const void* memory) { - return le64toh(*static_cast(memory)); + return (static_cast(Get8(memory, 0)) << 0) | + (static_cast(Get8(memory, 1)) << 8) | + (static_cast(Get8(memory, 2)) << 16) | + (static_cast(Get8(memory, 3)) << 24) | + (static_cast(Get8(memory, 4)) << 32) | + (static_cast(Get8(memory, 5)) << 40) | + (static_cast(Get8(memory, 6)) << 48) | + (static_cast(Get8(memory, 7)) << 56); } // Check if the current host is big endian. inline bool IsHostBigEndian() { -#if defined(RTC_ARCH_CPU_BIG_ENDIAN) - return true; -#else - return false; -#endif + static const int number = 1; + return 0 == *reinterpret_cast(&number); } inline uint16_t HostToNetwork16(uint16_t n) { - return htobe16(n); + uint16_t result; + SetBE16(&result, n); + return result; } inline uint32_t HostToNetwork32(uint32_t n) { - return htobe32(n); + uint32_t result; + SetBE32(&result, n); + return result; } inline uint64_t HostToNetwork64(uint64_t n) { - return htobe64(n); + uint64_t result; + SetBE64(&result, n); + return result; } inline uint16_t NetworkToHost16(uint16_t n) { - return be16toh(n); + return GetBE16(&n); } inline uint32_t NetworkToHost32(uint32_t n) { - return be32toh(n); + return GetBE32(&n); } inline uint64_t NetworkToHost64(uint64_t n) { - return be64toh(n); + return GetBE64(&n); } } // namespace rtc