Use umm_malloc for heap management

README.md

@@ -101,3 +101,5 @@ Espressif SDK included in this build is under Espressif MIT License.
 ESP8266 core files are licensed under LGPL.
 
 [SPI Flash File System (SPIFFS)](https://github.com/pellepl/spiffs) written by Peter Andersson is used in this project. It is distributed under MIT license.
+
+[umm_malloc](https://github.com/rhempel/umm_malloc) memory management library written by Ralph Hempel is used in this project. It is distributed under MIT license.

cores/esp8266/heap.c

@@ -0,0 +1,43 @@
+/* heap.c - overrides of SDK heap handling functions
+ * Copyright (c) 2016 Ivan Grokhotkov. All rights reserved.
+ * This file is distributed under MIT license.
+ */
+
+#include <stdlib.h>
+#include "umm_malloc/umm_malloc.h"
+#include <c_types.h>
+
+void* ICACHE_RAM_ATTR pvPortMalloc(size_t size, const char* file, int line)
+{
+    return malloc(size);
+}
+
+void ICACHE_RAM_ATTR vPortFree(void *ptr, const char* file, int line)
+{
+    free(ptr);
+}
+
+void* ICACHE_RAM_ATTR pvPortCalloc(size_t count, size_t size, const char* file, int line)
+{
+    return calloc(count, size);
+}
+
+void* ICACHE_RAM_ATTR pvPortRealloc(void *ptr, size_t size, const char* file, int line)
+{
+    return realloc(ptr, size);
+}
+
+void* ICACHE_RAM_ATTR pvPortZalloc(size_t size, const char* file, int line)
+{
+    return calloc(1, size);
+}
+
+size_t ICACHE_RAM_ATTR xPortGetFreeHeapSize(void)
+{
+    return umm_free_heap_size();
+}
+
+void system_show_malloc(void)
+{
+    umm_info(NULL, 1);
+}

cores/esp8266/libc_replacements.c

@@ -39,22 +39,8 @@
 #include "user_interface.h"
 #include "debug.h"
 
-void* ICACHE_RAM_ATTR malloc(size_t size) {
-    size = ((size + 3) & ~((size_t)0x3));
-    return os_malloc(size);
-}
-
-void ICACHE_RAM_ATTR free(void* ptr) {
-    os_free(ptr);
-}
-
-void* ICACHE_RAM_ATTR realloc(void* ptr, size_t size) {
-    size = ((size + 3) & ~((size_t)0x3));
-    return os_realloc(ptr, size);
-}
-
 int ICACHE_RAM_ATTR puts(const char * str) {
-    return os_printf("%s", str);
+    return ets_printf("%s", str);
 }
 
 int ICACHE_RAM_ATTR printf(const char* format, ...) {

cores/esp8266/umm_malloc/LICENSE

@@ -0,0 +1,22 @@
+The MIT License (MIT)
+
+Copyright (c) 2015 Ralph Hempel
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+