bootchart: don't parse /proc/uptime, use CLOCK_BOOTTIME

[elogind.git] / src / bootchart / bootchart.c

diff --git a/src/bootchart/bootchart.c b/src/bootchart/bootchart.c
index 0ae72c29bbb1571268343f1728a7c0d5995ed940..fc00b4e3f2df888fa1fcf27ffeff770d29f0375d 100644 (file)
--- a/src/bootchart/bootchart.c
+++ b/src/bootchart/bootchart.c
@@ -310,6 +310,7 @@ int main(int argc, char *argv[]) {
         time_t t = 0;
         int r;
         struct rlimit rlim;
         time_t t = 0;
         int r;
         struct rlimit rlim;

+        bool has_procfs = false;

 
         parse_conf();
 
 
         parse_conf();
 


@@ -349,6 +350,8 @@ int main(int argc, char *argv[]) {
 
         log_uptime();
 
 
         log_uptime();
 

+        has_procfs = access("/proc/vmstat", F_OK) == 0;
+

         LIST_HEAD_INIT(head);
 
         /* main program loop */
         LIST_HEAD_INIT(head);
 
         /* main program loop */


@@ -385,11 +388,11 @@ int main(int argc, char *argv[]) {
                                 parse_env_file("/usr/lib/os-release", NEWLINE, "PRETTY_NAME", &build, NULL);
                 }
 
                                 parse_env_file("/usr/lib/os-release", NEWLINE, "PRETTY_NAME", &build, NULL);
                 }
 

-                /* wait for /proc to become available, discarding samples */
-                if (graph_start <= 0.0)
-                        log_uptime();
-                else
+                if (has_procfs)

                         log_sample(samples, &sampledata);
                         log_sample(samples, &sampledata);

+                else
+                        /* wait for /proc to become available, discarding samples */
+                        has_procfs = access("/proc/vmstat", F_OK) == 0;

 
                 sample_stop = gettime_ns();
 
 
                 sample_stop = gettime_ns();