diff --git a/uppsrc/Core/Stream.cpp b/uppsrc/Core/Stream.cpp index e69a0e353..2ecb34031 100644 --- a/uppsrc/Core/Stream.cpp +++ b/uppsrc/Core/Stream.cpp @@ -1103,14 +1103,14 @@ void CompareStream::Flush() { } void CompareStream::_Put(const void *data, dword size) { - wrlim = buffer + 128; + wrlim = buffer + sizeof(h); ASSERT(ptr <= wrlim); Flush(); pos += ptr - buffer; ptr = buffer; byte *b = (byte *) data; while(size && equal) { - int sz = min(size, 128); + int sz = min(size, sizeof(h)); Compare(pos, b, sz); pos += sz; b += sz; diff --git a/uppsrc/Core/Stream.h b/uppsrc/Core/Stream.h index 1f57dc3d7..a55acc507 100644 --- a/uppsrc/Core/Stream.h +++ b/uppsrc/Core/Stream.h @@ -521,7 +521,7 @@ public: }; class OutStream : public Stream { - byte h[128]; + byte h[512]; protected: virtual void _Put(int w); virtual void _Put(const void *data, dword size); diff --git a/uppsrc/Core/Vcont.hpp b/uppsrc/Core/Vcont.hpp index 885d627da..e438c49d4 100644 --- a/uppsrc/Core/Vcont.hpp +++ b/uppsrc/Core/Vcont.hpp @@ -24,18 +24,15 @@ void StreamContainer(Stream& s, T& cont) template dword HashBySerialize(const T& cont) { - RTIMING("HashBySerialize"); TimeStop tm; xxHashStream xxh; const_cast(cont).Serialize(xxh); - RLOG("Hash by serialize: " << typeid(T).name() << " " << tm); return xxh.Finish(); } template bool IsEqualBySerialize(const T& a, const T& b) { - RTIMING("IsEqualBySerialize"); StringStream sa, sb; const_cast(a).Serialize(sa); const_cast(b).Serialize(sb); diff --git a/uppsrc/Core/xxHsh.cpp b/uppsrc/Core/xxHsh.cpp index d2e79ce98..efadbba47 100644 --- a/uppsrc/Core/xxHsh.cpp +++ b/uppsrc/Core/xxHsh.cpp @@ -17,7 +17,6 @@ void xxHashStream::Reset(dword seed) void xxHashStream::Out(const void *data, dword size) { - RTIMING("xxHash"); XXH32_update((XXH32_state_t *)context, data, size); }