portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-04-09 21:50:45 +01:00
Code Releases Activity

Merge branch 'hotfix/dirac-ITT-fix' into develop

Browse Source
This commit is contained in:
paboyle 2017-09-05 15:08:51 +01:00
commit 203c7bf6fa
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/communicator/Communicator_base.cc
View File

@ -157,7 +157,9 @@ void CartesianCommunicator::ShmInitGeneric(void){
perror("mmap failed "); perror("mmap failed ");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
#ifdef MADV_HUGEPAGE
if (!Hugepages ) madvise(ShmCommBuf,MAX_MPI_SHM_BYTES,MADV_HUGEPAGE); if (!Hugepages ) madvise(ShmCommBuf,MAX_MPI_SHM_BYTES,MADV_HUGEPAGE);
#endif
#else #else
ShmBufStorageVector.resize(MAX_MPI_SHM_BYTES); ShmBufStorageVector.resize(MAX_MPI_SHM_BYTES);
ShmCommBuf=(void *)&ShmBufStorageVector[0]; ShmCommBuf=(void *)&ShmBufStorageVector[0];

11
lib/communicator/Communicator_mpi3.cc
View File

@ -215,8 +215,10 @@ void CartesianCommunicator::Init(int *argc, char ***argv) {
perror("open hugetlbfs"); perror("open hugetlbfs");
exit(0); exit(0);
} }
int mmap_flag = MAP_SHARED ;
int mmap_flag = MAP_SHARED |MAP_POPULATE; #ifdef MAP_POPULATE
mmap_flag|=MAP_POPULATE;
#endif
#ifdef MAP_HUGETLB #ifdef MAP_HUGETLB
if ( Hugepages ) mmap_flag |= MAP_HUGETLB; if ( Hugepages ) mmap_flag |= MAP_HUGETLB;
#endif #endif
@ -249,7 +251,10 @@ 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|MAP_POPULATE; int mmap_flag = MAP_SHARED;
#ifdef MAP_POPULATE
mmap_flag |= MAP_POPULATE;
#endif
#ifdef MAP_HUGETLB #ifdef MAP_HUGETLB
if (Hugepages) mmap_flag |= MAP_HUGETLB; if (Hugepages) mmap_flag |= MAP_HUGETLB;
#endif #endif