Merge remote branch 'pietern/writev-unstable' into unstable

diff --combined src/redis.h
index 54d82cb6bafdd08b9ac769d61df9c25d82a222b2,f2ba5207dcd19b306b5677922124047f8a32fd83..3486307ec2ed3e540c59cf08857028e0713a0baf
--- 1/src/redis.h
--- 2/src/redis.h
+++ b/src/redis.h
@@@ -50,11 -50,6 +50,6 @@@
  #define REDIS_REPLY_CHUNK_BYTES (5*1500) /* 5 TCP packets with default MTU */
  #define REDIS_MAX_LOGMSG_LEN    1024 /* Default maximum length of syslog messages */
  
- /* If more then REDIS_WRITEV_THRESHOLD write packets are pending use writev */
- #define REDIS_WRITEV_THRESHOLD      3
- /* Max number of iovecs used for each writev call */
- #define REDIS_WRITEV_IOVEC_COUNT    256
- 
  /* Hash table parameters */
  #define REDIS_HT_MINFILL        10      /* Minimal hash table fill 10% */
  
@@@ -125,10 -120,6 +120,10 @@@
  #define REDIS_IO_LOADINPROG 4
  #define REDIS_IO_SAVEINPROG 8
  
 +/* Generic IO flags */
 +#define REDIS_IO_ONLYLOADS 1
 +#define REDIS_IO_ASAP 2
 +
  #define REDIS_MAX_COMPLETED_JOBS_PROCESSED 1
  #define REDIS_THREAD_STACK_SIZE (1024*1024*4)
  
@@@ -388,7 -379,6 +383,6 @@@ struct redisServer 
      long long stat_keyspace_misses; /* number of failed lookups of keys */
      /* Configuration */
      int verbosity;
-     int glueoutputbuf;
      int maxidletime;
      int dbnum;
      int daemonize;
@@@ -633,7 -623,6 +627,6 @@@ void closeTimedoutClients(void)
  void freeClient(redisClient *c);
  void resetClient(redisClient *c);
  void sendReplyToClient(aeEventLoop *el, int fd, void *privdata, int mask);
- void sendReplyToClientWritev(aeEventLoop *el, int fd, void *privdata, int mask);
  void addReply(redisClient *c, robj *obj);
  void *addDeferredMultiBulkLength(redisClient *c);
  void setDeferredMultiBulkLength(redisClient *c, void *node, long length);