diff options
| author | Tuukka Tikkanen <tuukka.tikkanen@linaro.org> | 2014-12-03 08:18:11 +0200 |
|---|---|---|
| committer | Tuukka Tikkanen <tuukka.tikkanen@linaro.org> | 2014-12-05 09:52:39 +0200 |
| commit | d612500d580b134a7602b248277c8b408ced8093 (patch) | |
| tree | 72754a952ba838ef5090b7fc0b0b9f48f94ce6c5 | |
| parent | e67dd38588ee56fa59268205f60c9abb0da2fa83 (diff) | |
energy_model: Close energy model file after reading it
This patch adds closing the the input file stream after being
done parsing it to parse_energy_model().
Signed-off-by: Tuukka Tikkanen <tuukka.tikkanen@linaro.org>
Reviewed-by: Larry Bassel <larry.bassel@linaro.org>
| -rw-r--r-- | energy_model.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/energy_model.c b/energy_model.c index 93a2edc..4b6cfc7 100644 --- a/energy_model.c +++ b/energy_model.c @@ -118,6 +118,7 @@ int parse_energy_model(struct program_options *options) if (clusters_in_energy_file) { fprintf(stderr, "%s: number of clusters already specified in %s\n", __func__, path); + fclose(f); return -1; } sscanf(buffer, "%*s %d", &clusters_in_energy_file); @@ -132,12 +133,14 @@ int parse_energy_model(struct program_options *options) if (current_cluster >= clusters_in_energy_file) { fprintf(stderr, "%s: cluster%c out of range in %s\n", __func__, tmp, path); + fclose(f); return -1; } clustp = cluster_energy_table + current_cluster; if (clustp->number_cap_states) { fprintf(stderr, "%s: number of cap states for cluster%c already specified in %s\n", __func__, tmp, path); + fclose(f); return -1; } clustp->number_cap_states = number_cap_states; @@ -153,11 +156,13 @@ int parse_energy_model(struct program_options *options) if (current_cluster == -1) { fprintf(stderr, "%s: unknown cluster (cap states) in %s\n", __func__, path); + fclose(f); return -1; } if (clustp->state < parsed_cluster_info) { fprintf(stderr, "%s: number of cap states for cluster%c not specified in %s\n", __func__, current_cluster, path); + fclose(f); return -1; } current_pstate = 0; @@ -168,11 +173,13 @@ int parse_energy_model(struct program_options *options) if (current_cluster == -1) { fprintf(stderr, "%s: unknown cluster (c states) in %s\n", __func__, path); + fclose(f); return -1; } if (clustp->state < parsed_cluster_info) { fprintf(stderr, "%s: number of c states for cluster%c not specified in %s\n", __func__, current_cluster, path); + fclose(f); return -1; } current_cstate = 0; @@ -185,6 +192,7 @@ int parse_energy_model(struct program_options *options) if (current_cluster == -1) { fprintf(stderr, "%s: unknown cluster (wakeup) in %s\n", __func__, path); + fclose(f); return -1; } sscanf(buffer, "%*s %d %d", &clust_w, &core_w); @@ -195,6 +203,7 @@ int parse_energy_model(struct program_options *options) if (!clustp) { fprintf(stderr, "%s: unknown cluster in %s\n", __func__, path); + fclose(f); return -1; } if (clustp->state == parsing_cap_states) { @@ -204,12 +213,14 @@ int parse_energy_model(struct program_options *options) if (sscanf(buffer, "%d %d %d", &speed, &clust_p, &core_p) != 3) { fprintf(stderr, "%s: expected P state (speed cluster core) for cluster%c in %s\n", __func__, current_cluster, path); + fclose(f); return -1; } if (current_pstate >= clustp->number_cap_states) { fprintf(stderr, "%s: too many cap states specified for cluster%c in %s\n", __func__, current_cluster, path); + fclose(f); return -1; } pp = &clustp->p_energy[current_pstate++]; @@ -225,12 +236,14 @@ int parse_energy_model(struct program_options *options) if (sscanf(buffer, "%s %d %d", name, &clust_p, &core_p) != 3) { fprintf(stderr, "%s: expected C state (name cluster core) for cluster%c in %s\n", __func__, current_cluster, path); + fclose(f); return -1; } if (current_cstate >= clustp->number_c_states) { fprintf(stderr, "%s: too many C states specified for cluster%c in %s\n", __func__, current_cluster, path); + fclose(f); return -1; } cp = &clustp->c_energy[current_cstate++]; @@ -241,7 +254,9 @@ int parse_energy_model(struct program_options *options) } } - printf("parsed energy model file\n"); + fclose(f); + printf("Parsed energy model file successfully\n"); + return 0; } |