summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Lindner <plindner@hi5.com>2007-04-17 00:24:53 +0000
committerPaul Lindner <plindner@hi5.com>2007-04-17 00:24:53 +0000
commitfb6b20babe220f96764e6edd58d3369c94a1bf38 (patch)
tree87c1065e3297bf2eb845f839055f3193d9c5621c
parenteb75a0df2708cf72ba75105aeca2f4db4756841e (diff)
downloadmemcached-fb6b20babe220f96764e6edd58d3369c94a1bf38.tar.gz
Updated docs to reflect that memcached works fine on macs with recent libevent
git-svn-id: http://code.sixapart.com/svn/memcached/trunk/server@513 b0b603af-a30f-0410-a34e-baf09ae79d0b
-rw-r--r--ChangeLog4
-rw-r--r--README3
-rw-r--r--doc/OSX.txt28
3 files changed, 7 insertions, 28 deletions
diff --git a/ChangeLog b/ChangeLog
index 69eed09..fd06657 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,11 @@
+
2007-04-16 Paul Lindner <lindner@inuus.com>
+ * Add notes to README about MacOS, libevent and kqueue.
+
* Windows Patch integration -- part 1, warnings elimination.
+
2007-04-12 Paul Lindner <lindner@mirth.inuus.com>
* Allow changes to the verbosity level of the server with a new
diff --git a/README b/README
index b513eae..efc91d4 100644
--- a/README
+++ b/README
@@ -11,6 +11,9 @@ epoll isn't in Linux 2.4 yet, but there's a backport at:
You want the epoll-lt patch (level-triggered).
+If you're using MacOS, you'll want libevent 1.1 or higher to deal with
+a kqueue bug.
+
Also, be warned that the -k (mlockall) option to memcached might be
dangerous when using a large cache. Just make sure the memcached machines
don't swap. memcached does non-blocking network I/O, but not disk. (it
diff --git a/doc/OSX.txt b/doc/OSX.txt
deleted file mode 100644
index 7021e0c..0000000
--- a/doc/OSX.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-memcached is slow on OSX because:
-
- -- OSX's kqueue is broken
- -- OSX's TCP_NOPUSH stuff is different/broken
-
-So there are reports that this works and make memcached fast on OS X:
-
- Two simple changes:
-
- First, in memcached.c (in the memcached source directory) add
- (anywhere above line 105, which reads #ifdef TCP_NOPUSH) the line:
-
- #undef TCP_NOPUSH
-
- I just added it on the line above the #ifdef line.
-
- Rebuild memcached (just do a make && sudo make install, don.t need
- to re-run configure if you.ve already done it)
-
- then, set the environment variable EVENT_NOKQUEUE to 1
-
- in csh and derivatives: setenv EVENT_NOKQUEUE 1
-
- in sh and derivatives (like bash): export EVENT_NOKQUEUE=1
-
- then start memcached, and it should be fast (it certainly made a
- difference here)
-