Revert 7693 "Add jmi field for packets discarded due to network error" breaks chromium's webrtc_cases.
TBR=guoweis@webrtc.org
BUG=N/A
Review URL: https://webrtc-codereview.appspot.com/25179004
git-svn-id: http://webrtc.googlecode.com/svn/trunk@7706 4adac7df-926f-26a2-2b94-8c16560cd09d
diff --git a/talk/app/webrtc/statscollector.cc b/talk/app/webrtc/statscollector.cc
index 4c19967..fefb0ad 100644
--- a/talk/app/webrtc/statscollector.cc
+++ b/talk/app/webrtc/statscollector.cc
@@ -164,8 +164,6 @@
"googRetransmitBitrate";
const char StatsReport::kStatsValueNameRtt[] = "googRtt";
const char StatsReport::kStatsValueNameSsrc[] = "ssrc";
-const char StatsReport::kStatsValueNameSendPacketsDiscarded[] =
- "packetsDiscardedOnSend";
const char StatsReport::kStatsValueNameTargetEncBitrate[] =
"googTargetEncBitrate";
const char StatsReport::kStatsValueNameTransmitBitrate[] =
@@ -888,10 +886,6 @@
channel_iter->connection_infos[i];
report->AddValue(StatsReport::kStatsValueNameBytesSent,
info.sent_total_bytes);
- report->AddValue(StatsReport::kStatsValueNameSendPacketsDiscarded,
- info.sent_discarded_packets);
- report->AddValue(StatsReport::kStatsValueNamePacketsSent,
- info.sent_total_packets);
report->AddValue(StatsReport::kStatsValueNameBytesReceived,
info.recv_total_bytes);
report->AddBoolean(StatsReport::kStatsValueNameWritable,
diff --git a/talk/app/webrtc/statstypes.h b/talk/app/webrtc/statstypes.h
index 0dbced6..8a1530a 100644
--- a/talk/app/webrtc/statstypes.h
+++ b/talk/app/webrtc/statstypes.h
@@ -255,7 +255,6 @@
static const char kStatsValueNameChannelId[];
static const char kStatsValueNameTrackId[];
static const char kStatsValueNameSsrc[];
- static const char kStatsValueNameSendPacketsDiscarded[];
static const char kStatsValueNameTypingNoiseState[];
static const char kStatsValueNameDer[];
static const char kStatsValueNameFingerprint[];
diff --git a/webrtc/p2p/base/p2ptransportchannel.cc b/webrtc/p2p/base/p2ptransportchannel.cc
index 94e3cb3..84a2420 100644
--- a/webrtc/p2p/base/p2ptransportchannel.cc
+++ b/webrtc/p2p/base/p2ptransportchannel.cc
@@ -842,8 +842,6 @@
info.rtt = connection->rtt();
info.sent_total_bytes = connection->sent_total_bytes();
info.sent_bytes_second = connection->sent_bytes_second();
- info.sent_discarded_packets = connection->sent_discarded_packets();
- info.sent_total_packets = connection->sent_total_packets();
info.recv_total_bytes = connection->recv_total_bytes();
info.recv_bytes_second = connection->recv_bytes_second();
info.local_candidate = connection->local_candidate();
diff --git a/webrtc/p2p/base/p2ptransportchannel_unittest.cc b/webrtc/p2p/base/p2ptransportchannel_unittest.cc
index 2e87aec..4f32719 100644
--- a/webrtc/p2p/base/p2ptransportchannel_unittest.cc
+++ b/webrtc/p2p/base/p2ptransportchannel_unittest.cc
@@ -1225,8 +1225,6 @@
EXPECT_TRUE(infos[0].readable);
EXPECT_TRUE(infos[0].writable);
EXPECT_FALSE(infos[0].timeout);
- EXPECT_EQ(10U, infos[0].sent_total_packets);
- EXPECT_EQ(0U, infos[0].sent_discarded_packets);
EXPECT_EQ(10 * 36U, infos[0].sent_total_bytes);
EXPECT_EQ(10 * 36U, infos[0].recv_total_bytes);
EXPECT_GT(infos[0].rtt, 0U);
diff --git a/webrtc/p2p/base/port.cc b/webrtc/p2p/base/port.cc
index 1cda7c1..d71d6fa 100644
--- a/webrtc/p2p/base/port.cc
+++ b/webrtc/p2p/base/port.cc
@@ -851,28 +851,15 @@
// Connection
//
-Connection::Connection(Port* port,
- size_t index,
+Connection::Connection(Port* port, size_t index,
const Candidate& remote_candidate)
- : port_(port),
- local_candidate_index_(index),
- remote_candidate_(remote_candidate),
- read_state_(STATE_READ_INIT),
- write_state_(STATE_WRITE_INIT),
- connected_(true),
- pruned_(false),
- use_candidate_attr_(false),
- remote_ice_mode_(ICEMODE_FULL),
- requests_(port->thread()),
- rtt_(DEFAULT_RTT),
- last_ping_sent_(0),
- last_ping_received_(0),
- last_data_received_(0),
- last_ping_response_received_(0),
- sent_packets_discarded_(0),
- sent_packets_total_(0),
- reported_(false),
- state_(STATE_WAITING) {
+ : port_(port), local_candidate_index_(index),
+ remote_candidate_(remote_candidate), read_state_(STATE_READ_INIT),
+ write_state_(STATE_WRITE_INIT), connected_(true), pruned_(false),
+ use_candidate_attr_(false), remote_ice_mode_(ICEMODE_FULL),
+ requests_(port->thread()), rtt_(DEFAULT_RTT), last_ping_sent_(0),
+ last_ping_received_(0), last_data_received_(0),
+ last_ping_response_received_(0), reported_(false), state_(STATE_WAITING) {
// All of our connections start in WAITING state.
// TODO(mallinath) - Start connections from STATE_FROZEN.
// Wire up to send stun packets
@@ -1361,14 +1348,6 @@
return send_rate_tracker_.total_units();
}
-size_t Connection::sent_discarded_packets() {
- return sent_packets_discarded_;
-}
-
-size_t Connection::sent_total_packets() {
- return sent_packets_total_;
-}
-
void Connection::MaybeAddPrflxCandidate(ConnectionRequest* request,
StunMessage* response) {
// RFC 5245
@@ -1444,13 +1423,11 @@
error_ = EWOULDBLOCK;
return SOCKET_ERROR;
}
- sent_packets_total_++;
int sent = port_->SendTo(data, size, remote_candidate_.address(),
options, true);
if (sent <= 0) {
ASSERT(sent < 0);
error_ = port_->GetError();
- sent_packets_discarded_++;
} else {
send_rate_tracker_.Update(sent);
}
diff --git a/webrtc/p2p/base/port.h b/webrtc/p2p/base/port.h
index 0026437..87072e6 100644
--- a/webrtc/p2p/base/port.h
+++ b/webrtc/p2p/base/port.h
@@ -453,10 +453,6 @@
size_t sent_total_bytes();
size_t sent_bytes_second();
- // Used to track how many packets are discarded in the application socket due
- // to errors.
- size_t sent_discarded_packets();
- size_t sent_total_packets();
size_t recv_total_bytes();
size_t recv_bytes_second();
sigslot::signal1<Connection*> SignalStateChange;
@@ -583,8 +579,6 @@
rtc::RateTracker recv_rate_tracker_;
rtc::RateTracker send_rate_tracker_;
- uint32 sent_packets_discarded_;
- uint32 sent_packets_total_;
private:
void MaybeAddPrflxCandidate(ConnectionRequest* request,
diff --git a/webrtc/p2p/base/tcpport.cc b/webrtc/p2p/base/tcpport.cc
index 89265d7..c5891f2 100644
--- a/webrtc/p2p/base/tcpport.cc
+++ b/webrtc/p2p/base/tcpport.cc
@@ -272,10 +272,8 @@
error_ = EWOULDBLOCK;
return SOCKET_ERROR;
}
- sent_packets_total_++;
int sent = socket_->Send(data, size, options);
if (sent < 0) {
- sent_packets_discarded_++;
error_ = socket_->GetError();
} else {
send_rate_tracker_.Update(sent);
diff --git a/webrtc/p2p/base/transport.h b/webrtc/p2p/base/transport.h
index 1091cb0..ab772fe 100644
--- a/webrtc/p2p/base/transport.h
+++ b/webrtc/p2p/base/transport.h
@@ -132,8 +132,6 @@
rtt(0),
sent_total_bytes(0),
sent_bytes_second(0),
- sent_discarded_packets(0),
- sent_total_packets(0),
recv_total_bytes(0),
recv_bytes_second(0),
key(NULL) {}
@@ -146,11 +144,6 @@
size_t rtt; // The STUN RTT for this connection.
size_t sent_total_bytes; // Total bytes sent on this connection.
size_t sent_bytes_second; // Bps over the last measurement interval.
- size_t sent_discarded_packets; // Number of outgoing packets discarded due to
- // socket errors.
- size_t sent_total_packets; // Number of total outgoing packets attempted for
- // sending.
-
size_t recv_total_bytes; // Total bytes received on this connection.
size_t recv_bytes_second; // Bps over the last measurement interval.
Candidate local_candidate; // The local candidate for this connection.
