Get AllocationAlarm working

6 files changed, 25 insertions, 0 deletions

diff --git a/shared-module/memorymonitor/AllocationAlarm.c b/shared-module/memorymonitor/AllocationAlarm.c
index bbd33f2b0..ed7ab75ab 100644
--- a/shared-module/memorymonitor/AllocationAlarm.c
+++ b/shared-module/memorymonitor/AllocationAlarm.c
@@ -38,6 +38,11 @@ void common_hal_memorymonitor_allocationalarm_construct(memorymonitor_allocation
 }
 
 void common_hal_memorymonitor_allocationalarm_pause(memorymonitor_allocationalarm_obj_t* self) {
+    // Check to make sure we aren't already paused. We can be if we're exiting from an exception we
+    // caused.
+    if (self->previous == NULL) {
+        return;
+    }
     *self->previous = self->next;
     self->next = NULL;
     self->previous = NULL;
@@ -62,6 +67,10 @@ void memorymonitor_allocationalarms_allocation(size_t block_count) {
         // Hold onto next in case we remove the alarm from the list.
         memorymonitor_allocationalarm_obj_t* next = alarm->next;
         if (block_count >= alarm->minimum_block_count) {
+            // Uncomment the breakpoint below if you want to use a C debugger to figure out the C
+            // call stack for an allocation.
+            // asm("bkpt");
+            // Pause now because we may alert when throwing the exception too.
             common_hal_memorymonitor_allocationalarm_pause(alarm);
             alert_count++;
         }
@@ -71,3 +80,7 @@ void memorymonitor_allocationalarms_allocation(size_t block_count) {
         mp_raise_memorymonitor_AllocationError(translate("Attempt to allocate %d blocks"), block_count);
     }
 }
+
+void memorymonitor_allocationalarms_reset(void) {
+    MP_STATE_VM(active_allocationalarms) = NULL;
+}
diff --git a/shared-module/memorymonitor/AllocationAlarm.h b/shared-module/memorymonitor/AllocationAlarm.h
index ebdc0d801..95381c660 100644
--- a/shared-module/memorymonitor/AllocationAlarm.h
+++ b/shared-module/memorymonitor/AllocationAlarm.h
@@ -45,5 +45,6 @@ typedef struct _memorymonitor_allocationalarm_obj_t {
 } memorymonitor_allocationalarm_obj_t;
 
 void memorymonitor_allocationalarms_allocation(size_t block_count);
+void memorymonitor_allocationalarms_reset(void);
 
 #endif // MICROPY_INCLUDED_SHARED_MODULE_MEMORYMONITOR_ALLOCATIONALARM_H
diff --git a/shared-module/memorymonitor/AllocationSize.c b/shared-module/memorymonitor/AllocationSize.c
index fb11471fd..c28e65592 100644
--- a/shared-module/memorymonitor/AllocationSize.c
+++ b/shared-module/memorymonitor/AllocationSize.c
@@ -85,3 +85,7 @@ void memorymonitor_allocationsizes_track_allocation(size_t block_count) {
         as = as->next;
     }
 }
+
+void memorymonitor_allocationsizes_reset(void) {
+    MP_STATE_VM(active_allocationsizes) = NULL;
+}
diff --git a/shared-module/memorymonitor/AllocationSize.h b/shared-module/memorymonitor/AllocationSize.h
index 3fa4e0465..3baab2213 100644
--- a/shared-module/memorymonitor/AllocationSize.h
+++ b/shared-module/memorymonitor/AllocationSize.h
@@ -46,5 +46,6 @@ typedef struct _memorymonitor_allocationsize_obj_t {
 } memorymonitor_allocationsize_obj_t;
 
 void memorymonitor_allocationsizes_track_allocation(size_t block_count);
+void memorymonitor_allocationsizes_reset(void);
 
 #endif // MICROPY_INCLUDED_SHARED_MODULE_MEMORYMONITOR_ALLOCATIONSIZE_H
diff --git a/shared-module/memorymonitor/__init__.c b/shared-module/memorymonitor/__init__.c
index 4c24c2587..6cb424153 100644
--- a/shared-module/memorymonitor/__init__.c
+++ b/shared-module/memorymonitor/__init__.c
@@ -32,3 +32,8 @@ void memorymonitor_track_allocation(size_t block_count) {
     memorymonitor_allocationalarms_allocation(block_count);
     memorymonitor_allocationsizes_track_allocation(block_count);
 }
+
+void memorymonitor_reset(void) {
+    memorymonitor_allocationalarms_reset();
+    memorymonitor_allocationsizes_reset();
+}
diff --git a/shared-module/memorymonitor/__init__.h b/shared-module/memorymonitor/__init__.h
index cf76f88f8..f47f6434b 100644
--- a/shared-module/memorymonitor/__init__.h
+++ b/shared-module/memorymonitor/__init__.h
@@ -30,5 +30,6 @@
 #include <stddef.h>
 
 void memorymonitor_track_allocation(size_t block_count);
+void memorymonitor_reset(void);
 
 #endif  // MICROPY_INCLUDED_MEMORYMONITOR___INIT___H