diff options
| author | Marat Dukhan <maratek@gmail.com> | 2017-05-08 05:13:19 -0400 |
|---|---|---|
| committer | Marat Dukhan <maratek@gmail.com> | 2017-05-08 09:52:29 +0000 |
| commit | 51a3427a3abf103c59925cb734ef4c4aa14316ce (patch) | |
| tree | aa843a38c60020a77e95646cc835c9ff7503bba3 /src | |
| parent | 1a6cf6bb66a6f1a6cb9861088e5f5623daaab04a (diff) | |
| download | cpuinfo-51a3427a3abf103c59925cb734ef4c4aa14316ce.tar.gz | |
Add mocking and test with Raspberry Pi 2 /proc/cpuinfo
Diffstat (limited to 'src')
| -rw-r--r-- | src/arm/linux/api.h | 1 | ||||
| -rw-r--r-- | src/arm/linux/cpuinfo.c | 23 | ||||
| -rw-r--r-- | src/arm/linux/init.c | 2 |
3 files changed, 19 insertions, 7 deletions
diff --git a/src/arm/linux/api.h b/src/arm/linux/api.h index 4e13e00..fe0dc1e 100644 --- a/src/arm/linux/api.h +++ b/src/arm/linux/api.h @@ -94,7 +94,6 @@ struct proc_cpuinfo { }; struct proc_cpuinfo* cpuinfo_arm_linux_parse_proc_cpuinfo( - const char* filename, uint32_t processors_count[restrict static 1]); void cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo( diff --git a/src/arm/linux/cpuinfo.c b/src/arm/linux/cpuinfo.c index 76e1a1f..aade677 100644 --- a/src/arm/linux/cpuinfo.c +++ b/src/arm/linux/cpuinfo.c @@ -11,10 +11,23 @@ #include <fcntl.h> #include <sched.h> +#if CPUINFO_MOCK + #include <cpuinfo-mock.h> +#endif #include <arm/linux/api.h> #include <log.h> +static const char* proc_cpuinfo_path = "/proc/cpuinfo"; + +#if CPUINFO_MOCK + void cpuinfo_set_proc_cpuinfo_path(const char* path) { + /* Note: this leaks memory */ + proc_cpuinfo_path = strdup(path); + } +#endif + + /* * Size, in chars, of the on-stack buffer used for parsing cpu lists. * This is also the limit on the length of a single entry @@ -714,7 +727,7 @@ static uint32_t parse_line( return processor_number; } -struct proc_cpuinfo* cpuinfo_arm_linux_parse_proc_cpuinfo(const char* filename, uint32_t processors_count_ptr[restrict static 1]) { +struct proc_cpuinfo* cpuinfo_arm_linux_parse_proc_cpuinfo(uint32_t processors_count_ptr[restrict static 1]) { int file = -1; struct proc_cpuinfo* processors = NULL; struct proc_cpuinfo* result = NULL; @@ -729,10 +742,10 @@ struct proc_cpuinfo* cpuinfo_arm_linux_parse_proc_cpuinfo(const char* filename, goto cleanup; } - cpuinfo_log_debug("parsing cpu info from file %s", filename); - file = open(filename, O_RDONLY); + cpuinfo_log_debug("parsing cpu info from file %s", proc_cpuinfo_path); + file = open(proc_cpuinfo_path, O_RDONLY); if (file == -1) { - cpuinfo_log_error("failed to open %s: %s", filename, strerror(errno)); + cpuinfo_log_error("failed to open %s: %s", proc_cpuinfo_path, strerror(errno)); goto cleanup; } @@ -743,7 +756,7 @@ struct proc_cpuinfo* cpuinfo_arm_linux_parse_proc_cpuinfo(const char* filename, do { bytes_read = read(file, data_start, (size_t) (buffer_end - data_start)); if (bytes_read < 0) { - cpuinfo_log_error("failed to read file %s at position %zu: %s", filename, position, strerror(errno)); + cpuinfo_log_error("failed to read file %s at position %zu: %s", proc_cpuinfo_path, position, strerror(errno)); goto cleanup; } diff --git a/src/arm/linux/init.c b/src/arm/linux/init.c index 53f3e1e..5e47858 100644 --- a/src/arm/linux/init.c +++ b/src/arm/linux/init.c @@ -25,7 +25,7 @@ void cpuinfo_arm_linux_init(void) { uint32_t l1d_count = 0; uint32_t l2_count = 0; - struct proc_cpuinfo* proc_cpuinfo_entries = cpuinfo_arm_linux_parse_proc_cpuinfo("/proc/cpuinfo", &proc_cpuinfo_count); + struct proc_cpuinfo* proc_cpuinfo_entries = cpuinfo_arm_linux_parse_proc_cpuinfo(&proc_cpuinfo_count); if (proc_cpuinfo_count != 0) { cpuinfo_arm_linux_decode_isa_from_proc_cpuinfo( |