diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | Completion/Unix/Command/_qemu | 4 | ||||
| -rw-r--r-- | Src/mem.c | 7 |
3 files changed, 10 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index 499c871e4..a35b6056f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-10-31 Barton E. Schaefer <schaefer@zsh.org> + + * unposted (cf. 36998,36999): Src/mem.c: undo 36956 / restore 34451 + with expanded comment about the flip-flopping + 2015-10-31 Daniel Shahaf <d.s@daniel.shahaf.name> * 37032: Completion/Unix/Command/_git: Temporarily revert 36959. diff --git a/Completion/Unix/Command/_qemu b/Completion/Unix/Command/_qemu index db07eba33..3c21c3e74 100644 --- a/Completion/Unix/Command/_qemu +++ b/Completion/Unix/Command/_qemu @@ -2,7 +2,7 @@ _qemu_log_items () { local -a opts hline - $service -d \? | while read -A hline; do + $service -d \? 2>/dev/null | while read -A hline; do [[ $hline[1] = Log ]] && continue opts=($opts "${hline[1]}[${hline[2,-1]}]") done @@ -11,7 +11,7 @@ _qemu_log_items () { local _qemu_machines -_qemu_machines=(${${${(f)"$($service -M \?)"}[2,-1]}%% *}) +_qemu_machines=(${${${(f)"$($service -M \? 2>/dev/null)"}[2,-1]}%% *}) _arguments \ '-'{fda,fdb,hda,hdb,hdc,hdd,cdrom}':disk image:_files' \ diff --git a/Src/mem.c b/Src/mem.c index 62d18d0cd..e31145e1e 100644 --- a/Src/mem.c +++ b/Src/mem.c @@ -79,16 +79,15 @@ #include <sys/mman.h> -#if 0 /* - * This change was designed to enable use of memory mapping on MacOS. + * This definition is 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(). + * somewhat slower to allocate than memory from malloc(), so whether + * using this improves performance depends on details of zhalloc(). */ #if defined(MAP_ANON) && !defined(MAP_ANONYMOUS) #define MAP_ANONYMOUS MAP_ANON #endif -#endif /* 0 */ #if defined(MAP_ANONYMOUS) && defined(MAP_PRIVATE) |