Expand c++ API parity, dedup

Author: Matthew-Whitlock

include/fenix.hpp

@@ -110,6 +110,24 @@ void init(const Args::FenixInitArgs args);
 //!@brief Throw an exception for the most recent fault. Helpful for spares.
 void throw_exception();
 
+//!@brief Overload of #Fenix_get_role
+Fenix_Rank_role role();
+
+//!@brief Overload of #Fenix_get_error
+int error();
+
+//!@brief Overload of #Fenix_Callback_register
+int callback_register(std::function<void(MPI_Comm, int)> callback);
+
+//@!brief Overload of #Fenix_Callback_pop
+int callback_pop();
+
+//!@brief Overload of #Fenix_Process_detect_failures
+int detect_failures(bool recover = true);
+
+//!@brief Overload of #Fenix_Initialized that directly returns true if initialized
+bool initialized();
+
 } // namespace Fenix
 
 namespace Fenix::Data {
@@ -118,6 +136,17 @@ extern const DataSubset SUBSET_FULL;
 extern const DataSubset SUBSET_EMPTY;
 extern DataSubset SUBSET_IGNORE;
 
+//@!brief Overload of Fenix_Data_group_create
+int group_create(
+    int group_id, MPI_Comm comm, int start_time_stamp, int depth,
+    int policy_name, void* policy_value, int* flag
+);
+
+//@!brief Overload of Fenix_Data_member_create
+int member_create(
+    int group_id, int member_id, void* buffer, int count, MPI_Datatype datatype
+);
+
 //!@brief Overload of #Fenix_Data_member_store
 int member_store(int group_id, int member_id, const DataSubset& subset);
 
@@ -148,6 +177,21 @@ int member_lrestore(
     int time_stamp, DataSubset& data_found
 );
 
+//@!brief overload of #Fenix_Data_commit
+int commit(int group_id, int* time_stamp = nullptr);
+
+//@!brief overload of #Fenix_Data_commit
+int commit_barrier(int group_id, int* time_stamp = nullptr);
+
+//@!brief Overload of #Fenix_Data_snapshot_delete
+int snapshot_delete(int group_id, int timestamp);
+
+//@!brief overload of Fenix_Data_group_delete
+int group_delete(int group_id);
+
+//@!brief overload of Fenix_Data_member_delete
+int member_delete(int group_id, int member_id);
+
 } // namespace Fenix::Data
 
 #endif

include/fenix_data_group.hpp

@@ -125,10 +125,6 @@ typedef struct __group_entry_packet {
 
 fenix_data_recovery_t * __fenix_data_recovery_init();
 
-int __fenix_group_delete(int groupid);
-
-int __fenix_member_delete(int groupid, int memberid);
-
 void __fenix_data_recovery_destroy( fenix_data_recovery_t *fx_data_recovery );
 
 void __fenix_data_recovery_reinit( fenix_data_recovery_t *dr, fenix_two_container_packet_t packet);

include/fenix_data_recovery.hpp

@@ -98,34 +98,17 @@ typedef struct __data_entry_packet {
 } fenix_data_entry_packet_t;
 
 
-int __fenix_group_create(int, MPI_Comm, int, int, int, void*, int*);
 int __fenix_group_get_redundancy_policy(int, int*, int*, int*);
-int __fenix_member_create(int, int, void *, int, int);
 int __fenix_data_wait(Fenix_Request);
 int __fenix_data_test(Fenix_Request, int *);
-int __fenix_member_store(int, int, const DataSubset&);
-int __fenix_member_storev(int, int, const DataSubset&);
-int __fenix_member_istore(int, int, const DataSubset&, Fenix_Request *);
-int __fenix_member_istorev(int, int, const DataSubset&, Fenix_Request *);
-int __fenix_data_commit(int, int *);
-int __fenix_data_commit_barrier(int, int *);
 int __fenix_data_barrier(int);
-int __fenix_member_restore(int, int, void *, int, int, DataSubset&);
-int __fenix_member_lrestore(int, int, void *, int, int, DataSubset&);
 int __fenix_member_restore_from_rank(int, int, void *, int, int, int);
 int __fenix_get_number_of_members(int, int *);
 int __fenix_get_member_at_position(int, int *, int);
 int __fenix_get_number_of_snapshots(int, int *);
 int __fenix_get_snapshot_at_position(int, int, int *);
 int __fenix_member_get_attribute(int, int, int, void *, int *, int);
 int __fenix_member_set_attribute(int, int, int, void *, int *);
-int __fenix_snapshot_delete(int groupid, int timestamp);
-
-int __fenix_group_delete(int);
-int __fenix_member_delete(int, int);
-
-void __fenix_init_data_recovery();
-void __fenix_init_partner_copy_recovery();
 
 }
 

src/CMakeLists.txt

@@ -26,7 +26,7 @@ set (Fenix_SOURCES
     fenix_data_member.cpp
     fenix_data_subset.cpp
     fenix_callbacks.cpp
-    globals.cpp
+    fenix_ext.cpp
 )
 
 add_library(fenix STATIC ${Fenix_SOURCES})

src/fenix.cpp

@@ -98,13 +98,17 @@ int Fenix_Finalize() {
     return FENIX_SUCCESS;
 }
 
