Revert "Reland "Port: migrate to TaskQueue.""
This reverts commit e2ab77ba57bff5db8eaa7a8442fa6b2f43914b69.
See bugs, this CL seems to be the culprit of crashes in
cricket::TurnPort::OnMessage and
jingle_glue::JingleThreadWrapper::Dispatch.
TBR=handellm@webrtc.org, hta@webrtc.org
Bug: chromium:1227839, chromium:1228462
Change-Id: I7521210970fe543a01682bb08de31ac025e79981
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/225880
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#34462}
diff --git a/p2p/base/port.cc b/p2p/base/port.cc
index 9b2adaf..a03a0d6 100644
--- a/p2p/base/port.cc
+++ b/p2p/base/port.cc
@@ -32,7 +32,6 @@
#include "rtc_base/string_encode.h"
#include "rtc_base/string_utils.h"
#include "rtc_base/strings/string_builder.h"
-#include "rtc_base/task_utils/to_queued_task.h"
#include "rtc_base/third_party/base64/base64.h"
#include "rtc_base/trace_event.h"
#include "system_wrappers/include/field_trial.h"
@@ -174,13 +173,15 @@
network_->SignalTypeChanged.connect(this, &Port::OnNetworkTypeChanged);
network_cost_ = network_->GetCost();
- ScheduleDelayedDestructionIfDead();
+ thread_->PostDelayed(RTC_FROM_HERE, timeout_delay_, this,
+ MSG_DESTROY_IF_DEAD);
RTC_LOG(LS_INFO) << ToString() << ": Port created with network cost "
<< network_cost_;
}
Port::~Port() {
RTC_DCHECK_RUN_ON(thread_);
+ CancelPendingTasks();
// Delete all of the remaining connections. We copy the list up front
// because each deletion will cause it to be modified.
@@ -821,11 +822,19 @@
void Port::Prune() {
state_ = State::PRUNED;
- thread_->PostTask(webrtc::ToQueuedTask(safety_, [this] { DestroyIfDead(); }));
+ thread_->Post(RTC_FROM_HERE, this, MSG_DESTROY_IF_DEAD);
}
-void Port::DestroyIfDead() {
+// Call to stop any currently pending operations from running.
+void Port::CancelPendingTasks() {
+ TRACE_EVENT0("webrtc", "Port::CancelPendingTasks");
RTC_DCHECK_RUN_ON(thread_);
+ thread_->Clear(this);
+}
+
+void Port::OnMessage(rtc::Message* pmsg) {
+ RTC_DCHECK_RUN_ON(thread_);
+ RTC_DCHECK(pmsg->message_id == MSG_DESTROY_IF_DEAD);
bool dead =
(state_ == State::INIT || state_ == State::PRUNED) &&
connections_.empty() &&
@@ -849,12 +858,6 @@
UpdateNetworkCost();
}
-void Port::ScheduleDelayedDestructionIfDead() {
- thread_->PostDelayedTask(
- webrtc::ToQueuedTask(safety_, [this] { DestroyIfDead(); }),
- timeout_delay_);
-}
-
std::string Port::ToString() const {
rtc::StringBuilder ss;
ss << "Port[" << rtc::ToHex(reinterpret_cast<uintptr_t>(this)) << ":"
@@ -905,7 +908,8 @@
// not cause the Port to be destroyed.
if (connections_.empty()) {
last_time_all_connections_removed_ = rtc::TimeMillis();
- ScheduleDelayedDestructionIfDead();
+ thread_->PostDelayed(RTC_FROM_HERE, timeout_delay_, this,
+ MSG_DESTROY_IF_DEAD);
}
}
diff --git a/p2p/base/port.h b/p2p/base/port.h
index 9a0073a..2c18f1a 100644
--- a/p2p/base/port.h
+++ b/p2p/base/port.h
@@ -41,7 +41,6 @@
#include "rtc_base/rate_tracker.h"
#include "rtc_base/socket_address.h"
#include "rtc_base/system/rtc_export.h"
-#include "rtc_base/task_utils/pending_task_safety_flag.h"
#include "rtc_base/third_party/sigslot/sigslot.h"
#include "rtc_base/thread.h"
#include "rtc_base/weak_ptr.h"
@@ -172,6 +171,7 @@
// connections to similar mechanisms of the other client. Subclasses of this
// one add support for specific mechanisms like local UDP ports.
class Port : public PortInterface,
+ public rtc::MessageHandler,
public sigslot::has_slots<> {
public:
// INIT: The state when a port is just created.
@@ -220,6 +220,9 @@
// Allows a port to be destroyed if no connection is using it.
void Prune();
+ // Call to stop any currently pending operations from running.
+ void CancelPendingTasks();
+
// The thread on which this port performs its I/O.
rtc::Thread* thread() { return thread_; }
@@ -325,6 +328,8 @@
// Called if the port has no connections and is no longer useful.
void Destroy();
+ void OnMessage(rtc::Message* pmsg) override;
+
// Debugging description of this port
std::string ToString() const override;
uint16_t min_port() { return min_port_; }
@@ -375,6 +380,8 @@
const rtc::SocketAddress& base_address);
protected:
+ enum { MSG_DESTROY_IF_DEAD = 0, MSG_FIRST_AVAILABLE };
+
virtual void UpdateNetworkCost();
void set_type(const std::string& type) { type_ = type; }
@@ -441,9 +448,8 @@
void Construct();
// Called when one of our connections deletes itself.
void OnConnectionDestroyed(Connection* conn);
+
void OnNetworkTypeChanged(const rtc::Network* network);
- void ScheduleDelayedDestructionIfDead();
- void DestroyIfDead();
rtc::Thread* const thread_;
rtc::PacketSocketFactory* const factory_;
@@ -493,7 +499,6 @@
friend class Connection;
webrtc::CallbackList<PortInterface*> port_destroyed_callback_list_;
- webrtc::ScopedTaskSafety safety_;
};
} // namespace cricket
diff --git a/p2p/base/turn_port.cc b/p2p/base/turn_port.cc
index a018caa..33925d4 100644
--- a/p2p/base/turn_port.cc
+++ b/p2p/base/turn_port.cc
@@ -990,7 +990,7 @@
Close();
break;
default:
- RTC_NOTREACHED();
+ Port::OnMessage(message);
}
}
diff --git a/p2p/base/turn_port.h b/p2p/base/turn_port.h
index 8ed7cef..55dbda5 100644
--- a/p2p/base/turn_port.h
+++ b/p2p/base/turn_port.h
@@ -25,7 +25,6 @@
#include "p2p/client/basic_port_allocator.h"
#include "rtc_base/async_packet_socket.h"
#include "rtc_base/async_resolver_interface.h"
-#include "rtc_base/message_handler.h"
#include "rtc_base/ssl_certificate.h"
#include "rtc_base/task_utils/pending_task_safety_flag.h"
@@ -42,7 +41,7 @@
class TurnAllocateRequest;
class TurnEntry;
-class TurnPort : public Port, public rtc::MessageHandler {
+class TurnPort : public Port {
public:
enum PortState {
STATE_CONNECTING, // Initial state, cannot send any packets.
@@ -299,7 +298,7 @@
private:
enum {
- MSG_ALLOCATE_ERROR,
+ MSG_ALLOCATE_ERROR = MSG_FIRST_AVAILABLE,
MSG_ALLOCATE_MISMATCH,
MSG_TRY_ALTERNATE_SERVER,
MSG_REFRESH_ERROR,
