diff options
| author | Davidlohr Bueso | 2011-07-24 20:39:15 +0200 |
|---|---|---|
| committer | Karel Zak | 2011-07-26 11:58:38 +0200 |
| commit | 08de16d003857f5ba0ceacc154dffca6407073de (patch) | |
| tree | df1520ee54b1365c30a055999a016553c171857a /sys-utils/lscpu.c | |
| parent | partx: use sysfs_deinit (diff) | |
| download | kernel-qcow2-util-linux-08de16d003857f5ba0ceacc154dffca6407073de.tar.gz kernel-qcow2-util-linux-08de16d003857f5ba0ceacc154dffca6407073de.tar.xz kernel-qcow2-util-linux-08de16d003857f5ba0ceacc154dffca6407073de.zip | |
lscpu: use xalloc
Signed-off-by: Davidlohr Bueso <dave@gnu.org>
Diffstat (limited to 'sys-utils/lscpu.c')
| -rw-r--r-- | sys-utils/lscpu.c | 32 |
1 files changed, 9 insertions, 23 deletions
diff --git a/sys-utils/lscpu.c b/sys-utils/lscpu.c index 6fa7daf2b..c039596ca 100644 --- a/sys-utils/lscpu.c +++ b/sys-utils/lscpu.c @@ -622,17 +622,11 @@ read_topology(struct lscpu_desc *desc, int num) */ if (!desc->nthreads) desc->nthreads = nsockets * ncores * nthreads; - if (book_siblings) { - desc->bookmaps = calloc(nbooks, sizeof(cpu_set_t *)); - if (!desc->bookmaps) - err(EXIT_FAILURE, _("error: calloc failed")); - } - desc->socketmaps = calloc(nsockets, sizeof(cpu_set_t *)); - if (!desc->socketmaps) - err(EXIT_FAILURE, _("error: calloc failed")); - desc->coremaps = calloc(ncores * nsockets, sizeof(cpu_set_t *)); - if (!desc->coremaps) - err(EXIT_FAILURE, _("error: calloc failed")); + if (book_siblings) + desc->bookmaps = xcalloc(nbooks, sizeof(cpu_set_t *)); + + desc->socketmaps = xcalloc(nsockets, sizeof(cpu_set_t *)); + desc->coremaps = xcalloc(ncores * nsockets, sizeof(cpu_set_t *)); } add_cpuset_to_array(desc->socketmaps, &desc->nsockets, core_siblings); @@ -664,9 +658,7 @@ read_cache(struct lscpu_desc *desc, int num) if (!desc->ncaches) return; - desc->caches = calloc(desc->ncaches, sizeof(*desc->caches)); - if (!desc->caches) - err(EXIT_FAILURE, _("calloc failed")); + desc->caches = xcalloc(desc->ncaches, sizeof(*desc->caches)); } for (i = 0; i < desc->ncaches; i++) { struct cpu_cache *ca = &desc->caches[i]; @@ -707,12 +699,8 @@ read_cache(struct lscpu_desc *desc, int num) map = path_cpuset(_PATH_SYS_CPU "/cpu%d/cache/index%d/shared_cpu_map", num, i); - if (!ca->sharedmaps) { - ca->sharedmaps = calloc(desc->ncpus, sizeof(cpu_set_t *)); - if (!ca->sharedmaps) - err(EXIT_FAILURE, _("error: calloc failed")); - } - + if (!ca->sharedmaps) + ca->sharedmaps = xcalloc(desc->ncpus, sizeof(cpu_set_t *)); add_cpuset_to_array(ca->sharedmaps, &ca->nsharedmaps, map); } } @@ -729,9 +717,7 @@ read_nodes(struct lscpu_desc *desc) if (!desc->nnodes) return; - desc->nodemaps = calloc(desc->nnodes, sizeof(cpu_set_t *)); - if (!desc->nodemaps) - err(EXIT_FAILURE, _("error: calloc failed")); + desc->nodemaps = xcalloc(desc->nnodes, sizeof(cpu_set_t *)); /* information about how nodes share different CPUs */ for (i = 0; i < desc->nnodes; i++) |