Permalink
Browse files

Merge commit '51804f1' into bksavecow

  • Loading branch information...
2 parents 26f3e15 + 51804f1 commit 70b6575a5757854a29873d4e00461b394704d4df @HenryRawas HenryRawas committed May 8, 2012
Showing with 10 additions and 0 deletions.
  1. +5 −0 README.md
  2. +5 −0 src/redis.c
View
@@ -9,6 +9,11 @@ Redis on Windows prototype
===
Special thanks to Dušan Majkic (https://github.com/dmajkic, https://github.com/dmajkic/redis/) for his project on GitHub that gave us the opportunity to quickly learn some on the intricacies of Redis code. His project also helped us to build our prototype quickly.
+## Repo branches
+- 2.4: save in foreground
+- bksave: background save where we write the data to buffers first, then save to disk on a background thread. It is much faster than saving directly to disk, but it uses more memory.
+- bksavecow: Copy On Write at the application level
+
## How to build Redis using Visual Studio
You can use the free Express Edition available at http://www.microsoft.com/visualstudio/en-us/products/2010-editions/visual-cpp-express.
View
@@ -1209,8 +1209,13 @@ int prepareForShutdown() {
unlink(server.pidfile);
}
/* Close the listening sockets. Apparently this allows faster restarts. */
+#ifdef _WIN32
+ if (server.ipfd != -1) closesocket(server.ipfd);
+ if (server.sofd != -1) closesocket(server.sofd);
+#else
if (server.ipfd != -1) close(server.ipfd);
if (server.sofd != -1) close(server.sofd);
+#endif
if (server.unixsocket) {
redisLog(REDIS_NOTICE,"Removing the unix socket file.");
unlink(server.unixsocket); /* don't care if this fails */

0 comments on commit 70b6575

Please sign in to comment.