Fix CPU frequency parsing on Linux (#355) (#356)

* Fix reading CPU info from file Macro CHECK do nothing for release mode, meaning it doesn't invoke the arguments * Add myself to AUTHORS and CONTRIBUTORS

Fix CPU frequency parsing on Linux (#355) (#356)
ec15860d · MVafin · Eric · 94c512c0 · ec15860d · ec15860d
Commit ec15860d authored Mar 28, 2017 by MVafin Committed by Eric Mar 28, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

AUTHORS AUTHORS +1 -0

CONTRIBUTORS CONTRIBUTORS +1 -0

sysinfo.cc src/sysinfo.cc +3 -1

No files found.
--- a/AUTHORS
+++ b/AUTHORS
@@ -25,6 +25,7 @@ Jussi Knuuttila <jussi.knuuttila@gmail.com>
 Kaito Udagawa <umireon@gmail.com>
 Lei Xu <eddyxu@gmail.com>
 Matt Clarkson <mattyclarkson@gmail.com>
+Maxim Vafin <maxvafin@gmail.com>
 Nick Hutchinson <nshutchinson@gmail.com>
 Oleksandr Sochka <sasha.sochka@gmail.com>
 Paul Redmond <paul.redmond@gmail.com>

--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -41,6 +41,7 @@ Kaito Udagawa <umireon@gmail.com>
 Kai Wolf <kai.wolf@gmail.com>
 Lei Xu <eddyxu@gmail.com>
 Matt Clarkson <mattyclarkson@gmail.com>
+Maxim Vafin <maxvafin@gmail.com>
 Nick Hutchinson <nshutchinson@gmail.com>
 Oleksandr Sochka <sasha.sochka@gmail.com>
 Pascal Leroy <phl@google.com>

--- a/src/sysinfo.cc
+++ b/src/sysinfo.cc
@@ -75,7 +75,9 @@ bool ReadIntFromFile(const char* file, long* value) {
    char line[1024];
    char* err;
    memset(line, '\0', sizeof(line));
-    CHECK(read(fd, line, sizeof(line) - 1));
+    ssize_t read_err = read(fd, line, sizeof(line) - 1);
+    ((void)read_err); // prevent unused warning
+    CHECK(read_err >= 0);
    const long temp_value = strtol(line, &err, 10);
    if (line[0] != '\0' && (*err == '\n' || *err == '\0')) {
      *value = temp_value;