diff options
author | Jonathan Herman <hermanjl@cs.unc.edu> | 2012-10-03 18:59:38 -0400 |
---|---|---|
committer | Jonathan Herman <hermanjl@cs.unc.edu> | 2012-10-03 18:59:38 -0400 |
commit | 8e74ea12a1fcbe0a799284163f0cf72bcb916df7 (patch) | |
tree | 4c333218d62fab110dfb146d43c76efe9dbb134c | |
parent | fe1bbdcd1f561aba818c55dfede6b932ff8e4001 (diff) |
Temporarily disable hash-based plotting until it works with blocking.
-rw-r--r-- | rt-graph.c | 9 | ||||
-rw-r--r-- | rt-plot-vcpu.c | 4 | ||||
-rw-r--r-- | trace-graph.c | 32 |
3 files changed, 22 insertions, 23 deletions
@@ -484,8 +484,8 @@ int rt_graph_check_task_block(struct graph_info *ginfo, | |||
484 | *ts = get_rts(ginfo, record); | 484 | *ts = get_rts(ginfo, record); |
485 | 485 | ||
486 | ret = 1; | 486 | ret = 1; |
487 | dprintf(3, "Read task_block (%d) record on %d for task %d\n", | 487 | dprintf(3, "Read task_block (%d) record on %d for task %d at %llu\n", |
488 | id, *lid, *pid); | 488 | id, *lid, *pid, *ts); |
489 | } | 489 | } |
490 | out: | 490 | out: |
491 | return ret; | 491 | return ret; |
@@ -524,14 +524,13 @@ int rt_graph_check_task_resume(struct graph_info *ginfo, | |||
524 | *ts = get_rts(ginfo, record); | 524 | *ts = get_rts(ginfo, record); |
525 | 525 | ||
526 | ret = 1; | 526 | ret = 1; |
527 | dprintf(3, "Read task_resume (%d) record on %d for task %d\n", | 527 | dprintf(3, "Read task_resume (%d) record on %d for task %d at %llu\n", |
528 | id, *lid, *pid); | 528 | id, *lid, *pid, *ts); |
529 | } | 529 | } |
530 | out: | 530 | out: |
531 | return ret; | 531 | return ret; |
532 | } | 532 | } |
533 | 533 | ||
534 | |||
535 | /** | 534 | /** |
536 | * rt_graph_check_sys_release - check for system release record | 535 | * rt_graph_check_sys_release - check for system release record |
537 | * Return 1 and @when if the record matches | 536 | * Return 1 and @when if the record matches |
diff --git a/rt-plot-vcpu.c b/rt-plot-vcpu.c index 1467660..8f850b9 100644 --- a/rt-plot-vcpu.c +++ b/rt-plot-vcpu.c | |||
@@ -84,7 +84,7 @@ static int try_switch_to(struct graph_info *ginfo, struct vcpu_info *vcpu_info, | |||
84 | unsigned long long ts; | 84 | unsigned long long ts; |
85 | 85 | ||
86 | match = rt_graph_check_switch_to(ginfo, record, &pid, &job, &ts); | 86 | match = rt_graph_check_switch_to(ginfo, record, &pid, &job, &ts); |
87 | if (match && pid && pid == vcpu_info->run_tid && vcpu_info->run_time) { | 87 | if (match && pid && (pid == vcpu_info->run_tid || pid == -vcpu_info->run_tid) && vcpu_info->run_time) { |
88 | vcpu_info->running = TRUE; | 88 | vcpu_info->running = TRUE; |
89 | 89 | ||
90 | /* Draw empty box for time spent not running a task */ | 90 | /* Draw empty box for time spent not running a task */ |
@@ -312,7 +312,7 @@ rt_vcpu_plot_write_header(struct rt_plot_common *rt, | |||
312 | struct trace_seq *s, | 312 | struct trace_seq *s, |
313 | unsigned long long time) | 313 | unsigned long long time) |
314 | { | 314 | { |
315 | int is_running, job, tid, tjob; | 315 | int is_running, job = 0, tid, tjob; |
316 | unsigned long long release, deadline; | 316 | unsigned long long release, deadline; |
317 | struct vcpu_info *vcpu_info = (struct vcpu_info*)rt; | 317 | struct vcpu_info *vcpu_info = (struct vcpu_info*)rt; |
318 | struct record *record; | 318 | struct record *record; |
diff --git a/trace-graph.c b/trace-graph.c index 6a7f1ff..69f5069 100644 --- a/trace-graph.c +++ b/trace-graph.c | |||
@@ -1940,19 +1940,19 @@ static void draw_hashed_plots(struct graph_info *ginfo) | |||
1940 | } | 1940 | } |
1941 | 1941 | ||
1942 | 1942 | ||
1943 | hash = trace_graph_plot_find_cpu(ginfo, cpu); | 1943 | /* hash = trace_graph_plot_find_cpu(ginfo, cpu); */ |
1944 | if (hash) { | 1944 | /* if (hash) { */ |
1945 | for (list = hash->plots; list; list = list->next) { | 1945 | /* for (list = hash->plots; list; list = list->next) { */ |
1946 | draw_plot(ginfo, list->plot, record); | 1946 | /* draw_plot(ginfo, list->plot, record); */ |
1947 | } | 1947 | /* } */ |
1948 | } | 1948 | /* } */ |
1949 | pid = pevent_data_pid(ginfo->pevent, record); | 1949 | /* pid = pevent_data_pid(ginfo->pevent, record); */ |
1950 | hash = trace_graph_plot_find_task(ginfo, pid); | 1950 | /* hash = trace_graph_plot_find_task(ginfo, pid); */ |
1951 | if (hash) { | 1951 | /* if (hash) { */ |
1952 | for (list = hash->plots; list; list = list->next) { | 1952 | /* for (list = hash->plots; list; list = list->next) { */ |
1953 | draw_plot(ginfo, list->plot, record); | 1953 | /* draw_plot(ginfo, list->plot, record); */ |
1954 | } | 1954 | /* } */ |
1955 | } | 1955 | /* } */ |
1956 | for (list = ginfo->all_recs; list; list = list->next) { | 1956 | for (list = ginfo->all_recs; list; list = list->next) { |
1957 | /* TODO: hacky assumption that everything else can be | 1957 | /* TODO: hacky assumption that everything else can be |
1958 | * reached via previous hashes | 1958 | * reached via previous hashes |
@@ -1960,10 +1960,10 @@ static void draw_hashed_plots(struct graph_info *ginfo) | |||
1960 | * added with arbitrary numbers, and a pevent_other_id | 1960 | * added with arbitrary numbers, and a pevent_other_id |
1961 | * which uses id ranges x < . < y to parse cids or lids | 1961 | * which uses id ranges x < . < y to parse cids or lids |
1962 | */ | 1962 | */ |
1963 | if (list->plot->type == PLOT_TYPE_SERVER_TASK || | 1963 | /* if (list->plot->type == PLOT_TYPE_SERVER_TASK || */ |
1964 | list->plot->type == PLOT_TYPE_SERVER_CPU) { | 1964 | /* list->plot->type == PLOT_TYPE_SERVER_CPU) { */ |
1965 | draw_plot(ginfo, list->plot, record); | 1965 | draw_plot(ginfo, list->plot, record); |
1966 | } | 1966 | /* } */ |
1967 | } | 1967 | } |
1968 | free_record(record); | 1968 | free_record(record); |
1969 | } | 1969 | } |