40f7035ba4
OK, perhaps the second time is a charm. I forgot that I had hiredis forked from a long time ago, so the initial pull request was hosed. :) * Pulled in sdscatfmt() from Redis, and modified it to accept a size_t (%T) style format specifier. * Pulled in sdsll2str() and sdsull2str() from Redis (needed by sdscatfmt). * Added a new method, redisFormatSdsCommandArgv() which takes and sds* as the target, rather than char* (and uses sdscatfmt instead of sprintf for the construction). I get roughly the following improvement: Old: 1.044806 New: 0.481620 The benchmark code itself can be found here: https://gist.github.com/michael-grunder/c92ef31bb632b3d0ad81 Closes #260
103 lines
3.6 KiB
C
103 lines
3.6 KiB
C
/* SDS (Simple Dynamic Strings), A C dynamic strings library.
|
|
*
|
|
* Copyright (c) 2006-2014, Salvatore Sanfilippo <antirez 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 __SDS_H
|
|
#define __SDS_H
|
|
|
|
#define SDS_MAX_PREALLOC (1024*1024)
|
|
|
|
#include <sys/types.h>
|
|
#include <stdarg.h>
|
|
|
|
typedef char *sds;
|
|
|
|
struct sdshdr {
|
|
int len;
|
|
int free;
|
|
char buf[];
|
|
};
|
|
|
|
static inline size_t sdslen(const sds s) {
|
|
struct sdshdr *sh = (void*)(s-sizeof *sh);
|
|
return sh->len;
|
|
}
|
|
|
|
static inline size_t sdsavail(const sds s) {
|
|
struct sdshdr *sh = (void*)(s-sizeof *sh);
|
|
return sh->free;
|
|
}
|
|
|
|
sds sdsnewlen(const void *init, size_t initlen);
|
|
sds sdsnew(const char *init);
|
|
sds sdsempty(void);
|
|
size_t sdslen(const sds s);
|
|
sds sdsdup(const sds s);
|
|
void sdsfree(sds s);
|
|
size_t sdsavail(const sds s);
|
|
sds sdsgrowzero(sds s, size_t len);
|
|
sds sdscatlen(sds s, const void *t, size_t len);
|
|
sds sdscat(sds s, const char *t);
|
|
sds sdscatsds(sds s, const sds t);
|
|
sds sdscpylen(sds s, const char *t, size_t len);
|
|
sds sdscpy(sds s, const char *t);
|
|
|
|
sds sdscatvprintf(sds s, const char *fmt, va_list ap);
|
|
#ifdef __GNUC__
|
|
sds sdscatprintf(sds s, const char *fmt, ...)
|
|
__attribute__((format(printf, 2, 3)));
|
|
#else
|
|
sds sdscatprintf(sds s, const char *fmt, ...);
|
|
#endif
|
|
|
|
sds sdscatfmt(sds s, char const *fmt, ...);
|
|
void sdstrim(sds s, const char *cset);
|
|
void sdsrange(sds s, int start, int end);
|
|
void sdsupdatelen(sds s);
|
|
void sdsclear(sds s);
|
|
int sdscmp(const sds s1, const sds s2);
|
|
sds *sdssplitlen(const char *s, int len, const char *sep, int seplen, int *count);
|
|
void sdsfreesplitres(sds *tokens, int count);
|
|
void sdstolower(sds s);
|
|
void sdstoupper(sds s);
|
|
sds sdsfromlonglong(long long value);
|
|
sds sdscatrepr(sds s, const char *p, size_t len);
|
|
sds *sdssplitargs(const char *line, int *argc);
|
|
sds sdsmapchars(sds s, const char *from, const char *to, size_t setlen);
|
|
sds sdsjoin(char **argv, int argc, char *sep, size_t seplen);
|
|
sds sdsjoinsds(sds *argv, int argc, const char *sep, size_t seplen);
|
|
|
|
/* Low level functions exposed to the user API */
|
|
sds sdsMakeRoomFor(sds s, size_t addlen);
|
|
void sdsIncrLen(sds s, int incr);
|
|
sds sdsRemoveFreeSpace(sds s);
|
|
size_t sdsAllocSize(sds s);
|
|
|
|
#endif
|