Virtual id refactoring

mpi-proxy-split/Makefile

@@ -30,7 +30,7 @@ WRAPPERS_SRCDIR=mpi-wrappers
 # As you add new files to your plugin library, add the object file names here.
 
 LIBOBJS = mpi_plugin.o p2p_drain_send_recv.o p2p_log_replay.o \
-          record-replay.o seq_num.o \
+          seq_num.o virtual-ids.o \
           split_process.o ${LOWER_HALF_SRCDIR}/procmapsutils.o
 
 #MANA_COORD_OBJS = mana_coordinator.o
@@ -67,8 +67,18 @@ libmana.so: ${LIBOBJS} ${WRAPPERS_SRCDIR}/libmpiwrappers.a
 	${CXX} -shared -fPIC -g3 -O0 -o $@ ${LIBOBJS} -Wl,--whole-archive ${WRAPPERS_SRCDIR}/libmpiwrappers.a -Wl,--no-whole-archive
 
 mpi_unimplemented_wrappers.cpp: generate-mpi-unimplemented-wrappers.py \
-                                mpi_unimplemented_wrappers.txt
-	python $^ > $@
+	mpi_unimplemented_wrappers_mpich.txt \ 
+	mpi_unimplemented_wrappers_openmpi.txt \ 
+	mpi_unimplemented_wrappers_exampi.txt
+	if mpiexec -h | grep -q 'mpich'; then
+	  python generate-mpi-unimplemented-wrappers.py mpi_unimplemented_wrappers_mpich.txt > $@
+	elif mpixec -h | grep -q 'open-mpi'; then
+	  python generate-mpi-unimplemented-wrappers.py mpi_unimplemented_wrappers_openmpi.txt > $@
+	elif mpiexec -h | grep -q 'ExaMPI'; then
+	  python generate-mpi-unimplemented-wrappers.py mpi_unimplemented_wrappers_exampi.txt > $@
+	else
+	  $(error The MPI flavor could not be identified.)
+	fi
 
 .c.o:
 	${MPICC} ${CFLAGS} -c -o $@ $<

mpi-proxy-split/lower-half/libproxy.c

@@ -68,8 +68,29 @@ static void* MPI_Fnc_Ptrs[] = {
   NULL,
 };
 
+#define INIT_CONST_MAP(const) mpi_constants[LH_MPI_##const] = MPI_##const;
+
+static int mpi_constants_initialized = 0;
+static void* mpi_constants[LH_MPI_Constant_Invalid + 1];
 // Local functions
 
+void*
+get_lh_mpi_constant(enum MPI_Constants constant)
+{
+  if (!mpi_constants_initialized) {
+    mpi_constants[LH_MPI_Constant_NULL] = NULL;
+    FOREACH_CONSTANT(INIT_CONST_MAP)
+    mpi_constants[LH_MPI_ERRORS_RETURN] = 0;
+    mpi_constants[LH_MPI_Constant_Invalid] = NULL;
+    mpi_constants_initialized = 1;
+  }
+  if (constant < LH_MPI_Constant_NULL ||
+      constant > LH_MPI_Constant_Invalid) {
+    return NULL;
+  }
+  return mpi_constants[constant];
+}
+
 LhCoreRegions_t*
 getLhRegionsList(int *num)
 {
@@ -346,6 +367,7 @@ void first_constructor()
     lh_info.g_appContext = (void*)&g_appContext;
     lh_info.lh_dlsym = (void*)&mydlsym;
     lh_info.getRankFptr = (void*)&getRank;
+    lh_info.lh_mpi_constants = (void*)&get_lh_mpi_constant;
 
 #ifdef SINGLE_CART_REORDER
     lh_info.getCoordinatesFptr = (void*)&getCoordinates;