merge conflicts resolved

[redis.git] / src / syncio.c

diff --git a/src/syncio.c b/src/syncio.c
index 81eeda08f9be27232aea66b061163f71d8790499..9958363be23382c4bec7e520ce8a22d20a480271 100644 (file)
--- a/src/syncio.c
+++ b/src/syncio.c
@@ -1,9 +1,4 @@
-/* Synchronous socket I/O operations, with timeouts.
- * Redis performs most of the I/O in a nonblocking way, with the exception
- * of the SYNC command where the slave does it in a blocking way, and
- * the MIGRATE command that must be blocking in order to be atomic from the
- * point of view of the two instances (one migrating the key and one receiving
- * the key). This is why need the following blocking I/O functions.
+/* Synchronous socket and file I/O operations useful across the core.
  *
  * Copyright (c) 2009-2010, Salvatore Sanfilippo <antirez at gmail dot com>
  * All rights reserved.
@@ -35,6 +30,14 @@
 
 #include "redis.h"
 
+/* ----------------- Blocking sockets I/O with timeouts --------------------- */
+
+/* Redis performs most of the I/O in a nonblocking way, with the exception
+ * of the SYNC command where the slave does it in a blocking way, and
+ * the MIGRATE command that must be blocking in order to be atomic from the
+ * point of view of the two instances (one migrating the key and one receiving
+ * the key). This is why need the following blocking I/O functions. */
+
 int syncWrite(int fd, char *ptr, ssize_t size, int timeout) {
     ssize_t nwritten, ret = size;
     time_t start = time(NULL);