From 5f6325a8d3aa866a2888488c8cb0c9852c272bba Mon Sep 17 00:00:00 2001
From: Zain K Aamer <ZippeyKeys12@gmail.com>
Date: Fri, 30 Aug 2024 12:02:07 -0400
Subject: [PATCH] [CN-Exec] Minor changes to runtime library to accomodate
 testing (#542)

* [CN-Exec] Runtime library include guards

* [CN-Exec] C++ header compatibility

* [CN-Exec] Allow setting exit callback

* [CN-Exec] Make `cn_exit` static
---
 runtime/libcn/include/cn-executable/alloc.h      | 13 +++++++++++++
 runtime/libcn/include/cn-executable/hash_table.h | 13 +++++++++++++
 runtime/libcn/include/cn-executable/utils.h      | 10 ++++++++++
 runtime/libcn/src/utils.c                        | 10 +++++++++-
 4 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/runtime/libcn/include/cn-executable/alloc.h b/runtime/libcn/include/cn-executable/alloc.h
index 7402c2783..a6f80cb38 100644
--- a/runtime/libcn/include/cn-executable/alloc.h
+++ b/runtime/libcn/include/cn-executable/alloc.h
@@ -1,3 +1,10 @@
+#ifndef CN_ALLOC
+#define CN_ALLOC
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 // enum CNTYPE {
 //     NODE_CN,
 //     SEQ,
@@ -16,3 +23,9 @@ void *alloc_(long nbytes, const char *, int);
 
 
 // void *alloc_zeros(long nbytes);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // CN_ALLOC
diff --git a/runtime/libcn/include/cn-executable/hash_table.h b/runtime/libcn/include/cn-executable/hash_table.h
index 8b3fd45d1..8762943d3 100644
--- a/runtime/libcn/include/cn-executable/hash_table.h
+++ b/runtime/libcn/include/cn-executable/hash_table.h
@@ -1,3 +1,6 @@
+#ifndef CN_HASH_TABLE
+#define CN_HASH_TABLE
+
 /*
 
 MIT License
@@ -27,6 +30,10 @@ SOFTWARE.
 #include <stdbool.h>
 #include <cn-executable/alloc.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 // Hash table entry (slot may be filled or empty).
 typedef struct {
     signed long *key;  // key is NULL if this slot is empty
@@ -65,3 +72,9 @@ typedef struct {
 hash_table_iterator ht_iterator(hash_table* table);
 
 _Bool ht_next(hash_table_iterator* it);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif // CN_HASH_TABLE
diff --git a/runtime/libcn/include/cn-executable/utils.h b/runtime/libcn/include/cn-executable/utils.h
index db8259343..41baa0dab 100644
--- a/runtime/libcn/include/cn-executable/utils.h
+++ b/runtime/libcn/include/cn-executable/utils.h
@@ -12,6 +12,9 @@
 #include <cn-executable/alloc.h>
 #include <cn-executable/hash_table.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 struct cn_error_message_info {
     const char *function_name;
@@ -109,6 +112,9 @@ void cn_free_sized(void*, size_t len);
 void cn_print_nr_u64(int i, unsigned long u) ;
 void cn_print_u64(const char *str, unsigned long u) ;
 
+/* cn_exit callbacks */
+void set_cn_exit_cb(void (*callback)(void));
+void reset_cn_exit_cb(void);
 
 /* Conversion functions */
 
@@ -559,4 +565,8 @@ static inline void cn_postfix(void *ptr, size_t size)
     (*__tmp) OP;                                              \
  })
 
+#ifdef __cplusplus
+}
 #endif
+
+#endif // CN_UTILS
diff --git a/runtime/libcn/src/utils.c b/runtime/libcn/src/utils.c
index f39340380..c641866f6 100644
--- a/runtime/libcn/src/utils.c
+++ b/runtime/libcn/src/utils.c
@@ -14,7 +14,15 @@ void cn_exit_aux(void) {
     exit(SIGABRT);
 }
 
-void (*cn_exit)(void) = &cn_exit_aux;
+void static (*cn_exit)(void) = &cn_exit_aux;
+
+void set_cn_exit_cb(void (*callback)(void)) {
+    cn_exit = callback;
+}
+
+void reset_cn_exit_cb(void) {
+    cn_exit = &cn_exit_aux;
+}
 
 void print_error_msg_info(void) {
   printf("Function: %s, %s:%d\n", error_msg_info.function_name, error_msg_info.file_name, error_msg_info.line_number);