aboutsummaryrefslogtreecommitdiff
path: root/Carpet/CarpetLib/src/mem.cc
diff options
context:
space:
mode:
authorErik Schnetter <schnetter@gmail.com>2013-06-22 12:48:18 -0400
committerErik Schnetter <schnetter@gmail.com>2013-06-22 12:48:18 -0400
commitff65161ae1244f9dab8d84b673923e57aead40ee (patch)
treed792c02c504a5c5c87ddf663ec0883720e851f8b /Carpet/CarpetLib/src/mem.cc
parent61b2781091556c359315b30e60cd2985cccf54e7 (diff)
CarpetLib: Update GetCacheInfo1 API
Diffstat (limited to 'Carpet/CarpetLib/src/mem.cc')
-rw-r--r--Carpet/CarpetLib/src/mem.cc13
1 files changed, 9 insertions, 4 deletions
diff --git a/Carpet/CarpetLib/src/mem.cc b/Carpet/CarpetLib/src/mem.cc
index 77cd6b704..c8bb8388b 100644
--- a/Carpet/CarpetLib/src/mem.cc
+++ b/Carpet/CarpetLib/src/mem.cc
@@ -49,13 +49,18 @@ namespace {
{
max_cache_linesize = 1;
if (CCTK_IsFunctionAliased("GetCacheInfo1")) {
- int const num_levels = GetCacheInfo1(NULL, NULL, 0);
+ int const num_levels =
+ GetCacheInfo1(NULL, NULL, NULL, NULL, NULL, NULL, 0);
+ vector<int> types (num_levels);
vector<int> linesizes(num_levels);
vector<int> strides (num_levels);
- GetCacheInfo1(&linesizes[0], &strides[0], num_levels);
+ GetCacheInfo1(NULL, &types[0], NULL, &linesizes[0], &strides[0], NULL,
+ num_levels);
for (int level=0; level<num_levels; ++level) {
- max_cache_linesize =
- max(max_cache_linesize, size_t(linesizes[level]));
+ if (types[level]==0) { // if this is a cache
+ max_cache_linesize =
+ max(max_cache_linesize, size_t(linesizes[level]));
+ }
}
}
}