From 267b8a9ce46c01dbd8508f4b8e555e1e3f590092 Mon Sep 17 00:00:00 2001 From: Richard Fuchs Date: Tue, 31 May 2011 16:13:45 +0000 Subject: [PATCH] Add a "test routine" for redis DB and call restoration. Takes less than 2 seconds to restore 3000 calls. Fix the "ports used" array. --- daemon/call.c | 2 +- daemon/redis.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/daemon/call.c b/daemon/call.c index 018815c7f..b9bb9efa5 100644 --- a/daemon/call.c +++ b/daemon/call.c @@ -35,7 +35,7 @@ static pcre_extra *info_ree; static pcre *streams_re; static pcre_extra *streams_ree; -static BIT_ARRAY_DECLARE(ports_used, 0x1000); +static BIT_ARRAY_DECLARE(ports_used, 0x10000); diff --git a/daemon/redis.c b/daemon/redis.c index 3d18f14a4..ffe92c431 100644 --- a/daemon/redis.c +++ b/daemon/redis.c @@ -14,6 +14,36 @@ + + +/* + +To fill the redis DB with expiring test data: + + num=3000 + db=1 + expire=86400 + + for x in $(seq 1 $num); do + b=$(uuid) + echo "hmset $b callid $(uuid)@test created $(date +%s)" + c=$(uuid) + echo "rpush $b-streams $c" + echo "hmset $c:0 ip $(($RANDOM % 253 + 1)).$(($RANDOM % 253 + 1)).$(($RANDOM % 253 + 1)).$(($RANDOM % 253 + 1)) port $(($RANDOM % 10000 + 1024)) localport $(($RANDOM % 10000 + 1024)) kernel 1 filled 1 confirmed 1 tag $(uuid)" + echo "hmset $c:1 ip $(($RANDOM % 253 + 1)).$(($RANDOM % 253 + 1)).$(($RANDOM % 253 + 1)).$(($RANDOM % 253 + 1)) port $(($RANDOM % 10000 + 1024)) localport $(($RANDOM % 10000 + 1024)) kernel 1 filled 1 confirmed 1 tag $(uuid)" + echo "expire $b $expire" + echo "expire $b-streams $expire" + echo "expire $c:0 $expire" + echo "expire $c:1 $expire" + echo "sadd calls $b" + done | redis-cli -n $db + +*/ + + + + + #define redisCommandNR(a...) (int)({ void *__tmp; __tmp = redisCommand(a); if (__tmp) freeReplyObject(__tmp); __tmp ? 0 : -1;})