dynamically-loading collfs working on BG/P

Author: ahmadia

Makefile

@@ -7,7 +7,7 @@ MPICC = mpicc
 CFLAGS = -std=c99 -fPIC -Wall -Wextra ${CFLAGS_DEBUG} -D_LARGEFILE64_SOURCE
 CFLAGS_DEBUG = -g3 -DDEBUG=1
 #LDFLAGS =  -Wl,-Bdynamic -Wl,-rpath,/home/aron/sys/lib -L/home/aron/sys/lib ${LIBDL} 
-LDFLAGS = -dynamic -Wl,-Bdynamic -Wl,-rpath,/home/aron/bgpsys/lib -L/home/aron/bgsys/lib ${LIBDL} 
+LDFLAGS = -dynamic -Wl,-Bdynamic -Wl,-rpath,/home/aron/bgpsys/lib -L/home/aron/bgpsys/lib ${LIBDL} 
 LIBDL = -ldl 
 COLLFS_SRC_C = collfs.c
 COLLFS_SRC_O = $(COLLFS_SRC_C:.c=.o)
@@ -23,7 +23,8 @@ libthefunc.so : thefunc.o
 thefunc.o : thefunc.c
 	${CC} ${CFLAGS} -c -fPIC $^
 
-main : main.o libfoo.so libcollfs.so libc-collfs.so
+main : main.o libfoo.so libcollfs.so 
+#main : main.o libfoo.so libcollfs.so libc-collfs.so
 	${MPICC} -g3 -o $@ $^ ${LDFLAGS} 
 .c.o :
 	${CC} ${CFLAGS} -fPIC -c $^

glibc-2.4-bgp-patches/elf/Versions

@@ -24,6 +24,8 @@ libc {
     _dl_open_hook;
     __libc_dlopen_mode; __libc_dlsym; __libc_dlclose;
     libc_collfs_finalize; libc_collfs_initialize;
+    __collfs_mmap; __collfs_lseek; __collfs_xstat64; __collfs_read; 
+    __collfs_open; __collfs_munmap; __collfs_close; __collfs_fxstat64;
   }
 }
 

glibc-2.4-bgp-patches/elf/dl-close.c

@@ -33,7 +33,9 @@
 #ifndef IS_IN_rtld
 int __collfs_munmap(__ptr_t addr, size_t len);
 #undef DL_UNMAP
-#define DL_UNMAP(map) __collfs_unmap (map)
+# define DL_UNMAP(map) \
+ __collfs_munmap ((void *) (map)->l_map_start,					      \
+	   (map)->l_map_end - (map)->l_map_start)
 #endif
 
 /* Type of the constructor functions.  */

glibc-2.4-bgp-patches/elf/dl-libc.c

@@ -21,7 +21,6 @@
 #include <dlfcn.h>
 #include <stdlib.h>
 #include <ldsodefs.h>
-
 #include "libc-collfs.h"
 #include "libc-collfs-private.h"
 #include <stdarg.h>
@@ -311,6 +310,7 @@ int libc_collfs_initialize(collfs_debug_vprintf_fp vprintf_, const struct libc_c
   return 0;
 }
 
+
 /* Disable collfs redirect. */
 int libc_collfs_finalize(void)
 {

main.c

@@ -48,10 +48,10 @@ int main(int argc, char *argv[])
     MPI_Init(&argc,&argv);
   }
   if (!getcwd(path,sizeof path)) ERR("getcwd failed");
-  /* strcat(path,"/libthefunc.so"); */
-  /* err = run_tests(path, path);CHK(err); */
-  /* err = foo(path);CHK(err); */
-  /* err = foo2("alphabet.txt");CHK(err); */
+  strcat(path,"/libthefunc.so");
+  err = run_tests(path, path);CHK(err);
+  err = foo(path);CHK(err);
+  err = foo2("alphabet.txt");CHK(err);
   if (MPI_Finalize) MPI_Finalize();
   return 0;
 }