Add toit_calloc and toit_realloc. (#2312)

include/toit/toit.h

@@ -245,6 +245,28 @@ toit_err_t toit_gc();
  */
 void* toit_malloc(size_t size);
 
+/**
+ * @brief A wrapper around `calloc` that calls `toit_gc` if `calloc` fails.
+ *
+ * If `calloc` fails, this function calls `toit_gc` and then retries the allocation.
+ *
+ * @param nmemb The number of elements to allocate.
+ * @param size The size of each element.
+ * @return void* A pointer to the allocated memory, or `NULL` if the allocation failed.
+ */
+void* toit_calloc(size_t nmemb, size_t size);
+
+/**
+ * @brief A wrapper around `realloc` that calls `toit_gc` if `realloc` fails.
+ *
+ * If `realloc` fails, this function calls `toit_gc` and then retries the allocation.
+ *
+ * @param ptr The pointer to the memory to reallocate.
+ * @param size The size of the memory to allocate.
+ * @return void* A pointer to the allocated memory, or `NULL` if the allocation failed.
+ */
+void* toit_realloc(void* ptr, size_t size);
+
 #ifdef __cplusplus
 }
 #endif

src/messaging.cc

@@ -1160,4 +1160,18 @@ void* toit_malloc(size_t size) {
   return malloc(size);
 }
 
+void* toit_calloc(size_t nmemb, size_t size) {
+  void* ptr = calloc(nmemb, size);
+  if (ptr != NULL) return ptr;
+  toit_gc();
+  return calloc(nmemb, size);
+}
+
+void* toit_realloc(void* ptr, size_t size) {
+  void* new_ptr = realloc(ptr, size);
+  if (new_ptr != NULL) return new_ptr;
+  toit_gc();
+  return realloc(ptr, size);
+}
+
 } // Extern C.