-int Fenix_Data_group_create( int group_id, MPI_Comm comm, int start_time_stamp, int depth, int policy_name, 
-        void* policy_value, int* flag) {
-    return __fenix_group_create(group_id, comm, start_time_stamp, depth, policy_name, policy_value, flag);
+int Fenix_Data_group_create(
+    int group_id, MPI_Comm comm, int start_time_stamp, int depth, int policy,
+    void* policy_args, int* flag
+) {
+    return group_create(
+        group_id, comm, start_time_stamp, depth, policy, policy_args, flag
+    );
 }
 
 int Fenix_Data_member_create( int group_id, int member_id, void *buffer, int count, MPI_Datatype datatype ) {
-    return __fenix_member_create(group_id, member_id, buffer, count, __fenix_get_size(datatype));
+    return member_create(group_id, member_id, buffer, count, datatype);
 }
 
 int Fenix_Data_group_get_redundancy_policy( int group_id, int* policy_name, void *policy_value, int *flag ) {
@@ -136,11 +140,11 @@ int Fenix_Data_member_istorev(int group_id, int member_id, const Fenix_Data_subs
 }
 
 int Fenix_Data_commit(int group_id, int *time_stamp) {
-    return __fenix_data_commit(group_id, time_stamp);
+    return commit(group_id, time_stamp);
 }
 
 int Fenix_Data_commit_barrier(int group_id, int *time_stamp) {
-    return __fenix_data_commit_barrier(group_id, time_stamp);
+    return commit_barrier(group_id, time_stamp);
 }
 
 int Fenix_Data_barrier(int group_id) {
@@ -214,15 +218,15 @@ int Fenix_Data_member_attr_set(int group_id, int member_id, int attribute_name,
 }
 
 int Fenix_Data_snapshot_delete(int group_id, int time_stamp) {
-    return __fenix_snapshot_delete(group_id, time_stamp);
+    return snapshot_delete(group_id, time_stamp);
 }
 
 int Fenix_Data_group_delete(int group_id) {
-    return __fenix_group_delete(group_id);
+    return group_delete(group_id);
 }
 
 int Fenix_Data_member_delete(int group_id, int member_id) {
-    return __fenix_member_delete(group_id, member_id);
+    return member_delete(group_id, member_id);
 }
 
 int Fenix_Process_fail_list(int** fail_list){
@@ -250,11 +254,11 @@ int Fenix_Process_detect_failures(int do_recovery){
 }
 
 Fenix_Rank_role Fenix_get_role(){
-    return (Fenix_Rank_role) fenix.role;
+    return role();
 }
 
 int Fenix_get_error(){
-    return fenix.repair_result;
+    return error();
 }
 
 namespace Fenix {
@@ -270,49 +274,28 @@ void throw_exception(){
     throw CommException(*fenix.user_world, *fenix.ret_error);
 }
 
-} // namespace Fenix
-
-namespace Fenix::Data {
-
-int member_store(int group_id, int member_id, const DataSubset& subset){
-    return __fenix_member_store(group_id, member_id, subset);
+Fenix_Rank_role role(){
+    return (Fenix_Rank_role) fenix.role;
 }
 
-int member_storev(int group_id, int member_id, const DataSubset& subset){
-    return __fenix_member_storev(group_id, member_id, subset);
+int error(){
+    return fenix.repair_result;
 }
 
-int member_istore(
-    int group_id, int member_id, const DataSubset& subset,
-    Fenix_Request *request
-){
-    fatal_print("unimplemented");
-    return 0;
+int callback_register(std::function<void(MPI_Comm, int)> callback){
+    return __fenix_callback_register(callback);
 }
 
-int member_istorev(
-    int group_id, int member_id, const DataSubset& subset,
-    Fenix_Request *request
-){
-    fatal_print("unimplemented");
-    return 0;
+int callback_pop() {
+    return __fenix_callback_pop();
 }
 
-int member_restore(
-    int group_id, int member_id, void *target_buffer, int max_count,
-    int time_stamp, DataSubset& data_found
-) {
-    data_found = {};
-    return __fenix_member_restore(group_id, member_id, target_buffer, max_count, time_stamp, data_found);
+int detect_failures(bool recover){
+    return __fenix_detect_failures(recover);
 }
 
-int member_lrestore(
-    int group_id, int member_id, void *target_buffer, int max_count,
-    int time_stamp, DataSubset& data_found
-) {
-    data_found = {};
-    return __fenix_member_lrestore(group_id, member_id, target_buffer, max_count, time_stamp, data_found);
+bool initialized(){
+    return fenix.fenix_init_flag;
 }
 
-} // namespace Fenix::Data
-
+} // namespace Fenix

src/fenix_data_group.cpp

@@ -110,7 +110,7 @@ fenix_data_recovery_t * __fenix_data_recovery_init() {
   return data_recovery;
 }
 
-int __fenix_member_delete(int groupid, int memberid) {
+int member_delete(int groupid, int memberid) {
   auto [group_index, group] = find_group(groupid);
   if(!group) return FENIX_ERROR_INVALID_GROUPID;
 
@@ -173,7 +173,7 @@ int __fenix_data_recovery_remove_group(int group_index){
  * @brief
  * @param group_id
  */
-int __fenix_group_delete(int groupid) {
+int group_delete(int groupid) {
   auto [group_index, group] = find_group(groupid);
   if(!group) return FENIX_ERROR_INVALID_GROUPID;
 

src/fenix_data_policy_in_memory_raid.cpp

@@ -849,10 +849,10 @@ int Group::member_restore(
       );
 
       if(!found_members[set_rank]){
-         __fenix_member_create(
-            groupid, packet.memberid, target_buffer, packet.current_count,
+         this->member_create(__fenix_data_member_add_entry(
+            this, packet.memberid, target_buffer, packet.current_count,
             packet.datatype_size
-         );
+         ));
          member = find_member(member_id);
          assert(member);
       }