mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-08 19:04:45 +00:00
Bug 1556795: Add some thread assertions, and remove an unused member. r=ng
Differential Revision: https://phabricator.services.mozilla.com/D35049 --HG-- extra : moz-landing-system : lando
This commit is contained in:
parent
2ae75bd3ee
commit
e3a896998c
@ -1218,6 +1218,7 @@ bool DataChannelConnection::SendDeferredMessages() {
|
|||||||
|
|
||||||
// This may block while something is modifying channels, but should not block
|
// This may block while something is modifying channels, but should not block
|
||||||
// for IO
|
// for IO
|
||||||
|
ASSERT_WEBRTC(!NS_IsMainThread());
|
||||||
mLock.AssertCurrentThreadOwns();
|
mLock.AssertCurrentThreadOwns();
|
||||||
|
|
||||||
LOG(("SendDeferredMessages called, pending type: %d", mPendingType));
|
LOG(("SendDeferredMessages called, pending type: %d", mPendingType));
|
||||||
@ -1320,6 +1321,7 @@ void DataChannelConnection::HandleOpenRequestMessage(
|
|||||||
uint32_t prValue;
|
uint32_t prValue;
|
||||||
uint16_t prPolicy;
|
uint16_t prPolicy;
|
||||||
|
|
||||||
|
ASSERT_WEBRTC(!NS_IsMainThread());
|
||||||
mLock.AssertCurrentThreadOwns();
|
mLock.AssertCurrentThreadOwns();
|
||||||
|
|
||||||
const size_t requiredLength = (sizeof(*req) - 1) + ntohs(req->label_length) +
|
const size_t requiredLength = (sizeof(*req) - 1) + ntohs(req->label_length) +
|
||||||
@ -2097,6 +2099,7 @@ void DataChannelConnection::HandleStreamResetEvent(
|
|||||||
|
|
||||||
void DataChannelConnection::HandleStreamChangeEvent(
|
void DataChannelConnection::HandleStreamChangeEvent(
|
||||||
const struct sctp_stream_change_event* strchg) {
|
const struct sctp_stream_change_event* strchg) {
|
||||||
|
ASSERT_WEBRTC(!NS_IsMainThread());
|
||||||
if (strchg->strchange_flags == SCTP_STREAM_CHANGE_DENIED) {
|
if (strchg->strchange_flags == SCTP_STREAM_CHANGE_DENIED) {
|
||||||
LOG(("*** Failed increasing number of streams from %zu (%u/%u)",
|
LOG(("*** Failed increasing number of streams from %zu (%u/%u)",
|
||||||
mNegotiatedIdLimit, strchg->strchange_instrms,
|
mNegotiatedIdLimit, strchg->strchange_instrms,
|
||||||
@ -2247,6 +2250,7 @@ already_AddRefed<DataChannel> DataChannelConnection::Open(
|
|||||||
const nsACString& label, const nsACString& protocol, Type type,
|
const nsACString& label, const nsACString& protocol, Type type,
|
||||||
bool inOrder, uint32_t prValue, DataChannelListener* aListener,
|
bool inOrder, uint32_t prValue, DataChannelListener* aListener,
|
||||||
nsISupports* aContext, bool aExternalNegotiated, uint16_t aStream) {
|
nsISupports* aContext, bool aExternalNegotiated, uint16_t aStream) {
|
||||||
|
ASSERT_WEBRTC(NS_IsMainThread());
|
||||||
if (!aExternalNegotiated) {
|
if (!aExternalNegotiated) {
|
||||||
if (mAllocateEven.isSome()) {
|
if (mAllocateEven.isSome()) {
|
||||||
aStream = FindFreeStream();
|
aStream = FindFreeStream();
|
||||||
|
@ -414,7 +414,6 @@ class DataChannel {
|
|||||||
mNegotiated(negotiated),
|
mNegotiated(negotiated),
|
||||||
mOrdered(ordered),
|
mOrdered(ordered),
|
||||||
mFlags(0),
|
mFlags(0),
|
||||||
mId(0),
|
|
||||||
mIsRecvBinary(false),
|
mIsRecvBinary(false),
|
||||||
mBufferedThreshold(0), // default from spec
|
mBufferedThreshold(0), // default from spec
|
||||||
mBufferedAmount(0),
|
mBufferedAmount(0),
|
||||||
@ -520,7 +519,6 @@ class DataChannel {
|
|||||||
const bool mNegotiated;
|
const bool mNegotiated;
|
||||||
const bool mOrdered;
|
const bool mOrdered;
|
||||||
uint32_t mFlags;
|
uint32_t mFlags;
|
||||||
uint32_t mId;
|
|
||||||
bool mIsRecvBinary;
|
bool mIsRecvBinary;
|
||||||
size_t mBufferedThreshold;
|
size_t mBufferedThreshold;
|
||||||
// Read/written on main only. Decremented via message-passing, because the
|
// Read/written on main only. Decremented via message-passing, because the
|
||||||
|
Loading…
Reference in New Issue
Block a user