Initial conversion to C++

Author: Matthew-Whitlock

.gitignore

@@ -41,6 +41,7 @@ test/request_tracking/fenix_request_tracking_test
 test/request_tracking/fenix_request_tracking_test_nofenix
 build/
 install/
+spack-*
 
 # Other
 *~

CMakeLists.txt

@@ -10,7 +10,7 @@
 
 cmake_minimum_required(VERSION 3.10.2)
 
-project(Fenix C)
+project(Fenix C CXX)
 # The version number.
 set(FENIX_VERSION_MAJOR 1)
 set(FENIX_VERSION_MINOR 0)

src/CMakeLists.txt

@@ -15,25 +15,25 @@ configure_file (${CMAKE_SOURCE_DIR}/include/fenix-config.h.in
 FILE(GLOB Fenix_HEADERS ${CMAKE_SOURCE_DIR}/include/*.h)
 
 set (Fenix_SOURCES 
-fenix.c
-fenix_mpi_override.c
-fenix_opt.c
-fenix_process_recovery.c
-fenix_util.c
-fenix_data_recovery.c
-fenix_data_group.c
-fenix_data_policy.c
-fenix_data_policy_in_memory_raid.c
-fenix_data_member.c
-fenix_data_subset.c
-fenix_comm_list.c
-fenix_callbacks.c
-globals.c
+fenix.cpp
+fenix_mpi_override.cpp
+fenix_opt.cpp
+fenix_process_recovery.cpp
+fenix_util.cpp
+fenix_data_recovery.cpp
+fenix_data_group.cpp
+fenix_data_policy.cpp
+fenix_data_policy_in_memory_raid.cpp
+fenix_data_member.cpp
+fenix_data_subset.cpp
+fenix_comm_list.cpp
+fenix_callbacks.cpp
+globals.cpp
 )
 
 add_library( fenix STATIC ${Fenix_SOURCES})
 
-target_link_libraries(fenix PUBLIC MPI::MPI_C)
+target_link_libraries(fenix PUBLIC MPI::MPI_CXX)
 
 target_include_directories(fenix 
     PUBLIC  

src/fenix.c renamed to src/fenix.cpp

@@ -91,7 +91,7 @@ int Fenix_Data_member_create( int group_id, int member_id, void *buffer, int cou
 }
 
 int Fenix_Data_group_get_redundancy_policy( int group_id, int* policy_name, void *policy_value, int *flag ) {
-    return __fenix_group_get_redundancy_policy( group_id, policy_name, policy_value, flag );
+    return __fenix_group_get_redundancy_policy( group_id, policy_name, (int*)policy_value, flag );
 }
 
 int Fenix_Data_wait(Fenix_Request request) {

src/fenix_callbacks.c renamed to src/fenix_callbacks.cpp

@@ -70,7 +70,7 @@ int __fenix_callback_register(void (*recover)(MPI_Comm, int, void *), void *call
 {
     int error_code = FENIX_SUCCESS;
     if (fenix.fenix_init_flag) {
-        fenix_callback_func *fp = s_malloc(sizeof(fenix_callback_func));
+        fenix_callback_func *fp = (fenix_callback_func *) s_malloc(sizeof(fenix_callback_func));
         fp->x = recover;
         fp->y = callback_data;
         __fenix_callback_push( &fenix.callback_list, fp);
@@ -105,7 +105,7 @@ void __fenix_callback_invoke_all(int error)
 
 void __fenix_callback_push(fenix_callback_list_t **head, fenix_callback_func *fp)
 {
-    fenix_callback_list_t *callback = malloc(sizeof(fenix_callback_list_t));
+    fenix_callback_list_t *callback = (fenix_callback_list_t *) malloc(sizeof(fenix_callback_list_t));
     callback->callback = fp;
     callback->next = *head;
     *head = callback;

src/fenix_comm_list.c renamed to src/fenix_comm_list.cpp

@@ -123,11 +123,11 @@ void __fenix_comm_list_destroy(void) {
   else {
     fenix_comm_list_elm_t *current = my_list.tail;
     while (current->next) {
-      fenix_comm_list_elm_t *new = current->next;
+      fenix_comm_list_elm_t *next = current->next;
       MPIX_Comm_revoke(*current->comm);
       PMPI_Comm_free(current->comm);
       free(current);
-      current = new;
+      current = next;
     }
     MPIX_Comm_revoke(*current->comm);
     PMPI_Comm_free(current->comm);

src/fenix_data_group.c renamed to src/fenix_data_group.cpp

@@ -846,7 +846,7 @@ int __imr_member_restore(fenix_group_t* g, int member_id,
       if(recovery_locally_possible) retval = FENIX_SUCCESS;
 
    } else if (group->raid_mode == 5){
-      int* set_results = malloc(sizeof(int) * group->set_size);
+      int* set_results = (int *) malloc(sizeof(int) * group->set_size);
       MPI_Allgather((void*)&found_member, 1, MPI_INT, (void*)set_results, 1, MPI_INT, 
           group->set_comm);