* To help us fund GROMACS development, we humbly ask that you cite
* the research papers on the package. Check out http://www.gromacs.org.
*/
-#include "gromacs/utility/smalloc.h"
+#include "gmxpre.h"
-#ifdef HAVE_CONFIG_H
-#include <config.h>
-#endif
+#include "smalloc.h"
+
+#include "config.h"
#include <errno.h>
#include <stdio.h>
#ifdef WITH_DMALLOC
#include <dmalloc.h>
#endif
+#ifdef HAVE__ALIGNED_MALLOC
+#include <malloc.h>
+#endif
#include "thread_mpi/threads.h"
#include "gromacs/utility/fatalerror.h"
#ifdef PRINT_ALLOC_KB
+#include "gromacs/utility/basenetwork.h"
#include "gromacs/utility/gmxmpi.h"
#endif
else
{
#ifdef PRINT_ALLOC_KB
- int rank = 0;
if (nelem*elsize >= PRINT_ALLOC_KB*1024)
{
-#ifdef GMX_MPI
- MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-#endif
+ int rank = gmx_node_rank();
printf("Allocating %.1f MB for %s (called from file %s, line %d on %d)\n",
nelem*elsize/1048576.0, name, file, line, rank);
}
else
{
#ifdef PRINT_ALLOC_KB
- int rank = 0;
if (size >= PRINT_ALLOC_KB*1024)
{
-#ifdef GMX_MPI
- MPI_Comm_rank(MPI_COMM_WORLD, &rank);
-#endif
+ int rank = gmx_node_rank();
printf("Reallocating %.1f MB for %s (called from file %s, line %d on %d)\n",
size/1048576.0, name, file, line, rank);
}
#ifdef PRINT_ALLOC_KB
if (nelem*elsize >= PRINT_ALLOC_KB*1024)
{
- printf("Allocating %.1f MB for %s\n",
- nelem*elsize/(PRINT_ALLOC_KB*1024.0), name);
+ int rank = gmx_node_rank();
+ printf("Allocating %.1f MB for %s (called from file %s, line %d on %d)\n",
+ nelem*elsize/1048576.0, name, file, line, rank);
}
#endif
}
/* This routine can NOT be called with any pointer */
-void save_free_aligned(const char *name, const char *file, int line, void *ptr)
+void save_free_aligned(const char gmx_unused *name, const char gmx_unused *file, int gmx_unused line, void *ptr)
{
int i, j;
void *free = ptr;