"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/redis-benchmark.c" between
redis-6.2-rc3.tar.gz and redis-6.2.0.tar.gz

About: redis is an advanced key-value store. It is often referred to as a data structure server since keys can contain strings, hashes, lists, sets and sorted sets.

redis-benchmark.c  (redis-6.2-rc3):redis-benchmark.c  (redis-6.2.0)
skipping to change at line 568 skipping to change at line 568
c->prefix_pending--; c->prefix_pending--;
c->pending--; c->pending--;
/* Discard prefix commands on first response.*/ /* Discard prefix commands on first response.*/
if (c->prefixlen > 0) { if (c->prefixlen > 0) {
size_t j; size_t j;
sdsrange(c->obuf, c->prefixlen, -1); sdsrange(c->obuf, c->prefixlen, -1);
/* We also need to fix the pointers to the strings /* We also need to fix the pointers to the strings
* we need to randomize. */ * we need to randomize. */
for (j = 0; j < c->randlen; j++) for (j = 0; j < c->randlen; j++)
c->randptr[j] -= c->prefixlen; c->randptr[j] -= c->prefixlen;
/* Fix the pointers to the slot hash tags */
for (j = 0; j < c->staglen; j++)
c->stagptr[j] -= c->prefixlen;
c->prefixlen = 0; c->prefixlen = 0;
} }
continue; continue;
} }
int requests_finished = 0; int requests_finished = 0;
atomicGetIncr(config.requests_finished, requests_finished, 1); atomicGetIncr(config.requests_finished, requests_finished, 1);
if (requests_finished < config.requests){ if (requests_finished < config.requests){
if (config.num_threads == 0) { if (config.num_threads == 0) {
hdr_record_value( hdr_record_value(
config.latency_histogram, // Histogram to record to config.latency_histogram, // Histogram to record to
skipping to change at line 1517 skipping to change at line 1520
config.tls = 1; config.tls = 1;
} else if (!strcmp(argv[i],"--sni")) { } else if (!strcmp(argv[i],"--sni")) {
if (lastarg) goto invalid; if (lastarg) goto invalid;
config.sslconfig.sni = strdup(argv[++i]); config.sslconfig.sni = strdup(argv[++i]);
} else if (!strcmp(argv[i],"--cacertdir")) { } else if (!strcmp(argv[i],"--cacertdir")) {
if (lastarg) goto invalid; if (lastarg) goto invalid;
config.sslconfig.cacertdir = strdup(argv[++i]); config.sslconfig.cacertdir = strdup(argv[++i]);
} else if (!strcmp(argv[i],"--cacert")) { } else if (!strcmp(argv[i],"--cacert")) {
if (lastarg) goto invalid; if (lastarg) goto invalid;
config.sslconfig.cacert = strdup(argv[++i]); config.sslconfig.cacert = strdup(argv[++i]);
} else if (!strcmp(argv[i],"--insecure")) {
config.sslconfig.skip_cert_verify = 1;
} else if (!strcmp(argv[i],"--cert")) { } else if (!strcmp(argv[i],"--cert")) {
if (lastarg) goto invalid; if (lastarg) goto invalid;
config.sslconfig.cert = strdup(argv[++i]); config.sslconfig.cert = strdup(argv[++i]);
} else if (!strcmp(argv[i],"--key")) { } else if (!strcmp(argv[i],"--key")) {
if (lastarg) goto invalid; if (lastarg) goto invalid;
config.sslconfig.key = strdup(argv[++i]); config.sslconfig.key = strdup(argv[++i]);
} else if (!strcmp(argv[i],"--tls-ciphers")) { } else if (!strcmp(argv[i],"--tls-ciphers")) {
if (lastarg) goto invalid; if (lastarg) goto invalid;
config.sslconfig.ciphers = strdup(argv[++i]); config.sslconfig.ciphers = strdup(argv[++i]);
#ifdef TLS1_3_VERSION #ifdef TLS1_3_VERSION
skipping to change at line 1586 skipping to change at line 1591
" -t <tests> Only run the comma separated list of tests. The test\n" " -t <tests> Only run the comma separated list of tests. The test\n"
" names are the same as the ones produced as output.\n" " names are the same as the ones produced as output.\n"
" -I Idle mode. Just open N idle connections and wait.\n" " -I Idle mode. Just open N idle connections and wait.\n"
#ifdef USE_OPENSSL #ifdef USE_OPENSSL
" --tls Establish a secure TLS connection.\n" " --tls Establish a secure TLS connection.\n"
" --sni <host> Server name indication for TLS.\n" " --sni <host> Server name indication for TLS.\n"
" --cacert <file> CA Certificate file to verify with.\n" " --cacert <file> CA Certificate file to verify with.\n"
" --cacertdir <dir> Directory where trusted CA certificates are stored.\n" " --cacertdir <dir> Directory where trusted CA certificates are stored.\n"
" If neither cacert nor cacertdir are specified, the default\ n" " If neither cacert nor cacertdir are specified, the default\ n"
" system-wide trusted root certs configuration will apply.\n" " system-wide trusted root certs configuration will apply.\n"
" --insecure Allow insecure TLS connection by skipping cert validation.\ n"
" --cert <file> Client certificate to authenticate with.\n" " --cert <file> Client certificate to authenticate with.\n"
" --key <file> Private key file to authenticate with.\n" " --key <file> Private key file to authenticate with.\n"
" --tls-ciphers <list> Sets the list of prefered ciphers (TLSv1.2 and below)\n" " --tls-ciphers <list> Sets the list of prefered ciphers (TLSv1.2 and below)\n"
" in order of preference from highest to lowest separated by colon (\":\").\n" " in order of preference from highest to lowest separated by colon (\":\").\n"
" See the ciphers(1ssl) manpage for more information about th e syntax of this string.\n" " See the ciphers(1ssl) manpage for more information about th e syntax of this string.\n"
#ifdef TLS1_3_VERSION #ifdef TLS1_3_VERSION
" --tls-ciphersuites <list> Sets the list of prefered ciphersuites (TLSv1.3)\n" " --tls-ciphersuites <list> Sets the list of prefered ciphersuites (TLSv1.3)\n"
" in order of preference from highest to lowest separated by colon (\":\").\n" " in order of preference from highest to lowest separated by colon (\":\").\n"
" See the ciphers(1ssl) manpage for more information about th e syntax of this string,\n" " See the ciphers(1ssl) manpage for more information about th e syntax of this string,\n"
" and specifically for TLSv1.3 ciphersuites.\n" " and specifically for TLSv1.3 ciphersuites.\n"
skipping to change at line 1683 skipping to change at line 1689
char *data, *cmd, *tag; char *data, *cmd, *tag;
int len; int len;
client c; client c;
srandom(time(NULL) ^ getpid()); srandom(time(NULL) ^ getpid());
init_genrand64(ustime() ^ getpid()); init_genrand64(ustime() ^ getpid());
signal(SIGHUP, SIG_IGN); signal(SIGHUP, SIG_IGN);
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
memset(&config.sslconfig, 0, sizeof(config.sslconfig));
config.numclients = 50; config.numclients = 50;
config.requests = 100000; config.requests = 100000;
config.liveclients = 0; config.liveclients = 0;
config.el = aeCreateEventLoop(1024*10); config.el = aeCreateEventLoop(1024*10);
aeCreateTimeEvent(config.el,1,showThroughput,NULL,NULL); aeCreateTimeEvent(config.el,1,showThroughput,NULL,NULL);
config.keepalive = 1; config.keepalive = 1;
config.datasize = 3; config.datasize = 3;
config.pipeline = 1; config.pipeline = 1;
config.showerrors = 0; config.showerrors = 0;
config.randomkeys = 0; config.randomkeys = 0;
 End of changes. 4 change blocks. 
0 lines changed or deleted 7 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)