livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

viewer#2985 Odd crash when notifying voice observers 

Crash points at enableDisableCallBtn, but button's floater was cleaned
earlier and has a removeObserver call so an observer record should be
long gone. Likely something else is going on.
Went over various callbacks and made sure they are cleaned. But in case
floater somehow remained, added mSession = nullptr.
master
Andrey Kleshchev 2024-11-01 01:29:06 +02:00 committed by Andrey Kleshchev
parent cbd713037e
commit 0114be2c15
15 changed files with 86 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llappviewer.cpp
View File

@ -5151,10 +5151,7 @@ void LLAppViewer::sendLogoutRequest()
gLogoutMaxTime = LOGOUT_REQUEST_TIME;
mLogoutRequestSent = true;
if(LLVoiceClient::instanceExists())
{
LLVoiceClient::getInstance()->setVoiceEnabled(false);
}
LLVoiceClient::setVoiceEnabled(false);
}
}

2
indra/newview/llchiclet.cpp
View File

@ -511,7 +511,7 @@ bool LLChicletPanel::postBuild()
LLScriptFloaterManager::getInstance()->addNewObjectCallback(boost::bind(&LLChicletPanel::objectChicletCallback, this, _1));
LLScriptFloaterManager::getInstance()->addToggleObjectFloaterCallback(boost::bind(&LLChicletPanel::objectChicletCallback, this, _1));
LLIMChiclet::sFindChicletsSignal.connect(boost::bind(&LLChicletPanel::findChiclet<LLChiclet>, this, _1));
LLVoiceChannel::setCurrentVoiceChannelChangedCallback(boost::bind(&LLChicletPanel::onCurrentVoiceChannelChanged, this, _1));
mVoiceChannelChanged = LLVoiceChannel::setCurrentVoiceChannelChangedCallback(boost::bind(&LLChicletPanel::onCurrentVoiceChannelChanged, this, _1));
mLeftScrollButton=getChild<LLButton>("chicklet_left_scroll_button");
LLTransientFloaterMgr::getInstance()->addControlView(mLeftScrollButton);

2
indra/newview/llchiclet.h
View File

@ -822,6 +822,8 @@ protected:
S32 mMinWidth;
bool mShowControls;
static const S32 s_scroll_ratio;
boost::signals2::connection mVoiceChannelChanged;
};
template<class T>

16
indra/newview/llconversationlog.cpp
View File

