Just makes the code more pleasant.
- No need to read proc files twice as in filesize() [we don't really want
libnuma to show up in one of Dave Jones' "Why userspace sucks" talks]
- Also fixes at least one unchecked malloc.
- Remove unnecessary free() guards.
---
libnuma.c | 49 +++++++++----------------------------------------
1 file changed, 9 insertions(+), 40 deletions(-)
Index: numactl-2.0.0/libnuma.c
===================================================================
--- numactl-2.0.0.orig/libnuma.c
+++ numactl-2.0.0/libnuma.c
@@ -322,20 +322,6 @@ static int s2nbits(const char *s)
return strlen(s) * 32 / 9;
}
-/*
- * Determine number of bytes in a seekable open file, without
- * assuming that stat(2) on that file has a useful size.
- * Has side affect of leaving the file rewound to the beginnning.
- */
-static int filesize(FILE *fp)
-{
- int sz = 0;
- rewind(fp);
- while (fgetc(fp) != EOF)
- sz++;
- rewind(fp);
- return sz;
-}
/* Is string 'pre' a prefix of string 's'? */
static int strprefix(const char *s, const char *pre)
{
@@ -353,31 +339,22 @@ static const char *nodemask_prefix = "Me
static void
set_nodemask_size(void)
{
- FILE *fp = NULL;
+ FILE *fp;
char *buf = NULL;
- int fsize;
+ size_t bufsize = 0;
if ((fp = fopen(mask_size_file, "r")) == NULL)
goto done;
- fsize = filesize(fp);
- if ((buf = malloc(fsize)) == NULL)
- goto done;
- /*
- * Beware: mask sizing arithmetic is fussy.
- * The trailing newline left by fgets() is required.
- */
- while (fgets(buf, fsize, fp)) {
+ while (getline(&buf, &bufsize, fp) > 0) {
if (strprefix(buf, nodemask_prefix)) {
nodemask_sz = s2nbits(buf + strlen(nodemask_prefix));
break;
}
}
+ free(buf);
+ fclose(fp);
done:
- if (buf != NULL)
- free(buf);
- if (fp != NULL)
- fclose(fp);
if (nodemask_sz == 0) /* fall back on error */
nodemask_sz = maxconfigurednode+1;
}
@@ -448,18 +425,11 @@ read_mask(char *s, struct bitmask *bmp)
static void
set_thread_constraints(void)
{
- int max_cpus = numa_num_possible_cpus();
int hicpu = sysconf(_SC_NPROCESSORS_CONF)-1;
- int buflen;
int i;
- char *buffer;
+ char *buffer = NULL;
+ size_t buflen = 0;
FILE *f;
- /*
- * The maximum line size consists of the string at the beginning plus
- * a digit for each 4 cpus and a comma for each 64 cpus.
- */
- buflen = max_cpus / 4 + max_cpus / BITS_PER_LONG + 40;
- buffer = malloc(buflen);
numa_all_cpus_ptr = numa_allocate_cpumask();
numa_all_nodes_ptr = numa_allocate_nodemask();
@@ -471,8 +441,7 @@ set_thread_constraints(void)
return;
}
- while (fgets(buffer, buflen, f)) {
-
+ while (getline(&buffer, &buflen, f) > 0) {
if (strncmp(buffer,"Cpus_allowed",12) == 0)
maxproccpu = read_mask(buffer + 14, numa_all_cpus_ptr);
@@ -482,7 +451,7 @@ set_thread_constraints(void)
}
}
fclose(f);
- free (buffer);
+ free(buffer);
/*
* Cpus_allowed in the kernel can be defined to all f's
--
To unsubscribe from this list: send the line "unsubscribe linux-numa" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
