diff -r 10175d5f35ea -r ed8b490b5bc3 tool/CommandMaster.cpp --- a/tool/CommandMaster.cpp Tue Mar 09 09:59:32 2010 +0100 +++ b/tool/CommandMaster.cpp Tue Mar 09 10:22:32 2010 +0100 @@ -131,31 +131,44 @@ << (data.devices[i].link_state ? "UP" : "DOWN") << endl << " Tx count: " << data.devices[i].tx_count << endl << " Rx count: " << data.devices[i].rx_count << endl - << " Tx rate [frames/s]: " + << " Tx bytes: " << data.devices[i].tx_bytes << endl + << " Tx errors: " << data.devices[i].tx_errors << endl + << " Tx frame rate [1/s]: " << setfill(' ') << setprecision(0) << fixed; for (j = 0; j < EC_RATE_COUNT; j++) { - cout << setw(5) << data.devices[i].tx_rates[j] / 1000.0; + cout << + setw(5) << data.devices[i].tx_frame_rates[j] / 1000.0; if (j < EC_RATE_COUNT - 1) { cout << " "; } } cout << endl - << " Loss rate [frames/s]: " + << " Tx rate [KByte/s]: " << setprecision(0) << fixed; for (j = 0; j < EC_RATE_COUNT; j++) { + cout << + setw(5) << data.devices[i].tx_byte_rates[j] / 1000.0; + if (j < EC_RATE_COUNT - 1) { + cout << " "; + } + } + cout << endl + << " Loss rate [1/s]: " + << setprecision(0) << fixed; + for (j = 0; j < EC_RATE_COUNT; j++) { cout << setw(5) << data.devices[i].loss_rates[j] / 1000.0; if (j < EC_RATE_COUNT - 1) { cout << " "; } } cout << endl - << " Frame loss [%]: " + << " Frame loss [%]: " << setprecision(1) << fixed; for (j = 0; j < EC_RATE_COUNT; j++) { double perc = 0.0; - if (data.devices[i].tx_rates[j]) { + if (data.devices[i].tx_frame_rates[j]) { perc = 100.0 * data.devices[i].loss_rates[j] / - data.devices[i].tx_rates[j]; + data.devices[i].tx_frame_rates[j]; } cout << setw(5) << perc; if (j < EC_RATE_COUNT - 1) {