|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH 3 of 8] xenalyze: Remove --dump-cooked
Remove a vestigal option that hasn't been used or maintained in years.
Signed-off-by: George Dunlap <george.dunlap@xxxxxxxxxxxxx>
diff -r 2ab3da778828 -r 6772e9e46ab2 xenalyze.c
--- a/xenalyze.c Thu Jan 26 17:16:32 2012 +0000
+++ b/xenalyze.c Thu Jan 26 17:16:35 2012 +0000
@@ -156,7 +156,6 @@ struct {
scatterplot_irq:1,
histogram_interrupt_eip:1,
interval_mode:1,
- dump_cooked:1,
dump_all:1,
dump_raw_process:1,
dump_raw_reads:1,
@@ -231,7 +230,6 @@ struct {
.scatterplot_rdtsc=0,
.scatterplot_irq=0,
.histogram_interrupt_eip=0,
- .dump_cooked = 0,
.dump_all = 0,
.dump_raw_process = 0,
.dump_raw_reads = 0,
@@ -3425,30 +3423,6 @@ void hvm_pf_xen_postprocess(struct hvm_d
/* Set summary handler */
hvm_set_summary_handler(h, hvm_pf_xen_summary, NULL);
}
-
- if(opt.dump_cooked)
- {
- switch(e->pf_case)
- {
- case PF_XEN_EMULATE:
- printf(" %s pf_xen:emulate va %llx ec %x eip %llx%s lvl %d corr
%llx\n",
- h->dump_header, e->va, e->error_code,
- h->rip, find_symbol(h->rip),
- e->pt_level, e->corresponding_va);
- break;
- case PF_XEN_MMIO:
- printf(" %s pf_xen:mmio va %llx ec %x eip %llx%s data %x\n",
- h->dump_header, e->va, e->error_code,
- h->rip, find_symbol(h->rip),
- e->data);
- break;
- default:
- printf(" %s pf_xen va %llx ec %x eip %llx%s\n",
- h->dump_header, e->va, e->error_code,
- h->rip, find_symbol(h->rip));
- break;
- }
- }
}
void hvm_pf_xen_process(struct record_info *ri, struct hvm_data *h) {
@@ -3610,7 +3584,7 @@ void hvm_vlapic_icr_handler(struct hvm_d
o->count++;
- if((opt.dump_all || opt.dump_cooked)
+ if((opt.dump_all)
#if 0
&& (ov->runstate.state != RUNSTATE_RUNNING
|| ov->hvm.vmexit_valid)
@@ -3624,7 +3598,7 @@ void hvm_vlapic_icr_handler(struct hvm_d
}
if(m->is_write) {
- if(opt.dump_all || opt.dump_cooked) {
+ if(opt.dump_all) {
printf(" [vla] d%dv%d icr vec %d %s\n",
h->v->d->did, h->v->vid,
icr.vec,
@@ -3655,7 +3629,7 @@ void hvm_vlapic_icr_handler(struct hvm_d
}
} else {
/* Read */
- if(opt.dump_all || opt.dump_cooked) {
+ if(opt.dump_all) {
printf(" [vla] d%dv%d icr status %s\n",
h->v->d->did, h->v->vid,
icr.delivery_status?"pending":"idle");
@@ -3683,7 +3657,7 @@ void hvm_vlapic_inject(struct vcpu_data
}
void hvm_vlapic_eoi_handler(struct hvm_data *h) {
- if(opt.dump_all || opt.dump_cooked)
+ if(opt.dump_all)
printf(" [vla] d%dv%d eoi\n",
h->v->d->did, h->v->vid);
}
@@ -3834,7 +3808,7 @@ void hvm_inj_virq_process(struct record_
int vector, fake;
} *r = (typeof(r))h->d;
- if(opt.dump_cooked | opt.dump_all) {
+ if(opt.dump_all) {
printf(" %s inj_virq vec %u %s\n",
ri->dump_header,
r->vector, r->fake?"fake":"real");
@@ -3956,24 +3930,12 @@ void hvm_io_address_summary(struct io_ad
void hvm_io_write_postprocess(struct hvm_data *h)
{
- if(opt.dump_cooked)
- {
- printf(" %s io_write port %x val %x\n",
- h->dump_header, h->inflight.io.port,
- h->inflight.io.val);
- }
if(opt.with_pio_enumeration)
update_io_address(&h->summary.io.pio, h->inflight.io.port, 1,
h->arc_cycles, 0);
}
void hvm_io_read_postprocess(struct hvm_data *h)
{
- if(opt.dump_cooked)
- {
- printf(" %s io_read port %x val %x\n",
- h->dump_header, h->inflight.io.port,
- h->inflight.io.val);
- }
if(opt.with_pio_enumeration)
update_io_address(&h->summary.io.pio, h->inflight.io.port, 0,
h->arc_cycles, 0);
if(opt.scatterplot_io && h->inflight.io.port == opt.scatterplot_io_port)
@@ -4275,24 +4237,6 @@ void hvm_cr_write_postprocess(struct hvm
}
flush=1;
}
-
- if(opt.dump_cooked)
- {
- printf(" %s cr_write cr3 val %llx oval %llx (%d resyncs) %s\n",
- h->dump_header,
- new_val,
- oval,
- h->resyncs,
- flush?"flush":"");
- }
- } else {
- if(opt.dump_cooked)
- {
- printf(" %s cr_write cr3 val %llx (%d resyncs)\n",
- h->dump_header,
- h->inflight.cr_write.val,
- h->resyncs);
- }
}
if(opt.summary_info) {
@@ -4313,14 +4257,6 @@ void hvm_cr_write_postprocess(struct hvm
if(!flush)
cr3_switch(new_val, h);
} else {
- if(opt.dump_cooked)
- {
- printf(" %s cr_write cr%d val %llx\n",
- h->dump_header,
- h->inflight.cr_write.cr,
- h->inflight.cr_write.val);
- }
-
if(opt.summary_info)
{
if(h->inflight.cr_write.cr < CR_MAX)
@@ -4420,14 +4356,6 @@ void hvm_msr_write_summary(struct hvm_da
void hvm_msr_write_postprocess(struct hvm_data *h)
{
- if(opt.dump_cooked)
- {
- printf(" %s msr_write msr %d val %llx\n",
- h->dump_header,
- h->inflight.msr.addr,
- h->inflight.msr.val);
- }
-
if(opt.summary_info) {
}
@@ -4466,14 +4394,6 @@ void hvm_msr_read_summary(struct hvm_dat
void hvm_msr_read_postprocess(struct hvm_data *h)
{
- if(opt.dump_cooked)
- {
- printf(" %s msr_read msr %d val %llx\n",
- h->dump_header,
- h->inflight.msr.addr,
- h->inflight.msr.val);
- }
-
if(opt.summary_info) {
}
@@ -4564,7 +4484,7 @@ void hvm_inj_exc_process(struct record_i
unsigned vec, ec;
} *r = (typeof(r))h->d;
- if ( opt.dump_cooked || opt.dump_all )
+ if ( opt.dump_all )
{
if(r->vec < HVM_TRAP_MAX)
printf(" %3u.%09u %s inj_exc trap %s ec %x\n",
@@ -4620,7 +4540,7 @@ void hvm_intr_process(struct hvm_data *h
h->inflight.intr.vec = vec;
- if ( opt.dump_cooked || opt.dump_all )
+ if ( opt.dump_all )
{
if ( vec < EXTERNAL_INTERRUPT_MAX &&
hvm_extint_vector_name[vec] )
@@ -4742,7 +4662,7 @@ void hvm_pf_inject_process(struct record
ec = r->x32.ec;
}
- if ( opt.dump_cooked || opt.dump_all )
+ if ( opt.dump_all )
{
printf(" %3u.%09u %s pf_inject%s guest_cr2 %llx guest_ec %x\n",
ri->t.s, ri->t.ns, pcpu_string(ri->cpu),
@@ -4938,7 +4858,7 @@ void hvm_handler_process(struct record_i
hvm_pf_inject_process(ri, h);
break;
case TRC_HVM_REINJ_VIRQ:
- if ( opt.dump_cooked || opt.dump_all )
+ if ( opt.dump_all )
{
printf(" %3u.%09u %s inj_virq vec %u\n",
ri->t.s, ri->t.ns, pcpu_string(ri->cpu),
@@ -4964,7 +4884,7 @@ void hvm_handler_process(struct record_i
} else if(opt.with_cr3_enumeration) {
fprintf(warn, "Warning: destroy_proc: don't know current cr3\n");
}
- if ( opt.dump_cooked || opt.dump_all )
+ if ( opt.dump_all )
{
printf(" %3u.%09u %s destroy_proc cur_cr3 %llx\n",
ri->t.s, ri->t.ns, pcpu_string(ri->cpu), h->v->cr3.val);
@@ -5681,18 +5601,6 @@ void shadow_emulate_postprocess(struct h
hvm_update_short_summary(h, HVM_SHORT_SUMMARY_EMULATE);
}
- if ( opt.dump_cooked )
- {
- printf(" %s emulate va %llx eip %llx%s lvl %d/%d corr %llx wval %llx
flags %s\n",
- h->dump_header, e->va,
- h->rip, find_symbol(h->rip),
- e->pt_level, h->v->guest_paging_levels,
- e->corresponding_va,
- e->wval,
- flag_string(e));
- }
-
-
if(opt.scatterplot_unpin_promote) {
if(e->flag_early_unshadow)
scatterplot_vs_time(h->exit_tsc, -10);
@@ -5906,14 +5814,6 @@ void shadow_unsync_postprocess(struct hv
update_summary(&h->summary.pf_xen_unsync[h->resyncs],
h->arc_cycles);
}
-
- if(opt.dump_cooked)
- {
- printf(" %s unsync gfn %llx %s (%d resyncs)\n",
- h->dump_header, e->gfn,
- h->resyncs?"(resync)":"",
- h->resyncs);
- }
}
@@ -6013,17 +5913,6 @@ void shadow_fixup_postprocess(struct hvm
hvm_update_short_summary(h, HVM_SHORT_SUMMARY_FIXUP);
}
- if ( opt.dump_cooked )
- {
- printf(" %s fixup%s va %llx eip %llx%s gl1e %llx flags %s\n",
- h->dump_header,
- e->flag_unsync?":unsync":"",
- e->va,
- h->rip, find_symbol(h->rip),
- e->gl1e,
- flag_string(e));
- }
-
if(opt.scatterplot_unpin_promote) {
if(h->prealloc_unpin)
scatterplot_vs_time(h->exit_tsc, 0);
@@ -6133,8 +6022,6 @@ void shadow_fixup_process(struct record_
void shadow_mmio_postprocess(struct hvm_data *h)
{
struct pf_xen_extra *e = &h->inflight.pf_xen;
- struct mmio_info *m = &h->inflight.mmio;
-
if ( opt.summary_info )
{
if(e->pf_case)
@@ -6148,28 +6035,6 @@ void shadow_mmio_postprocess(struct hvm_
if(opt.with_mmio_enumeration)
enumerate_mmio(h);
-
- if ( opt.dump_cooked )
- {
- if(m->data_valid)
- printf(" %s %smmio %s va %llx eip %llx%s gpa %llx data %x\n",
- h->dump_header,
- (e->pf_case==PF_XEN_FAST_MMIO)?"fast ":"",
- m->is_write?"write":"read",
- e->va,
- h->rip, find_symbol(h->rip),
- m->gpa,
- m->data);
- else
- printf(" %s %smmio %s va %llx eip %llx%s gpa %llx (no data)\n",
- h->dump_header,
- (e->pf_case==PF_XEN_FAST_MMIO)?"fast ":"",
- m->is_write?"write":"read",
- m->va,
- h->rip, find_symbol(h->rip),
- m->gpa);
- }
-
}
void shadow_mmio_process(struct record_info *ri, struct hvm_data *h)
@@ -6403,7 +6268,7 @@ void shadow_resync_process(struct record
unsigned long long gfn;
} *r = (typeof(r))ri->d;
- if(opt.dump_all || opt.dump_cooked)
+ if(opt.dump_all)
printf(" %s oos resync %s gfn %llx\n",
ri->dump_header,
(ri->event == TRC_SHADOW_RESYNC_FULL)?"full":"only",
@@ -6417,7 +6282,7 @@ void shadow_prealloc_unpin_process(struc
unsigned long long gfn;
} *r = (typeof(r))ri->d;
- if(opt.dump_all || opt.dump_cooked)
+ if(opt.dump_all)
printf(" %s prealloc-unpin gfn %llx\n",
ri->dump_header, r->gfn);
@@ -6435,7 +6300,7 @@ void shadow_wrmap_bf_process(struct reco
unsigned long long gfn;
} *r = (typeof(r))ri->d;
- if(opt.dump_all || opt.dump_cooked)
+ if(opt.dump_all)
printf(" %s wrmap-bf gfn %llx\n",
ri->dump_header, r->gfn);
@@ -6569,7 +6434,7 @@ void pv_hypercall_process(struct record_
pv->hypercall_count[eax]++;
}
- if(opt.dump_cooked || opt.dump_all) {
+ if(opt.dump_all) {
if(eax < HYPERCALL_MAX)
printf(" %s hypercall %2x (%s) eip %llx\n",
ri->dump_header, eax,
@@ -6616,7 +6481,7 @@ void pv_trap_process(struct record_info
pv->trap_count[trapnr]++;
}
- if(opt.dump_cooked || opt.dump_all) {
+ if(opt.dump_all) {
printf(" %s trap %x eip %llx",
ri->dump_header, trapnr, eip);
if(use_ec)
@@ -6673,7 +6538,7 @@ void pv_ptwr_emulation_process(struct re
return;
}
- if ( opt.dump_cooked || opt.dump_all )
+ if ( opt.dump_all )
{
printf(" %s ptwr l1e %llx eip %llx addr %llx\n",
ri->dump_header,
@@ -6711,7 +6576,7 @@ void pv_update_va_mapping_process(struct
e.flags = r->x32.flags;
}
- if ( opt.dump_cooked || opt.dump_all )
+ if ( opt.dump_all )
{
printf(" %s update_va_mapping l1e %llx va %llx flags %llx\n",
ri->dump_header,
@@ -6721,7 +6586,7 @@ void pv_update_va_mapping_process(struct
void pv_generic_process(struct record_info *ri, struct pv_data *pv) {
union pv_event pevt = { .event = ri->event };
- if ( opt.dump_cooked || opt.dump_all ) {
+ if ( opt.dump_all ) {
if(pevt.minor < PV_MAX && pv_name[pevt.minor])
printf(" %s %s",
ri->dump_header,
@@ -7145,7 +7010,7 @@ void sched_runstate_process(struct pcpu_
perfctrs = (ri->extra_words == 5);
- if(opt.dump_cooked || opt.dump_all) {
+ if(opt.dump_all) {
if( perfctrs ) {
printf(" %s %s {%lld,%lld} d%uv%u %s->%s\n",
ri->dump_header,
@@ -7199,9 +7064,6 @@ void sched_runstate_process(struct pcpu_
if(sevt.new_runstate == RUNSTATE_RUNNABLE
&& v->data_type == VCPU_DATA_HVM
&& v->hvm.vmexit_valid) {
- if(opt.dump_cooked)
- printf("%s: d%dv%d changing to state runnable, closing vmexit\n",
- __func__, r->dom, r->vcpu);
hvm_close_vmexit(&v->hvm, ri->tsc);
}
@@ -7408,7 +7270,7 @@ update:
cpi = ((double)run_cycles) / run_instr;
- if(opt.dump_cooked || opt.dump_all) {
+ if(opt.dump_all) {
printf(" cpi: %2.2lf ( %lld / %lld )\n",
cpi, run_cycles, run_instr);
}
@@ -7485,7 +7347,7 @@ void sched_switch_process(struct pcpu_in
unsigned int prev_dom, prev_vcpu, next_dom, next_vcpu;
} * r = (typeof(r))ri->d;
- if(opt.dump_cooked || opt.dump_all)
+ if(opt.dump_all)
printf("%s sched_switch prev d%uv%u next d%uv%u\n",
ri->dump_header,
r->prev_dom, r->prev_vcpu,
@@ -7786,7 +7648,7 @@ void mem_process(struct pcpu_info *p) {
mem_pod_superpage_splinter_process(p);
break;
default:
- if(opt.dump_all || opt.dump_cooked) {
+ if(opt.dump_all) {
dump_generic(stdout, ri);
}
@@ -7848,7 +7710,7 @@ void pm_process(struct pcpu_info *p) {
pcpu_string_draw(p);
break;
default:
- if(opt.dump_all || opt.dump_cooked) {
+ if(opt.dump_all) {
dump_generic(stdout, ri);
}
break;
@@ -8209,7 +8071,7 @@ void irq_process(struct pcpu_info *p) {
case TRC_HW_IRQ_CLEAR_VECTOR:
case TRC_HW_IRQ_MOVE_FINISH :
default:
- if(opt.dump_all || opt.dump_cooked) {
+ if(opt.dump_all) {
dump_generic(stdout, ri);
}
break;
@@ -8311,7 +8173,7 @@ void process_generic(struct record_info
error(ERR_STRICT, ri);
- if(opt.dump_cooked || opt.dump_all) {
+ if(opt.dump_all) {
dump_generic(stdout, ri);
}
}
@@ -8384,7 +8246,7 @@ void process_lost_records(struct pcpu_in
first_tsc = r->first_tsc;
- if(opt.dump_cooked || opt.dump_all)
+ if(opt.dump_all)
{
if(p->current)
printf(" %s lost_records count %d d%uv%u (cur d%dv%d) first_tsc
%lld\n",
@@ -8490,7 +8352,7 @@ void process_lost_records_end(struct pcp
* Update the information. */
if(ri->tsc > p->lost_record.tsc)
{
- if(opt.dump_cooked || opt.dump_all)
+ if(opt.dump_all)
printf(" %s lost_records end ---\n",
pcpu_string(p->pid));
@@ -8500,7 +8362,7 @@ void process_lost_records_end(struct pcp
int did = p->lost_record.did,
vid = p->lost_record.vid;
- if(opt.dump_cooked || opt.dump_all)
+ if(opt.dump_all)
printf(" %s lost_records end d%dv%d---\n",
pcpu_string(p->pid),
did, vid);
@@ -8523,7 +8385,7 @@ void process_lost_records_end(struct pcp
p->lost_record.seen_valid_schedule=0; /* Let next vcpu_next_update
know that
this one was inferred */
} else {
- if(opt.dump_cooked || opt.dump_all)
+ if(opt.dump_all)
printf(" %s lost_records end (domain
invalid)---\n",
pcpu_string(p->pid));
}
@@ -9026,7 +8888,7 @@ void process_record(struct pcpu_info *p)
process_record_tsc(p->order_tsc, ri);
- if(opt.dump_cooked || opt.dump_all)
+ if(opt.dump_all)
create_dump_header(ri, p);
@@ -9592,7 +9454,6 @@ void init_pcpus(void) {
enum {
OPT_NULL=0,
/* Dumping info */
- OPT_DUMP_COOKED,
OPT_DUMP_RAW_READS,
OPT_DUMP_RAW_PROCESS,
OPT_DUMP_NO_PROCESSING,
@@ -9765,10 +9626,6 @@ error_t cmd_parser(int key, char *arg, s
switch (key)
{
/* Dump group */
- case OPT_DUMP_COOKED:
- opt.dump_cooked = 1;
- G.output_defined = 1;
- break;
case OPT_DUMP_ALL:
opt.dump_all = 1;
G.output_defined = 1;
@@ -10157,11 +10014,6 @@ error_t cmd_parser(int key, char *arg, s
const struct argp_option cmd_opts[] = {
/* Dump group */
- { .name = "dump-cooked",
- .key = OPT_DUMP_COOKED,
- .group = OPT_GROUP_DUMP,
- .doc = "Dump a sanitized summary of vmexit/vmentry.", },
-
{ .name = "dump-all",
.key = OPT_DUMP_ALL,
.group = OPT_GROUP_DUMP,
@@ -10453,7 +10305,7 @@ int main(int argc, char *argv[]) {
if (G.symbol_file != NULL)
parse_symbol_file(G.symbol_file);
- if(opt.dump_cooked || opt.dump_all)
+ if(opt.dump_all)
warn = stdout;
init_pcpus();
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |