diff options
| author | Barton E. Schaefer <schaefer@zsh.org> | 2015-10-26 07:19:01 -0700 |
|---|---|---|
| committer | Barton E. Schaefer <schaefer@zsh.org> | 2015-10-26 07:19:01 -0700 |
| commit | 8934007f25600150cee7e6eda2816c9110a9dc69 (patch) | |
| tree | 64ce250afe25af7882ab83f13251b3d03f633f52 | |
| parent | 11ca38c6d99192856d33254c504114d4ba8cd258 (diff) | |
| download | zsh-8934007f25600150cee7e6eda2816c9110a9dc69.tar.gz zsh-8934007f25600150cee7e6eda2816c9110a9dc69.tar.xz zsh-8934007f25600150cee7e6eda2816c9110a9dc69.zip | |
36956: revert 34451, mmap() is too slow on MacOS
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | Src/mem.c | 7 |
2 files changed, 11 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index b2291f5b1..a55439df4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2015-10-26 Barton E. Schaefer <schaefer@zsh.org> + + * 36956: Src/mem.c: revert 34451, mmap() is too slow on MacOS + 2015-10-26 Peter Stephenson <p.w.stephenson@ntlworld.com> * users/20825: Src/Zle/zle_utils.c: get_undo_current_change() diff --git a/Src/mem.c b/Src/mem.c index 158ad9641..3138bb1d5 100644 --- a/Src/mem.c +++ b/Src/mem.c @@ -79,9 +79,16 @@ #include <sys/mman.h> +#if 0 +/* + * This change was designed to enable use of memory mapping on MacOS. + * However, performance tests indicate that MacOS mapped regions are + * significantly slower to allocate than memory from malloc(). + */ #if defined(MAP_ANON) && !defined(MAP_ANONYMOUS) #define MAP_ANONYMOUS MAP_ANON #endif +#endif /* 0 */ #if defined(MAP_ANONYMOUS) && defined(MAP_PRIVATE) |