From 1affc641c452baa42efb8a0611c71a1b8b3fbdf3 Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 12 Dec 2014 09:54:30 +0100 Subject: input/Init: eliminate double colon from log message --- src/input/Init.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/input/Init.cxx b/src/input/Init.cxx index 5e64dcaed..0ee87c4d8 100644 --- a/src/input/Init.cxx +++ b/src/input/Init.cxx @@ -67,7 +67,7 @@ input_stream_global_init(Error &error) case InputPlugin::InitResult::UNAVAILABLE: if (error.IsDefined()) { FormatError(error, - "Input plugin '%s' is unavailable: ", + "Input plugin '%s' is unavailable", plugin->name); error.Clear(); } -- cgit v1.2.3 From 2fec4635425f2cf3fb56a5c69f78d273e766c7ee Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Fri, 12 Dec 2014 09:53:44 +0100 Subject: util/HugeAllocator: disable MEM_LARGE_PAGES on Windows MEM_LARGE_PAGES does not appear to work. Instead, MEM_RESERVE appears to be necessary. Until I figure this out, this large pages are disabled. --- NEWS | 1 + src/util/HugeAllocator.hxx | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 165985925..b40023771 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ ver 0.19.7 (not yet released) * playlist - don't skip non-existent songs in "listplaylist" +* fix memory allocator bug on Windows ver 0.19.6 (2014/12/08) * decoder diff --git a/src/util/HugeAllocator.hxx b/src/util/HugeAllocator.hxx index e85f936dc..e02e69f10 100644 --- a/src/util/HugeAllocator.hxx +++ b/src/util/HugeAllocator.hxx @@ -70,7 +70,8 @@ gcc_malloc static inline void * HugeAllocate(size_t size) { - return VirtualAlloc(nullptr, size, MEM_LARGE_PAGES, PAGE_READWRITE); + // TODO: use MEM_LARGE_PAGES + return VirtualAlloc(nullptr, size, MEM_RESERVE, PAGE_READWRITE); } static inline void -- cgit v1.2.3