Commit 1f3361c1 authored by Victor Costan's avatar Victor Costan Committed by Commit Bot

Roll src/third_party/snappy/src/ ca37ab7fb..ea660b57d (10 commits)

https://chromium.googlesource.com/external/github.com/google/snappy.git/+log/ca37ab7fb9b7..ea660b57d65d

$ git log ca37ab7fb..ea660b57d --date=short --no-merges --format='%ad %ae %s'
2018-08-17 costan Fix unused private field warning in NDEBUG builds.
2018-08-16 costan C++11 guarantees <cstddef> and <cstdint>.
2018-08-16 costan Remove GCC on OSX from the Travis CI matrix.
2018-08-09 costan Move pshufb_fill_patterns from snappy-internal.h to snappy.cc.
2018-08-08 costan Fix Visual Studio build.
2018-08-07 jefflim Improve performance of zippy decompression to IOVecs by up to almost 50%
2018-08-06 costan Update Travis CI configuration.
2018-03-27 atdt Test for SSE3 suppport before using pshufb.
2018-03-26 atdt Avoid store-forwarding stalls in Zippy's IncrementalCopy
2018-03-09 costan Update CI configurations.

Created with:
  roll-dep src/third_party/snappy/src

Change-Id: Ia9acb557d876d0e9c5298c13cfdb05cc80d26233
Reviewed-on: https://chromium-review.googlesource.com/1170351Reviewed-by: default avatarChris Mumford <cmumford@chromium.org>
Commit-Queue: Victor Costan <pwnall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584520}
parent 5401a4db
...@@ -1019,7 +1019,7 @@ deps = { ...@@ -1019,7 +1019,7 @@ deps = {
Var('chromium_git') + '/external/smhasher.git' + '@' + 'e87738e57558e0ec472b2fc3a643b838e5b6e88f', Var('chromium_git') + '/external/smhasher.git' + '@' + 'e87738e57558e0ec472b2fc3a643b838e5b6e88f',
'src/third_party/snappy/src': 'src/third_party/snappy/src':
Var('chromium_git') + '/external/github.com/google/snappy.git' + '@' + 'ca37ab7fb9b718e056009babb4fea591626e5882', Var('chromium_git') + '/external/github.com/google/snappy.git' + '@' + 'ea660b57d65d68d521287c903459b6dd3b2804d0',
'src/third_party/sqlite4java': { 'src/third_party/sqlite4java': {
'packages': [ 'packages': [
......
Name: Snappy: A fast compressor/decompressor Name: Snappy: A fast compressor/decompressor
Short Name: snappy Short Name: snappy
URL: http://google.github.io/snappy/ URL: http://google.github.io/snappy/
Version: 1.1.7.git.ca37ab7fb9b718e056009babb4fea591626e5882 Version: 1.1.7.git.ea660b57d65d68d521287c903459b6dd3b2804d0
License: New BSD License: New BSD
License File: src/COPYING License File: src/COPYING
Security Critical: yes Security Critical: yes
......
...@@ -28,12 +28,6 @@ ...@@ -28,12 +28,6 @@
/* Define to 1 if you have the `z' library (-lz). */ /* Define to 1 if you have the `z' library (-lz). */
#define HAVE_LIBZ 1 #define HAVE_LIBZ 1
/* Define to 1 if you have the <stddef.h> header file. */
#define HAVE_STDDEF_H 1
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
/* Define to 1 if you have the <sys/endian.h> header file. */ /* Define to 1 if you have the <sys/endian.h> header file. */
/* #undef HAVE_SYS_ENDIAN_H */ /* #undef HAVE_SYS_ENDIAN_H */
...@@ -55,6 +49,9 @@ ...@@ -55,6 +49,9 @@
/* Define to 1 if you have the <windows.h> header file. */ /* Define to 1 if you have the <windows.h> header file. */
/* #undef HAVE_WINDOWS_H */ /* #undef HAVE_WINDOWS_H */
/* Define to 1 if you target processors with SSSE3+ and have <tmmintrin.h>. */
#define SNAPPY_HAVE_SSSE3 0
/* Define to 1 if your processor stores words with the most significant byte /* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */ first (like Motorola and SPARC, unlike Intel and VAX). */
/* #undef SNAPPY_IS_BIG_ENDIAN */ /* #undef SNAPPY_IS_BIG_ENDIAN */
......
...@@ -36,13 +36,9 @@ ...@@ -36,13 +36,9 @@
#ifndef THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_ #ifndef THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
#define THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_ #define THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
#if 1 // HAVE_STDINT_H #include <cstddef>
#include <stdint.h> #include <cstdint>
#endif // HAVE_STDDEF_H #include <string>
#if 1 // HAVE_STDDEF_H
#include <stddef.h>
#endif // HAVE_STDDEF_H
#if 1 // HAVE_SYS_UIO_H #if 1 // HAVE_SYS_UIO_H
#include <sys/uio.h> #include <sys/uio.h>
...@@ -54,38 +50,25 @@ ...@@ -54,38 +50,25 @@
#define SNAPPY_VERSION \ #define SNAPPY_VERSION \
((SNAPPY_MAJOR << 16) | (SNAPPY_MINOR << 8) | SNAPPY_PATCHLEVEL) ((SNAPPY_MAJOR << 16) | (SNAPPY_MINOR << 8) | SNAPPY_PATCHLEVEL)
#include <string>
namespace snappy { namespace snappy {
#if 1 // HAVE_STDINT_H using int8 = std::int8_t;
typedef int8_t int8; using uint8 = std::uint8_t;
typedef uint8_t uint8; using int16 = std::int16_t;
typedef int16_t int16; using uint16 = std::uint16_t;
typedef uint16_t uint16; using int32 = std::int32_t;
typedef int32_t int32; using uint32 = std::uint32_t;
typedef uint32_t uint32; using int64 = std::int64_t;
typedef int64_t int64; using uint64 = std::uint64_t;
typedef uint64_t uint64;
#else
typedef signed char int8;
typedef unsigned char uint8;
typedef short int16;
typedef unsigned short uint16;
typedef int int32;
typedef unsigned int uint32;
typedef long long int64;
typedef unsigned long long uint64;
#endif // HAVE_STDINT_H
typedef std::string string; using string = std::string;
#if !1 // !HAVE_SYS_UIO_H #if !1 // !HAVE_SYS_UIO_H
// Windows does not have an iovec type, yet the concept is universally useful. // Windows does not have an iovec type, yet the concept is universally useful.
// It is simple to define it ourselves, so we put it inside our own namespace. // It is simple to define it ourselves, so we put it inside our own namespace.
struct iovec { struct iovec {
void* iov_base; void* iov_base;
size_t iov_len; size_t iov_len;
}; };
#endif // !HAVE_SYS_UIO_H #endif // !HAVE_SYS_UIO_H
......
...@@ -28,12 +28,6 @@ ...@@ -28,12 +28,6 @@
/* Define to 1 if you have the `z' library (-lz). */ /* Define to 1 if you have the `z' library (-lz). */
#define HAVE_LIBZ 1 #define HAVE_LIBZ 1
/* Define to 1 if you have the <stddef.h> header file. */
#define HAVE_STDDEF_H 1
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
/* Define to 1 if you have the <sys/endian.h> header file. */ /* Define to 1 if you have the <sys/endian.h> header file. */
/* #undef HAVE_SYS_ENDIAN_H */ /* #undef HAVE_SYS_ENDIAN_H */
...@@ -55,6 +49,9 @@ ...@@ -55,6 +49,9 @@
/* Define to 1 if you have the <windows.h> header file. */ /* Define to 1 if you have the <windows.h> header file. */
/* #undef HAVE_WINDOWS_H */ /* #undef HAVE_WINDOWS_H */
/* Define to 1 if you target processors with SSSE3+ and have <tmmintrin.h>. */
#define SNAPPY_HAVE_SSSE3 0
/* Define to 1 if your processor stores words with the most significant byte /* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */ first (like Motorola and SPARC, unlike Intel and VAX). */
/* #undef SNAPPY_IS_BIG_ENDIAN */ /* #undef SNAPPY_IS_BIG_ENDIAN */
......
...@@ -36,17 +36,13 @@ ...@@ -36,17 +36,13 @@
#ifndef THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_ #ifndef THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
#define THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_ #define THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
#if 1 #include <cstddef>
#include <stdint.h> #include <cstdint>
#endif #include <string>
#if 1
#include <stddef.h>
#endif
#if 1 #if 1 // HAVE_SYS_UIO_H
#include <sys/uio.h> #include <sys/uio.h>
#endif #endif // HAVE_SYS_UIO_H
#define SNAPPY_MAJOR 1 #define SNAPPY_MAJOR 1
#define SNAPPY_MINOR 1 #define SNAPPY_MINOR 1
...@@ -54,46 +50,27 @@ ...@@ -54,46 +50,27 @@
#define SNAPPY_VERSION \ #define SNAPPY_VERSION \
((SNAPPY_MAJOR << 16) | (SNAPPY_MINOR << 8) | SNAPPY_PATCHLEVEL) ((SNAPPY_MAJOR << 16) | (SNAPPY_MINOR << 8) | SNAPPY_PATCHLEVEL)
#include <string>
namespace snappy { namespace snappy {
#if 1 using int8 = std::int8_t;
typedef int8_t int8; using uint8 = std::uint8_t;
typedef uint8_t uint8; using int16 = std::int16_t;
typedef int16_t int16; using uint16 = std::uint16_t;
typedef uint16_t uint16; using int32 = std::int32_t;
typedef int32_t int32; using uint32 = std::uint32_t;
typedef uint32_t uint32; using int64 = std::int64_t;
typedef int64_t int64; using uint64 = std::uint64_t;
typedef uint64_t uint64;
#else
typedef signed char int8;
typedef unsigned char uint8;
typedef short int16;
typedef unsigned short uint16;
typedef int int32;
typedef unsigned int uint32;
typedef long long int64;
typedef unsigned long long uint64;
#endif
typedef std::string string;
#ifndef DISALLOW_COPY_AND_ASSIGN using string = std::string;
#define DISALLOW_COPY_AND_ASSIGN(TypeName) \
TypeName(const TypeName&); \
void operator=(const TypeName&)
#endif
#if !1 #if !1 // !HAVE_SYS_UIO_H
// Windows does not have an iovec type, yet the concept is universally useful. // Windows does not have an iovec type, yet the concept is universally useful.
// It is simple to define it ourselves, so we put it inside our own namespace. // It is simple to define it ourselves, so we put it inside our own namespace.
struct iovec { struct iovec {
void* iov_base; void* iov_base;
size_t iov_len; size_t iov_len;
}; };
#endif #endif // !HAVE_SYS_UIO_H
} // namespace snappy } // namespace snappy
......
...@@ -28,12 +28,6 @@ ...@@ -28,12 +28,6 @@
/* Define to 1 if you have the `z' library (-lz). */ /* Define to 1 if you have the `z' library (-lz). */
/* #undef HAVE_LIBZ */ /* #undef HAVE_LIBZ */
/* Define to 1 if you have the <stddef.h> header file. */
#define HAVE_STDDEF_H 1
/* Define to 1 if you have the <stdint.h> header file. */
#define HAVE_STDINT_H 1
/* Define to 1 if you have the <sys/endian.h> header file. */ /* Define to 1 if you have the <sys/endian.h> header file. */
/* #undef HAVE_SYS_ENDIAN_H */ /* #undef HAVE_SYS_ENDIAN_H */
...@@ -55,6 +49,9 @@ ...@@ -55,6 +49,9 @@
/* Define to 1 if you have the <windows.h> header file. */ /* Define to 1 if you have the <windows.h> header file. */
#define HAVE_WINDOWS_H 1 #define HAVE_WINDOWS_H 1
/* Define to 1 if you target processors with SSSE3+ and have <tmmintrin.h>. */
#define SNAPPY_HAVE_SSSE3 0
/* Define to 1 if your processor stores words with the most significant byte /* Define to 1 if your processor stores words with the most significant byte
first (like Motorola and SPARC, unlike Intel and VAX). */ first (like Motorola and SPARC, unlike Intel and VAX). */
/* #undef SNAPPY_IS_BIG_ENDIAN */ /* #undef SNAPPY_IS_BIG_ENDIAN */
......
...@@ -36,13 +36,9 @@ ...@@ -36,13 +36,9 @@
#ifndef THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_ #ifndef THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
#define THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_ #define THIRD_PARTY_SNAPPY_OPENSOURCE_SNAPPY_STUBS_PUBLIC_H_
#if 1 // HAVE_STDINT_H #include <cstddef>
#include <stdint.h> #include <cstdint>
#endif // HAVE_STDDEF_H #include <string>
#if 1 // HAVE_STDDEF_H
#include <stddef.h>
#endif // HAVE_STDDEF_H
#if 0 // HAVE_SYS_UIO_H #if 0 // HAVE_SYS_UIO_H
#include <sys/uio.h> #include <sys/uio.h>
...@@ -54,31 +50,18 @@ ...@@ -54,31 +50,18 @@
#define SNAPPY_VERSION \ #define SNAPPY_VERSION \
((SNAPPY_MAJOR << 16) | (SNAPPY_MINOR << 8) | SNAPPY_PATCHLEVEL) ((SNAPPY_MAJOR << 16) | (SNAPPY_MINOR << 8) | SNAPPY_PATCHLEVEL)
#include <string>
namespace snappy { namespace snappy {
#if 1 // HAVE_STDINT_H using int8 = std::int8_t;
typedef int8_t int8; using uint8 = std::uint8_t;
typedef uint8_t uint8; using int16 = std::int16_t;
typedef int16_t int16; using uint16 = std::uint16_t;
typedef uint16_t uint16; using int32 = std::int32_t;
typedef int32_t int32; using uint32 = std::uint32_t;
typedef uint32_t uint32; using int64 = std::int64_t;
typedef int64_t int64; using uint64 = std::uint64_t;
typedef uint64_t uint64;
#else
typedef signed char int8;
typedef unsigned char uint8;
typedef short int16;
typedef unsigned short uint16;
typedef int int32;
typedef unsigned int uint32;
typedef long long int64;
typedef unsigned long long uint64;
#endif // HAVE_STDINT_H
typedef std::string string; using string = std::string;
#if !0 // !HAVE_SYS_UIO_H #if !0 // !HAVE_SYS_UIO_H
// Windows does not have an iovec type, yet the concept is universally useful. // Windows does not have an iovec type, yet the concept is universally useful.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment