Commit 092dac2a authored by antirez's avatar antirez
Browse files

another missing free->zfree replacement fixed. Thanks to Ludo

parent 5b19bd72
...@@ -23,7 +23,7 @@ anet.o: anet.c anet.h ...@@ -23,7 +23,7 @@ anet.o: anet.c anet.h
benchmark.o: benchmark.c ae.h anet.h sds.h adlist.h benchmark.o: benchmark.c ae.h anet.h sds.h adlist.h
dict.o: dict.c dict.h dict.o: dict.c dict.h
redis-cli.o: redis-cli.c anet.h sds.h adlist.h redis-cli.o: redis-cli.c anet.h sds.h adlist.h
redis.o: redis.c ae.h sds.h anet.h dict.h adlist.h redis.o: redis.c ae.h sds.h anet.h dict.h adlist.h zmalloc.c zmalloc.h
sds.o: sds.c sds.h sds.o: sds.c sds.h
sha1.o: sha1.c sha1.h sha1.o: sha1.c sha1.h
zmalloc.o: zmalloc.c zmalloc.o: zmalloc.c
......
...@@ -15,3 +15,22 @@ BETA 8 TODO ...@@ -15,3 +15,22 @@ BETA 8 TODO
$ $
- Make Redis aware of the memory it is using thanks to getrusage() and report this info with the INFO command. - Make Redis aware of the memory it is using thanks to getrusage() and report this info with the INFO command.
- INFO command: clients, slave/master, requests/second in the last N seconds, memory usage, uptime, dirty, lastsave - INFO command: clients, slave/master, requests/second in the last N seconds, memory usage, uptime, dirty, lastsave
FUTURE
ROLLBACK command:
ROLLBACK UNSET x
SET x 10
EXPIRE x 3600
COMMIT
(multiple rollbacks are allowed)
or alternatively
TRANSACTION SET x 1000
TRANSACTION EXPIRE x 1000
COMMIT
but this sucks since there is no way to check the error message.
...@@ -2619,7 +2619,7 @@ static void sortCommand(redisClient *c) { ...@@ -2619,7 +2619,7 @@ static void sortCommand(redisClient *c) {
/* Create a list of operations to perform for every sorted element. /* Create a list of operations to perform for every sorted element.
* Operations can be GET/DEL/INCR/DECR */ * Operations can be GET/DEL/INCR/DECR */
operations = listCreate(); operations = listCreate();
listSetFreeMethod(operations,free); listSetFreeMethod(operations,zfree);
j = 2; j = 2;
/* Now we need to protect sortval incrementing its count, in the future /* Now we need to protect sortval incrementing its count, in the future
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
void *zmalloc(size_t size); void *zmalloc(size_t size);
void *zrealloc(void *ptr, size_t size); void *zrealloc(void *ptr, size_t size);
void *zfree(void *ptr); void zfree(void *ptr);
char *zstrdup(const char *s); char *zstrdup(const char *s);
size_t zmalloc_used_memory(void); size_t zmalloc_used_memory(void);
......
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