Commit 4493b4ab authored by Philip Carns's avatar Philip Carns
Browse files

Merge branch 'feature/BIGmodules' into 'master'

change all memory size variables to long ints

See merge request !76
parents 30e9514c 3ca3e621
......@@ -50,7 +50,7 @@
/* Maximum amount of memory per instrumentation module in MiB */
#ifdef __DARSHAN_MOD_MEM_MAX
#define DARSHAN_MOD_MEM_MAX (__DARSHAN_MOD_MEM_MAX * 1024 * 1024)
#define DARSHAN_MOD_MEM_MAX (__DARSHAN_MOD_MEM_MAX * 1024L * 1024L)
#else
#define DARSHAN_MOD_MEM_MAX (2 * 1024 * 1024) /* 2 MiB default */
#endif
......@@ -82,7 +82,7 @@ struct darshan_core_module
{
void *rec_buf_start;
void *rec_buf_p;
int rec_mem_avail;
long rec_mem_avail;
darshan_module_funcs mod_funcs;
};
......@@ -107,9 +107,9 @@ struct darshan_core_runtime
/* darshan-core internal data structures */
struct darshan_core_module* mod_array[DARSHAN_MAX_MODS];
int mod_mem_used;
long mod_mem_used;
struct darshan_core_name_record_ref *name_hash;
int name_mem_used;
long name_mem_used;
double wtime_offset;
char *comp_buf;
#ifdef __DARSHAN_ENABLE_MMAP_LOGS
......
......@@ -2152,8 +2152,8 @@ void darshan_core_register_module(
int *sys_mem_alignment)
{
struct darshan_core_module* mod;
int mod_mem_req = *inout_mod_buf_size;
int mod_mem_avail;
long mod_mem_req = *inout_mod_buf_size;
long mod_mem_avail;
*inout_mod_buf_size = 0;
......
......@@ -38,7 +38,7 @@ typedef int64_t off64_t;
/* maximum amount of memory to use for storing DXT records */
#ifdef __DARSHAN_MOD_MEM_MAX
#define DXT_IO_TRACE_MEM_MAX (__DARSHAN_MOD_MEM_MAX * 1024 * 1024)
#define DXT_IO_TRACE_MEM_MAX (__DARSHAN_MOD_MEM_MAX * 1024L * 1024L)
#else
#define DXT_IO_TRACE_MEM_MAX (4 * 1024 * 1024) /* 4 MiB default */
#endif
......@@ -166,8 +166,8 @@ static pthread_mutex_t dxt_runtime_mutex =
PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
static int dxt_my_rank = -1;
static int dxt_total_mem = DXT_IO_TRACE_MEM_MAX;
static int dxt_mem_remaining = 0;
static long dxt_total_mem = DXT_IO_TRACE_MEM_MAX;
static long dxt_mem_remaining = 0;
#define MAX_DXT_TRIGGERS 20
static int num_dxt_triggers = 0;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment