new option for choosing number of test clients to run

[redis.git] / src / redis.h

diff --git a/src/redis.h b/src/redis.h
index 5d16722e37aac1ddf2a88eabf567c2eb691979ca..9d0e19ff2c54cd7b4889d5d4c1dbbd90d4b9f6b3 100644 (file)
--- a/src/redis.h
+++ b/src/redis.h
@@ -89,7 +89,6 @@
 #define REDIS_SET 2
 #define REDIS_ZSET 3
 #define REDIS_HASH 4
 #define REDIS_SET 2
 #define REDIS_ZSET 3
 #define REDIS_HASH 4

-#define REDIS_VMPOINTER 8

 
 /* Objects encoding. Some kind of objects like Strings and Hashes can be
  * internally represented in multiple ways. The 'encoding' field of the object
 
 /* Objects encoding. Some kind of objects like Strings and Hashes can be
  * internally represented in multiple ways. The 'encoding' field of the object


@@ -694,6 +693,7 @@ extern dictType hashDictType;
 long long ustime(void);
 long long mstime(void);
 void getRandomHexChars(char *p, unsigned int len);
 long long ustime(void);
 long long mstime(void);
 void getRandomHexChars(char *p, unsigned int len);

+uint64_t crc64(const unsigned char *s, uint64_t l);

 
 /* networking.c -- Networking and Client related operations */
 redisClient *createClient(int fd);
 
 /* networking.c -- Networking and Client related operations */
 redisClient *createClient(int fd);


@@ -811,9 +811,9 @@ int equalStringObjects(robj *a, robj *b);
 unsigned long estimateObjectIdleTime(robj *o);
 
 /* Synchronous I/O with timeout */
 unsigned long estimateObjectIdleTime(robj *o);
 
 /* Synchronous I/O with timeout */

-int syncWrite(int fd, char *ptr, ssize_t size, int timeout);
-int syncRead(int fd, char *ptr, ssize_t size, int timeout);
-int syncReadLine(int fd, char *ptr, ssize_t size, int timeout);
+ssize_t syncWrite(int fd, char *ptr, ssize_t size, long long timeout);
+ssize_t syncRead(int fd, char *ptr, ssize_t size, long long timeout);
+ssize_t syncReadLine(int fd, char *ptr, ssize_t size, long long timeout);

 
 /* Replication */
 void replicationFeedSlaves(list *slaves, int dictid, robj **argv, int argc);
 
 /* Replication */
 void replicationFeedSlaves(list *slaves, int dictid, robj **argv, int argc);