improve time handling

4 files changed, 20 insertions, 17 deletions

diff --git a/include/load.h b/include/load.h
index e460e7a..055df4c 100644
--- a/include/load.h
+++ b/include/load.h
@@ -49,7 +49,7 @@ void crop_events_all(double min, double max);
 
 struct task* by_pid(int pid);
 
-void split(struct heap* h, unsigned int count);
+void split(struct heap* h, unsigned int count, int find_time0);
 
 const char* tsk_name(struct task* t);
 u32 per(struct task* t);
diff --git a/src/load.c b/src/load.c
index e97bdc4..0b84373 100644
--- a/src/load.c
+++ b/src/load.c
@@ -130,14 +130,14 @@ u32 count_tasks(void)
 
 {
         struct task* t;
-        u32 i = 0;      
+        u32 i = 0;
         for_each_task(t)
                 i++;
         return i;
 }
 
 
-void split(struct heap* h, unsigned int count)
+void split(struct heap* h, unsigned int count, int find_time0)
 {
         struct evlink *lnk = malloc(count * sizeof(struct evlink));
         struct heap_node *hn;
@@ -153,7 +153,7 @@ void split(struct heap* h, unsigned int count)
         while ((hn = heap_take(earlier_event, h))) {
                 rec = heap_node_value(hn);
                 time =  event_time(rec);
-                if (!time0 && time)
+                if (find_time0 && !time0 && time)
                         time0 = time;
                 t = by_pid(rec->hdr.pid);
                 if (!t && rec->hdr.pid) {
diff --git a/src/showst.c b/src/showst.c
index 6ef3e1f..5594ec5 100644
--- a/src/showst.c
+++ b/src/showst.c
@@ -18,10 +18,10 @@ 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 (!start_time && time)
+/*              if (!start_time && time)
                         start_time = time;
                 time -= start_time;
-                time /= 1000000; /* convert to milliseconds */
+*/              time /= 1000000; /* convert to milliseconds */
                 printf("[%10llu] ", time);
                 print_event(heap_node_value(hn));
         }
diff --git a/src/st2pl.c b/src/st2pl.c
index 537e7f7..881da66 100644
--- a/src/st2pl.c
+++ b/src/st2pl.c
@@ -24,7 +24,7 @@ static void write_prolog_kb(void)
         for_each_task(t) {
                 for_each_event_t(t, e, ST_RELEASE)
                         printf("released(job(%u, %u), %f).\n",
-                               e->rec->hdr.pid, 
+                               e->rec->hdr.pid,
                                e->rec->hdr.job,
                                ns2ms_adj(e->rec->data.release.release));
         }
@@ -32,7 +32,7 @@ static void write_prolog_kb(void)
         for_each_task(t) {
                 for_each_event_t(t, e, ST_RELEASE)
                         printf("deadline(job(%u, %u), %f).\n",
-                               e->rec->hdr.pid, 
+                               e->rec->hdr.pid,
                                e->rec->hdr.job,
                                ns2ms_adj(e->rec->data.release.deadline));
         }
@@ -126,7 +126,7 @@ static void write_asy(double from, double to, double scale)
                 for_each_event_t(t, e, ST_RELEASE) {
                         t1 = ns2ms_adj(e->rec->data.release.release);
                         t2 = ns2ms_adj(e->rec->data.release.deadline);
-                        if (in_range(from, t1, to)) 
+                        if (in_range(from, t1, to))
                                 printf("release(%u, %f);\n", idx(t), t1);
                         if (in_range(from, t2, to))
                                 printf("deadline(%u, %f);\n", idx(t), t2);
@@ -164,7 +164,7 @@ static void write_asy(double from, double to, double scale)
 
 static void usage(const char *str)
 {
-        fprintf(stderr, 
+        fprintf(stderr,
                 "\n  USAGE\n"
                 "\n"
                 "    st2pl [opts] <file.st>+\n"
@@ -182,7 +182,7 @@ static void usage(const char *str)
 typedef enum {
         UNKNOWN,
         PROLOG,
-        ASYMPTOTE,      
+        ASYMPTOTE,
 } lang_t;
 
 #define streq(a, b) (0 == strcmp(a, b))
@@ -235,15 +235,18 @@ int main(int argc, char** argv)
                         break;
                 case 'm':
                         g_min_task = atoi(optarg);
-                        if (g_min_task > g_max_task)
-                                g_min_task = g_max_task;
+                        if (g_min_task > g_max_task) {
+                                usage("-m cannot exceed -M.");
+                        }
                         break;
                 case 'M':
                         g_max_task = atoi(optarg);
-                        if (g_min_task > g_max_task)
-                                g_max_task = g_min_task;
-                        if (g_max_task > MAX_TASKS)
+                        if (g_min_task > g_max_task) {
+                                usage("-m cannot exceed -M.");
+                        }
+                        if (g_max_task > MAX_TASKS) {
                                 g_max_task = MAX_TASKS;
+                        }
                         break;
                 case 'h':
                         usage("Help requested.");
@@ -263,7 +266,7 @@ int main(int argc, char** argv)
         if (!h)
                 usage("Loading traces failed.");
         fprintf(stderr, "Loaded %u events.\n", count);
-        split(h, count);
+        split(h, count, 0);
         switch (mode) {
         case PROLOG:
                 crop_events_all(from, to);