Add inline always option to HeapSelect

esp8266 · earlephilhower · Jan 12, 2021 · Dec 21, 2020 · Dec 21, 2020 · Dec 22, 2020
commit c2636559c26007da30bf084eb6bbe725d6d96c0b
diff --git a/cores/esp8266/umm_malloc/umm_heap_select.h b/cores/esp8266/umm_malloc/umm_heap_select.h
@@ -3,6 +3,18 @@
 
 #include <umm_malloc/umm_malloc.h>
 
+#ifndef ALWAYS_INLINE
+#define ALWAYS_INLINE inline __attribute__ ((always_inline))
+#endif
+
+// Use FORCE_ALWAYS_INLINE to ensure HeapSelect... construtor/deconstructor
+// are placed in IRAM
+#ifdef FORCE_ALWAYS_INLINE
+#define MAYBE_ALWAYS_INLINE ALWAYS_INLINE
+#else
+#define MAYBE_ALWAYS_INLINE
+#endif
+
 /*
   This class is modeled after interrupts.h
 
@@ -20,13 +32,17 @@
 class HeapSelect {
 public:
 #if (UMM_NUM_HEAPS == 1)
+  MAYBE_ALWAYS_INLINE
   HeapSelect(size_t id) { (void)id; }
+  MAYBE_ALWAYS_INLINE
   ~HeapSelect() {}
 #else
+  MAYBE_ALWAYS_INLINE
   HeapSelect(size_t id) : _heap_id(umm_get_current_heap_id()) {
     umm_set_heap_by_id(id);
   }
 
+  MAYBE_ALWAYS_INLINE
   ~HeapSelect() {
     umm_set_heap_by_id(_heap_id);
   }
@@ -39,10 +55,12 @@ class HeapSelect {
 class HeapSelectIram {
 public:
 #ifdef UMM_HEAP_IRAM
+  MAYBE_ALWAYS_INLINE
   HeapSelectIram() : _heap_id(umm_get_current_heap_id()) {
     umm_set_heap_by_id(UMM_HEAP_IRAM);
   }
 
+  MAYBE_ALWAYS_INLINE
   ~HeapSelectIram() {
     umm_set_heap_by_id(_heap_id);
   }
@@ -51,21 +69,27 @@ class HeapSelectIram {
     size_t _heap_id;
 
 #else
+  MAYBE_ALWAYS_INLINE
   HeapSelectIram() {}
+  MAYBE_ALWAYS_INLINE
   ~HeapSelectIram() {}
 #endif
 };
 
 class HeapSelectDram {
 public:
 #if (UMM_NUM_HEAPS == 1)
+  MAYBE_ALWAYS_INLINE
   HeapSelectDram() {}
+  MAYBE_ALWAYS_INLINE
   ~HeapSelectDram() {}
 #else
+  MAYBE_ALWAYS_INLINE
   HeapSelectDram() : _heap_id(umm_get_current_heap_id()) {
     umm_set_heap_by_id(UMM_HEAP_DRAM);
   }
 
+  MAYBE_ALWAYS_INLINE
   ~HeapSelectDram() {
     umm_set_heap_by_id(_heap_id);
   }