WIP. Renaming of all files related to malleability to start with MAM. No relevant changes

Codes/IOcodes/read_ini.c

@@ -3,7 +3,7 @@
 #include <string.h>
 #include "read_ini.h"
 #include "ini.h"
-#include "../malleability/malleabilityStates.h"
+#include "../malleability/MAM.h"
 
 
 ext_functions_t *user_functions;

Codes/Main/Main.c

@@ -8,7 +8,7 @@
 #include "Main_datatypes.h"
 #include "configuration.h"
 #include "../IOcodes/results.h"
-#include "../malleability/CommDist.h"
+#include "../malleability/distribution_methods/Distributed_CommDist.h"
 #include "../malleability/MAM.h"
 
 #define DR_MAX_SIZE 1000000000

Codes/malleability/MAM.h

 #ifndef MAM_H
 #define MAM_H
 
-#include "malleabilityStates.h"
-#include "malleabilityManager.h"
+#include "MAM_Constants.h"
+#include "MAM_Manager.h"
 #include "MAM_Configuration.h"
 
 #endif

Codes/malleability/MAM_Configuration.c

 #include "MAM_Configuration.h"
 #include "MAM_Init_Configuration.h"
-#include "malleabilityDataStructures.h"
+#include "MAM_DataStructures.h"
 #include <limits.h>
 
 typedef struct {

Codes/malleability/MAM_Configuration.h

@@ -2,7 +2,7 @@
 #define MAM_CONFIGURATION_H
 
 #include <mpi.h>
-#include "malleabilityStates.h"
+#include "MAM_Constants.h"
 
 #define MAM_STRAT_CLEAR_VALUE 0
 

Codes/malleability/malleabilityStates.h → Codes/malleability/MAM_Constants.h

-#ifndef MALLEABILITY_STATES_H
-#define MALLEABILITY_STATES_H
-
-#include <stdio.h>
-#include <stdlib.h>
+#ifndef MAM_CONSTANTS_H
+#define MAM_CONSTANTS_H
 
 //States
 #define MALL_DENIED -1
 #define MAM_OK 0
-enum mall_inner_states{MALL_UNRESERVED, MALL_NOT_STARTED, MALL_RMS_COMPLETED, MALL_SPAWN_PENDING, MALL_SPAWN_SINGLE_PENDING, 
-	MALL_SPAWN_SINGLE_COMPLETED, MALL_SPAWN_ADAPT_POSTPONE, MALL_SPAWN_COMPLETED, MALL_DIST_PENDING, MALL_DIST_COMPLETED, 
-	MALL_SPAWN_ADAPT_PENDING, MALL_USER_START, MALL_USER_PENDING, MALL_USER_COMPLETED, MALL_SPAWN_ADAPTED, MALL_COMPLETED};
+
 enum mam_states{MAM_UNRESERVED, MAM_NOT_STARTED, MAM_PENDING, MAM_USER_PENDING, MAM_COMPLETED};
 enum mam_proc_states{MAM_PROC_CONTINUE, MAM_PROC_NEW_RANK, MAM_PROC_ZOMBIE};
 
-
 enum mall_spawn_methods{MALL_SPAWN_BASELINE, MALL_SPAWN_MERGE, MAM_METHODS_SPAWN_LEN};
 enum mam_spawn_strategies{MAM_STRAT_SPAWN_CLEAR, MAM_STRAT_SPAWN_PTHREAD, MAM_STRAT_SPAWN_SINGLE, MAM_STRAT_SPAWN_INTERCOMM, MAM_STRAT_SPAWN_MULTIPLE, MAM_STRATS_SPAWN_LEN};
 

Codes/malleability/malleabilityDataStructures.c → Codes/malleability/MAM_DataStructures.c

-#include "malleabilityDataStructures.h"
+#include "MAM_DataStructures.h"
 
 malleability_config_t *mall_conf = NULL;
 malleability_t *mall = NULL;

Codes/malleability/malleabilityDataStructures.h → Codes/malleability/MAM_DataStructures.h

-#ifndef MALLEABILITY_DATA_STRUCTURES_H
-#define MALLEABILITY_DATA_STRUCTURES_H
+#ifndef MAM_DATA_STRUCTURES_H
+#define MAM_DATA_STRUCTURES_H
 
 /*
  * Shows available data structures for inner ussage.
@@ -8,10 +8,15 @@
 #include <stdio.h>
 #include <mpi.h>
 #include <pthread.h>
-#include "malleabilityStates.h"
+#include "MAM_Constants.h"
 
 #define DEBUG_FUNC(debug_string, rank, numP) printf("MaM [P%d/%d]: %s -- %s:%s:%d\n", rank, numP, debug_string, __FILE__, __func__, __LINE__)
 
+/* --- MAM REAL STATES --- */
+enum mam_inner_states{MALL_UNRESERVED, MALL_NOT_STARTED, MALL_RMS_COMPLETED, MALL_SPAWN_PENDING, MALL_SPAWN_SINGLE_PENDING, 
+	MALL_SPAWN_SINGLE_COMPLETED, MALL_SPAWN_ADAPT_POSTPONE, MALL_SPAWN_COMPLETED, MALL_DIST_PENDING, MALL_DIST_COMPLETED, 
+	MALL_SPAWN_ADAPT_PENDING, MALL_USER_START, MALL_USER_PENDING, MALL_USER_COMPLETED, MALL_SPAWN_ADAPTED, MALL_COMPLETED};
+
 /* --- TIME CAPTURE STRUCTURE --- */
 typedef struct {
   // Spawn, Sync and Async time

Codes/malleability/MAM_Init_Configuration.h

@@ -2,7 +2,7 @@
 #define MAM_INIT_CONFIGURATION_H
 
 #include <mpi.h>
-#include "malleabilityStates.h"
+#include "MAM_Constants.h"
 
 void MAM_Init_configuration();
 void MAM_Set_initial_configuration();

Codes/malleability/malleabilityManager.c → Codes/malleability/MAM_Manager.c

 #include <pthread.h>
 #include <string.h>
-//#include "malleabilityManager.h"
 #include "MAM.h"
-#include "malleabilityStates.h"
-#include "malleabilityDataStructures.h"
-#include "malleabilityTypes.h"
-#include "malleabilityZombies.h"
-#include "malleabilityTimes.h"
-#include "malleabilityRMS.h"
+#include "MAM_Constants.h"
+#include "MAM_DataStructures.h"
+#include "MAM_Types.h"
+#include "MAM_Zombies.h"
+#include "MAM_Times.h"
+#include "MAM_RMS.h"
 #include "MAM_Init_Configuration.h"
 #include "spawn_methods/GenericSpawn.h"
-#include "CommDist.h"
+#include "distribution_methods/Distributed_CommDist.h"
 
 #define MALLEABILITY_USE_SYNCHRONOUS 0
 #define MALLEABILITY_USE_ASYNCHRONOUS 1

Codes/malleability/malleabilityManager.h → Codes/malleability/MAM_Manager.h

-#ifndef MALLEABILITY_MANAGER_H
-#define MALLEABILITY_MANAGER_H
+#ifndef MAM_MANAGER_H
+#define MAM_MANAGER_H
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -7,7 +7,6 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <mpi.h>
-#include "malleabilityStates.h"
 
 typedef struct {
   int numS, numT;

Codes/malleability/malleabilityRMS.c → Codes/malleability/MAM_RMS.c

@@ -5,8 +5,8 @@
 #include <unistd.h>
 #include <sched.h>
 #include <mpi.h>
-#include "malleabilityRMS.h"
-#include "malleabilityDataStructures.h"
+#include "MAM_RMS.h"
+#include "MAM_DataStructures.h"
 
 
 #if USE_MAL_SLURM

Codes/malleability/malleabilityRMS.h → Codes/malleability/MAM_RMS.h

-#ifndef MALLEABILITY_RMS_H
-#define MALLEABILITY_RMS_H
+#ifndef MAM_RMS_H
+#define MAM_RMS_H
 
 void MAM_check_hosts();
 int MAM_Is_internode_group();

Codes/malleability/malleabilityTimes.c → Codes/malleability/MAM_Times.c

-#include "malleabilityTimes.h"
-#include "malleabilityDataStructures.h"
+#include "MAM_Times.h"
+#include "MAM_DataStructures.h"
 
 void def_malleability_times(MPI_Datatype *new_type);
 

Codes/malleability/malleabilityTimes.h → Codes/malleability/MAM_Times.h

-#ifndef MALLEABILITY_TIMES_H
-#define MALLEABILITY_TIMES_H
+#ifndef MAM_TIMES_H
+#define MAM_TIMES_H
 
 #include <mpi.h>
 

Codes/malleability/malleabilityTypes.c → Codes/malleability/MAM_Types.c

-#include "malleabilityTypes.h"
-#include "malleabilityDataStructures.h"
+#include "MAM_Types.h"
+#include "MAM_DataStructures.h"
 #include "MAM_Configuration.h"
 
 

Codes/malleability/malleabilityTypes.h → Codes/malleability/MAM_Types.h

-#ifndef MALLEABILITY_TYPES_H
-#define MALLEABILITY_TYPES_H
+#ifndef MAM_TYPES_H
+#define MAM_TYPES_H
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <mpi.h>
 #include <fcntl.h>
 #include <sys/stat.h>
-#include "malleabilityStates.h"
+#include "MAM_Constants.h"
 
 #define MALLEABILITY_INIT_DATA_QTY 100
 

Codes/malleability/malleabilityZombies.c → Codes/malleability/MAM_Zombies.c

@@ -5,7 +5,8 @@
 #include <unistd.h>
 #include <mpi.h>
 #include <signal.h>
-#include "malleabilityZombies.h"
+#include "MAM_Zombies.h"
+#include "MAM_DataStructures.h"
 
 #define PIDS_QTY 320
 //TODO Add option to allow the usage of signal USR2 or not.

Codes/malleability/MAM_Zombies.h

+#ifndef MAM_ZOMBIES_H
+#define MAM_ZOMBIES_H
+
+void MAM_Zombies_service_init();
+int MAM_Zombies_service_free();
+void MAM_Zombies_update();
+
+#endif

Codes/malleability/CommDist.c → Codes/malleability/distribution_methods/Distributed_CommDist.c

@@ -2,10 +2,11 @@
 #include <stdlib.h>
 #include <mpi.h>
 #include <string.h>
-#include "distribution_methods/block_distribution.h"
-#include "CommDist.h"
-#include "MAM_Configuration.h"
-#include "malleabilityDataStructures.h"
+#include "block_distribution.h"
+#include "Distributed_CommDist.h"
+#include "../MAM_Constants.h"
+#include "../MAM_Configuration.h"
+#include "../MAM_DataStructures.h"
 
 void prepare_redistribution(int qty, MPI_Datatype datatype, int numP, int numO, int is_children_group, void **recv, struct Counts *s_counts, struct Counts *r_counts);
 void check_requests(struct Counts s_counts, struct Counts r_counts, MPI_Request **requests, size_t *request_qty);