portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-03 18:55:56 +01:00
Code Releases Activity

SHM complete

Browse Source
This commit is contained in:
Peter Boyle 2017-09-05 14:30:29 +01:00
parent 837bf8a5be
commit bf973d0d56
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/communicator/Communicator_mpi3.cc
View File

@ -207,6 +207,8 @@ void CartesianCommunicator::Init(int *argc, char ***argv) {
size_t size = CartesianCommunicator::MAX_MPI_SHM_BYTES; size_t size = CartesianCommunicator::MAX_MPI_SHM_BYTES;
sprintf(shm_name,GRID_SHM_PATH "/Grid_mpi3_shm_%d_%d",GroupRank,r); sprintf(shm_name,GRID_SHM_PATH "/Grid_mpi3_shm_%d_%d",GroupRank,r);
//sprintf(shm_name,"/var/lib/hugetlbfs/group/wheel/pagesize-2MB/" "Grid_mpi3_shm_%d_%d",GroupRank,r);
// printf("Opening file %s \n",shm_name);
int fd=open(shm_name,O_RDWR|O_CREAT,0666); int fd=open(shm_name,O_RDWR|O_CREAT,0666);
if ( fd == -1) { if ( fd == -1) {
printf("open %s failed\n",shm_name); printf("open %s failed\n",shm_name);
@ -214,12 +216,15 @@ void CartesianCommunicator::Init(int *argc, char ***argv) {
exit(0); exit(0);
} }
int mmap_flag = MAP_SHARED ; int mmap_flag = MAP_SHARED |MAP_POPULATE;
#ifdef MAP_HUGETLB #ifdef MAP_HUGETLB
if ( Hugepages ) mmap_flag |= MAP_HUGETLB; if ( Hugepages ) mmap_flag |= MAP_HUGETLB;
#endif #endif
void *ptr = (void *) mmap(NULL, MAX_MPI_SHM_BYTES, PROT_READ | PROT_WRITE, mmap_flag,fd, 0); void *ptr = (void *) mmap(NULL, MAX_MPI_SHM_BYTES, PROT_READ | PROT_WRITE, mmap_flag,fd, 0);
if ( ptr == (void *)MAP_FAILED ) { perror("failed mmap"); assert(0); } if ( ptr == (void *)MAP_FAILED ) {
printf("mmap %s failed\n",shm_name);
perror("failed mmap"); assert(0);
}
assert(((uint64_t)ptr&0x3F)==0); assert(((uint64_t)ptr&0x3F)==0);
ShmCommBufs[r] =ptr; ShmCommBufs[r] =ptr;
@ -244,7 +249,7 @@ void CartesianCommunicator::Init(int *argc, char ***argv) {
if ( fd < 0 ) { perror("failed shm_open"); assert(0); } if ( fd < 0 ) { perror("failed shm_open"); assert(0); }
ftruncate(fd, size); ftruncate(fd, size);
int mmap_flag = MAP_SHARED; int mmap_flag = MAP_SHARED|MAP_POPULATE;
#ifdef MAP_HUGETLB #ifdef MAP_HUGETLB
if (Hugepages) mmap_flag |= MAP_HUGETLB; if (Hugepages) mmap_flag |= MAP_HUGETLB;
#endif #endif