1
1

Manually add hwloc v1.1 branch r3418 commit (went in after v1.1.2

released): 

backport hwloc r 3416 from trunk: Add cache info entry _after_ checking
that we need one, thanks Andriy Gapon for the fix

This commit was SVN r24612.

The following SVN revision numbers were found above:
  r3418 --> open-mpi/ompi@9972663a12
Этот коммит содержится в:
Jeff Squyres 2011-04-12 14:41:46 +00:00
родитель 9dc3a1aa54
Коммит 2fe94b929a

Просмотреть файл

@ -1,6 +1,6 @@
/*
* Copyright © 2010-2011 INRIA. All rights reserved.
* Copyright © 2010 Université Bordeaux 1
* Copyright © 2010-2011 Université Bordeaux 1
* Copyright © 2010-2011 Cisco Systems, Inc. All rights reserved.
* See COPYING in top-level directory.
*
@ -59,10 +59,6 @@ static void fill_amd_cache(struct procinfo *infos, unsigned level, unsigned cpui
unsigned cachenum;
unsigned size = 0;
cachenum = infos->numcaches++;
infos->cache = realloc(infos->cache, infos->numcaches*sizeof(*infos->cache));
cache = &infos->cache[cachenum];
if (level == 1)
size = ((cpuid >> 24)) << 10;
else if (level == 2)
@ -72,6 +68,10 @@ static void fill_amd_cache(struct procinfo *infos, unsigned level, unsigned cpui
if (!size)
return;
cachenum = infos->numcaches++;
infos->cache = realloc(infos->cache, infos->numcaches*sizeof(*infos->cache));
cache = &infos->cache[cachenum];
cache->type = 1;
cache->level = level;
if (level <= 2)