-
Notifications
You must be signed in to change notification settings - Fork 3.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Upgrade hiredis and nghttp2 library (#4276)
* sync hiredis-v1.0.0 * upgrade nghttp2 * improve redis result parser * fix tests * fix tests [2] * update library * fix tests
- Loading branch information
Showing
28 changed files
with
5,662 additions
and
4,800 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,86 @@ | ||
| /* | ||
| * Copyright (c) 2020, Michael Grunder <michael dot grunder at gmail dot com> | ||
| * | ||
| * All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are met: | ||
| * | ||
| * * Redistributions of source code must retain the above copyright notice, | ||
| * this list of conditions and the following disclaimer. | ||
| * * Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * * Neither the name of Redis nor the names of its contributors may be used | ||
| * to endorse or promote products derived from this software without | ||
| * specific prior written permission. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | ||
| * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
| * POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| #include "fmacros.h" | ||
| #include "alloc.h" | ||
| #include <string.h> | ||
| #include <stdlib.h> | ||
|
|
||
| hiredisAllocFuncs hiredisAllocFns = { | ||
| .mallocFn = malloc, | ||
| .callocFn = calloc, | ||
| .reallocFn = realloc, | ||
| .strdupFn = strdup, | ||
| .freeFn = free, | ||
| }; | ||
|
|
||
| /* Override hiredis' allocators with ones supplied by the user */ | ||
| hiredisAllocFuncs hiredisSetAllocators(hiredisAllocFuncs *override) { | ||
| hiredisAllocFuncs orig = hiredisAllocFns; | ||
|
|
||
| hiredisAllocFns = *override; | ||
|
|
||
| return orig; | ||
| } | ||
|
|
||
| /* Reset allocators to use libc defaults */ | ||
| void hiredisResetAllocators(void) { | ||
| hiredisAllocFns = (hiredisAllocFuncs) { | ||
| .mallocFn = malloc, | ||
| .callocFn = calloc, | ||
| .reallocFn = realloc, | ||
| .strdupFn = strdup, | ||
| .freeFn = free, | ||
| }; | ||
| } | ||
|
|
||
| #ifdef _WIN32 | ||
|
|
||
| void *hi_malloc(size_t size) { | ||
| return hiredisAllocFns.mallocFn(size); | ||
| } | ||
|
|
||
| void *hi_calloc(size_t nmemb, size_t size) { | ||
| return hiredisAllocFns.callocFn(nmemb, size); | ||
| } | ||
|
|
||
| void *hi_realloc(void *ptr, size_t size) { | ||
| return hiredisAllocFns.reallocFn(ptr, size); | ||
| } | ||
|
|
||
| char *hi_strdup(const char *str) { | ||
| return hiredisAllocFns.strdupFn(str); | ||
| } | ||
|
|
||
| void hi_free(void *ptr) { | ||
| hiredisAllocFns.freeFn(ptr); | ||
| } | ||
|
|
||
| #endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| /* | ||
| * Copyright (c) 2020, Michael Grunder <michael dot grunder at gmail dot com> | ||
| * | ||
| * All rights reserved. | ||
| * | ||
| * Redistribution and use in source and binary forms, with or without | ||
| * modification, are permitted provided that the following conditions are met: | ||
| * | ||
| * * Redistributions of source code must retain the above copyright notice, | ||
| * this list of conditions and the following disclaimer. | ||
| * * Redistributions in binary form must reproduce the above copyright | ||
| * notice, this list of conditions and the following disclaimer in the | ||
| * documentation and/or other materials provided with the distribution. | ||
| * * Neither the name of Redis nor the names of its contributors may be used | ||
| * to endorse or promote products derived from this software without | ||
| * specific prior written permission. | ||
| * | ||
| * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" | ||
| * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
| * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
| * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE | ||
| * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
| * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF | ||
| * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS | ||
| * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN | ||
| * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) | ||
| * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE | ||
| * POSSIBILITY OF SUCH DAMAGE. | ||
| */ | ||
|
|
||
| #ifndef HIREDIS_ALLOC_H | ||
| #define HIREDIS_ALLOC_H | ||
|
|
||
| #include <stddef.h> /* for size_t */ | ||
|
|
||
| #ifdef __cplusplus | ||
| extern "C" { | ||
| #endif | ||
|
|
||
| /* Structure pointing to our actually configured allocators */ | ||
| typedef struct hiredisAllocFuncs { | ||
| void *(*mallocFn)(size_t); | ||
| void *(*callocFn)(size_t,size_t); | ||
| void *(*reallocFn)(void*,size_t); | ||
| char *(*strdupFn)(const char*); | ||
| void (*freeFn)(void*); | ||
| } hiredisAllocFuncs; | ||
|
|
||
| hiredisAllocFuncs hiredisSetAllocators(hiredisAllocFuncs *ha); | ||
| void hiredisResetAllocators(void); | ||
|
|
||
| #ifndef _WIN32 | ||
|
|
||
| /* Hiredis' configured allocator function pointer struct */ | ||
| extern hiredisAllocFuncs hiredisAllocFns; | ||
|
|
||
| static inline void *hi_malloc(size_t size) { | ||
| return hiredisAllocFns.mallocFn(size); | ||
| } | ||
|
|
||
| static inline void *hi_calloc(size_t nmemb, size_t size) { | ||
| return hiredisAllocFns.callocFn(nmemb, size); | ||
| } | ||
|
|
||
| static inline void *hi_realloc(void *ptr, size_t size) { | ||
| return hiredisAllocFns.reallocFn(ptr, size); | ||
| } | ||
|
|
||
| static inline char *hi_strdup(const char *str) { | ||
| return hiredisAllocFns.strdupFn(str); | ||
| } | ||
|
|
||
| static inline void hi_free(void *ptr) { | ||
| hiredisAllocFns.freeFn(ptr); | ||
| } | ||
|
|
||
| #else | ||
|
|
||
| void *hi_malloc(size_t size); | ||
| void *hi_calloc(size_t nmemb, size_t size); | ||
| void *hi_realloc(void *ptr, size_t size); | ||
| char *hi_strdup(const char *str); | ||
| void hi_free(void *ptr); | ||
|
|
||
| #endif | ||
|
|
||
| #ifdef __cplusplus | ||
| } | ||
| #endif | ||
|
|
||
| #endif /* HIREDIS_ALLOC_H */ |
Oops, something went wrong.