add -f option to st_show

-f causes it to interpret the first task event (if any)
as the system release.

1 files changed, 15 insertions, 2 deletions

diff --git a/src/showst.c b/src/showst.c
index a89da10..91e036b 100644
--- a/src/showst.c
+++ b/src/showst.c
@@ -15,6 +15,8 @@ static void usage(const char *str)
                 "\n"
                 "  OPTIONS\n"
                 "     -r         -- find task system release and exit\n"
+                "     -f         -- use first non-zero event as system release\n"
+                "                   if no system release event is found\n"
                 "     -c         -- display a count of the number of events\n"
                 "\n\n"
                 );
@@ -22,17 +24,18 @@ static void usage(const char *str)
         exit(1);
 }
 
-#define OPTSTR "rc"
+#define OPTSTR "rcf"
 
 int main(int argc, char** argv)
 {
         unsigned int count;
         struct heap *h;
-        struct heap_node *hn;
+        struct heap_node *hn, *first = NULL;
         u64 time;
         struct st_event_record *rec;
         int find_release = 0;
         int show_count = 0;
+        int use_first_nonzero = 0;
         int opt;
 
         while ((opt = getopt(argc, argv, OPTSTR)) != -1) {
@@ -43,6 +46,9 @@ int main(int argc, char** argv)
                 case 'c':
                         show_count = 1;
                         break;
+                case 'f':
+                        use_first_nonzero = 1;
+                        break;
                 case ':':
                         usage("Argument missing.");
                         break;
@@ -61,6 +67,8 @@ int main(int argc, char** argv)
                 printf("Loaded %u events.\n", count);
         while ((hn = heap_take(earlier_event, h))) {
                 time =  event_time(heap_node_value(hn));
+                if (time != 0 && !first)
+                        first = hn;
                 time /= 1000000; /* convert to milliseconds */
                 if (!find_release) {
                         printf("[%10llu] ", (unsigned long long) time);
@@ -69,10 +77,15 @@ int main(int argc, char** argv)
                         rec = heap_node_value(hn);
                         if (rec->hdr.type == ST_SYS_RELEASE) {
                                 printf("%6.2fms\n", rec->data.raw[1] / 1000000.0);
+                                find_release = 0;
                                 break;
                         }
                 }
         }
+        if (find_release && use_first_nonzero && first) {
+                rec = heap_node_value(first);
+                printf("%6.2fms\n", event_time(rec) / 1000000.0);
+        }
 
         return 0;
 }