[PATCH 8/10] rewrite timer::is_deferred()

[Sergey Senozhatsky]

     Rewrite is_deferred().
     No need to check for !handler, since it's allocated member array.
     "total events" substrig search is redundant -- EOF should do the
     same. Also replace strchr() with "D," substring search.
     Patch also removes get_timerstats() -- looks useless.

Signed-off-by: Sergey Senozhatsky <sergey.senozhat...@gmail.com>

---
 process/timer.cpp |   50 +++++++++++++-------------------------------------
 1 file changed, 13 insertions(+), 37 deletions(-)

diff --git a/process/timer.cpp b/process/timer.cpp
index 68fd31f..bb7f459 100644
--- a/process/timer.cpp
+++ b/process/timer.cpp
@@ -125,50 +125,26 @@ void clear_timers(void)
        }
 }
 
-bool get_timerstats(void)
-{
-       FILE *file;
-       file = fopen("/proc/timer_stats", "w");
-       if (!file) {
-               return false;
-       }
-       fprintf(file, "1\n");
-       fclose(file);
-       return true;
-}
-
 bool timer::is_deferred(void)
 {
-       FILE *file;
-       char line[4096];
+       FILE    *file;
+       bool    ret = false;
+       char    line[4096];
 
-       if (!get_timerstats()){
-               return false;
-       }
-       file = fopen("/proc/timer_stats", "r");
+       file = fopen("/proc/timer_stats", "r"); 
        if (!file) {
-               return false;
+               return ret;
        }
 
-       while (file && !feof(file)) {
-               char *c;
-               if (fgets(line, 4096,file)== NULL)
-                       break;
-               if (strstr(line, "total events"))
+       while (!feof(file)) {
+               if (fgets(line, 4096, file) == NULL)
                        break;
-               if (!handler)
-                       break;
-               if (strstr(line, handler)){
-                       c = strchr(line, ',');
-                       if (!c)
-                               continue;
-                       c--;
-                       if (*c == 'D') {
-                               fclose(file);
-                               return true;
-                       }
+               if (strstr(line, handler)) {
+                       ret = (strstr(line, "D,") != NULL);
+                       if (ret == true)
+                               break;
                }
        }
        fclose(file);
-       return false;
-}
\ No newline at end of file
+       return ret;
+}

_______________________________________________
Power mailing list
Power@bughost.org
https://bughost.org/mailman/listinfo/power