@ -190,6 +190,22 @@ LLConversationLog::LLConversationLog() :
{
}
LLConversationLog::~LLConversationLog()
{
if (mLoggingEnabled)
{
if (LLIMMgr::instanceExists())
{
LLIMMgr::instance().removeSessionObserver(this);
}
LLAvatarTracker::instance().removeObserver(mFriendObserver);
}
if (mAvatarNameCacheConnection.connected())
{
mAvatarNameCacheConnection.disconnect();
}
}
void LLConversationLog::enableLogging(S32 log_mode)
{
mLoggingEnabled = log_mode > 0;

8
indra/newview/llconversationlog.h
View File

@ -166,13 +166,7 @@ public:
private:
virtual ~LLConversationLog()
{
if (mAvatarNameCacheConnection.connected())
{
mAvatarNameCacheConnection.disconnect();
}
}
virtual ~LLConversationLog();
void enableLogging(S32 log_mode);

1
indra/newview/llfloaterimsession.cpp
View File

@ -638,6 +638,7 @@ void LLFloaterIMSession::onClose(bool app_quitting)
// Last change:
// EXT-3516 X Button should end IM session, _ button should hide
gIMMgr->leaveSession(mSessionID);
mSession = nullptr; // leaveSession should have deleted it.
// *TODO: Study why we need to restore the floater before we close it.
// Might be because we want to save some state data in some clean open state.
LLFloaterIMSessionTab::restoreFloater();

22
indra/newview/llfloaterimsessiontab.cpp
View File

@ -80,6 +80,7 @@ LLFloaterIMSessionTab::LLFloaterIMSessionTab(const LLSD& session_id)
{
setAutoFocus(false);
mSession = LLIMModel::getInstance()->findIMSession(mSessionID);
LLIMMgr::instance().addSessionObserver(this);
mCommitCallbackRegistrar.add("IMSession.Menu.Action",
boost::bind(&LLFloaterIMSessionTab::onIMSessionMenuItemClicked, this, _2));
@ -102,6 +103,7 @@ LLFloaterIMSessionTab::LLFloaterIMSessionTab(const LLSD& session_id)
LLFloaterIMSessionTab::~LLFloaterIMSessionTab()
{
delete mRefreshTimer;
LLIMMgr::instance().removeSessionObserver(this);
LLFloaterIMContainer* im_container = LLFloaterIMContainer::findInstance();
if (im_container)
@ -440,7 +442,10 @@ void LLFloaterIMSessionTab::enableDisableCallBtn()
bool enable = false;
if (mSessionID.notNull() && mSession && mSession->mSessionInitialized && mSession->mCallBackEnabled)
if (mSessionID.notNull()
&& mSession
&& mSession->mSessionInitialized
&& mSession->mCallBackEnabled)
{
if (mVoiceButtonHangUpMode)
{
@ -450,9 +455,10 @@ void LLFloaterIMSessionTab::enableDisableCallBtn()
else
{
// We allow to start call from this state only
if (mSession->mVoiceChannel &&
!mSession->mVoiceChannel->callStarted() &&
LLVoiceClient::instanceExists())
if (LLVoiceClient::instanceExists() &&
mSession->mVoiceChannel &&
!mSession->mVoiceChannel->callStarted()
)
{
LLVoiceClient* client = LLVoiceClient::getInstance();
if (client->voiceEnabled() && client->isVoiceWorking())
@ -1366,6 +1372,14 @@ LLView* LLFloaterIMSessionTab::getChatHistory()
return mChatHistory;
}
void LLFloaterIMSessionTab::sessionRemoved(const LLUUID& session_id)
{
if (session_id == mSessionID)
{
mSession = nullptr;
}
}
bool LLFloaterIMSessionTab::handleKeyHere(KEY key, MASK mask )
{
bool handled = false;

30
indra/newview/llfloaterimsessiontab.h
View File

@ -45,6 +45,7 @@ class LLPanelEmojiComplete;
class LLFloaterIMSessionTab
: public LLTransientDockableFloater
, public LLIMSessionObserver
{
using super = LLTransientDockableFloater;
@ -76,13 +77,13 @@ public:
bool isNearbyChat() {return mIsNearbyChat;}
// LLFloater overrides
/*virtual*/ void onOpen(const LLSD& key);
/*virtual*/ bool postBuild();
/*virtual*/ void draw();
/*virtual*/ void setVisible(bool visible);
/*virtual*/ void setFocus(bool focus);
/*virtual*/ void closeFloater(bool app_quitting = false);
/*virtual*/ void deleteAllChildren();
void onOpen(const LLSD& key) override;
bool postBuild() override;
void draw() override;
void setVisible(bool visible) override;
void setFocus(bool focus) override;
void closeFloater(bool app_quitting = false) override;
void deleteAllChildren() override;
// Handle the left hand participant list widgets
void addConversationViewParticipant(LLConversationItem* item, bool update_view = true);
@ -98,7 +99,7 @@ public:
virtual void updateMessages() {}
LLConversationItem* getCurSelectedViewModelItem();
void forceReshape();
virtual bool handleKeyHere( KEY key, MASK mask );
virtual bool handleKeyHere( KEY key, MASK mask ) override;
bool isMessagePaneExpanded(){return mMessagePaneExpanded;}
void setMessagePaneExpanded(bool expanded){mMessagePaneExpanded = expanded;}
void restoreFloater();
@ -108,6 +109,13 @@ public:
LLView* getChatHistory();
// LLIMSessionObserver triggers
virtual void sessionAdded(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id, bool has_offline_msg) override {}; // Stub
virtual void sessionActivated(const LLUUID& session_id, const std::string& name, const LLUUID& other_participant_id) override {}; // Stub
virtual void sessionRemoved(const LLUUID& session_id) override;
virtual void sessionVoiceOrIMStarted(const LLUUID& session_id) override {}; // Stub
virtual void sessionIDUpdated(const LLUUID& old_session_id, const LLUUID& new_session_id) override {}; // Stub
protected:
// callback for click on any items of the visual states menu
@ -139,8 +147,8 @@ protected:
virtual void enableDisableCallBtn();
// process focus events to set a currently active session
/* virtual */ void onFocusReceived();
/* virtual */ void onFocusLost();
void onFocusReceived() override;
void onFocusLost() override;
// prepare chat's params and out one message to chatHistory
void appendMessage(const LLChat& chat, const LLSD& args = LLSD());
@ -212,7 +220,7 @@ private:
void getSelectedUUIDs(uuid_vec_t& selected_uuids);
/// Refreshes the floater at a constant rate.
virtual void refresh() = 0;
virtual void refresh() override = 0;
/**
* Adjusts chat history height to fit vertically with input chat field

3
indra/newview/llimview.cpp
View File

@ -796,7 +796,6 @@ LLIMModel::LLIMSession::LLIMSession(const LLUUID& session_id,
void LLIMModel::LLIMSession::initVoiceChannel(const LLSD& voiceChannelInfo)
{
if (mVoiceChannel)
{
if (mVoiceChannel->isThisVoiceChannel(voiceChannelInfo))
@ -2344,7 +2343,7 @@ LLCallDialogManager::~LLCallDialogManager()
void LLCallDialogManager::initSingleton()
{
LLVoiceChannel::setCurrentVoiceChannelChangedCallback(LLCallDialogManager::onVoiceChannelChanged);
mVoiceChannelChanged = LLVoiceChannel::setCurrentVoiceChannelChangedCallback(LLCallDialogManager::onVoiceChannelChanged);
}
// static

2
indra/newview/llimview.h
View File

@ -548,6 +548,8 @@ protected:
std::string mCurrentSessionlName;
LLIMModel::LLIMSession* mSession;
LLVoiceChannel::EState mOldState;
boost::signals2::connection mVoiceChannelChanged;
};
class LLCallDialog : public LLDockableFloater

4
indra/newview/llspeakingindicatormanager.cpp
View File

@ -133,6 +133,8 @@ private:
* @see onChange()
*/
speaker_ids_t mSwitchedIndicatorsOn;
boost::signals2::connection mVoiceChannelChanged;
};
//////////////////////////////////////////////////////////////////////////
@ -181,7 +183,7 @@ void SpeakingIndicatorManager::unregisterSpeakingIndicator(const LLUUID& speaker
//////////////////////////////////////////////////////////////////////////
SpeakingIndicatorManager::SpeakingIndicatorManager()
{
LLVoiceChannel::setCurrentVoiceChannelChangedCallback(boost::bind(&SpeakingIndicatorManager::sOnCurrentChannelChanged, this, _1));
mVoiceChannelChanged = LLVoiceChannel::setCurrentVoiceChannelChangedCallback(boost::bind(&SpeakingIndicatorManager::sOnCurrentChannelChanged, this, _1));
LLVoiceClient::addObserver(this);
}

3
indra/newview/llvoicechannel.cpp
View File

@ -80,9 +80,8 @@ LLVoiceChannel::~LLVoiceChannel()
if (sCurrentVoiceChannel == this)
{
sCurrentVoiceChannel = NULL;
// Must check instance exists here, the singleton MAY have already been destroyed.
LLVoiceClient::removeObserver(this);
}
LLVoiceClient::removeObserver(this);
sVoiceChannelMap.erase(mSessionID);
}

16
indra/newview/llvoiceclient.cpp
View File

@ -171,7 +171,11 @@ void LLVoiceClient::init(LLPumpIO *pump)
void LLVoiceClient::userAuthorized(const std::string& user_id, const LLUUID &agentID)
{
gAgent.addRegionChangedCallback(boost::bind(&LLVoiceClient::onRegionChanged, this));
if (mRegionChangedCallbackSlot.connected())
{
mRegionChangedCallbackSlot.disconnect();
}
mRegionChangedCallbackSlot = gAgent.addRegionChangedCallback(boost::bind(&LLVoiceClient::onRegionChanged, this));
LLWebRTCVoiceClient::getInstance()->userAuthorized(user_id, agentID);
LLVivoxVoiceClient::getInstance()->userAuthorized(user_id, agentID);
}
@ -608,8 +612,14 @@ bool LLVoiceClient::voiceEnabled()
void LLVoiceClient::setVoiceEnabled(bool enabled)
{
LLWebRTCVoiceClient::getInstance()->setVoiceEnabled(enabled);
LLVivoxVoiceClient::getInstance()->setVoiceEnabled(enabled);
if (LLWebRTCVoiceClient::instanceExists())
{
LLWebRTCVoiceClient::getInstance()->setVoiceEnabled(enabled);
}
if (LLVivoxVoiceClient::instanceExists())
{
LLVivoxVoiceClient::getInstance()->setVoiceEnabled(enabled);
}
}
void LLVoiceClient::updateMicMuteLogic()

3
indra/newview/llvoiceclient.h
View File

@ -438,7 +438,7 @@ public:
bool getUserPTTState();
void toggleUserPTTState(void);
void inputUserControlState(bool down); // interpret any sort of up-down mic-open control input according to ptt-toggle prefs
void setVoiceEnabled(bool enabled);
static void setVoiceEnabled(bool enabled);
void setUsePTT(bool usePTT);
void setPTTIsToggle(bool PTTIsToggle);
@ -519,6 +519,7 @@ protected:
LLPumpIO *m_servicePump;
boost::signals2::connection mSimulatorFeaturesReceivedSlot;
boost::signals2::connection mRegionChangedCallbackSlot;
LLCachedControl<bool> mVoiceEffectEnabled;
LLCachedControl<std::string> mVoiceEffectDefault;

7
indra/newview/llvoicewebrtc.cpp
View File

@ -258,6 +258,8 @@ void LLWebRTCVoiceClient::cleanupSingleton()
}
cleanUp();
sessionState::clearSessions();
mStatusObservers.clear();
}
//---------------------------------------------------
@ -403,8 +405,9 @@ void LLWebRTCVoiceClient::notifyStatusObservers(LLVoiceClientStatusObserver::ESt
LL_DEBUGS("Voice") << "( " << LLVoiceClientStatusObserver::status2string(status) << " )"
<< " mSession=" << mSession << LL_ENDL;
bool in_spatial_channel = inSpatialChannel();
LL_DEBUGS("Voice") << " " << LLVoiceClientStatusObserver::status2string(status) << ", session channelInfo "
<< getAudioSessionChannelInfo() << ", proximal is " << inSpatialChannel() << LL_ENDL;
<< getAudioSessionChannelInfo() << ", proximal is " << in_spatial_channel << LL_ENDL;
mIsProcessingChannels = status == LLVoiceClientStatusObserver::STATUS_JOINED;
@ -412,7 +415,7 @@ void LLWebRTCVoiceClient::notifyStatusObservers(LLVoiceClientStatusObserver::ESt
for (status_observer_set_t::iterator it = mStatusObservers.begin(); it != mStatusObservers.end();)
{
LLVoiceClientStatusObserver *observer = *it;
observer->onChange(status, channelInfo, inSpatialChannel());
observer->onChange(status, channelInfo, in_spatial_channel);
// In case onError() deleted an entry.
it = mStatusObservers.upper_bound(observer);
}