Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#3591 More test coverage for crashes #3613

Merged
merged 1 commit into from
Feb 25, 2025
+68 −1
Merged

#3591 More test coverage for crashes #3613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions indra/newview/llappviewer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5611,6 +5611,27 @@ void LLAppViewer::forceErrorCoroutineCrash()
LLCoros::instance().launch("LLAppViewer::crashyCoro", [] {throw LLException("A deliberate crash from LLCoros"); });
}

void LLAppViewer::forceErrorCoroprocedureCrash()
{
LL_WARNS() << "Forcing a crash in LLCoprocedureManager" << LL_ENDL;
LLCoprocedureManager::instance().enqueueCoprocedure("Upload", "DeliberateCrash",
[](LLCoreHttpUtil::HttpCoroutineAdapter::ptr_t&, const LLUUID&)
{
LL_WARNS() << "Forcing a deliberate bad memory access from LLCoprocedureManager" << LL_ENDL;
S32* crash = NULL;
*crash = 0xDEADBEEF;
});
}

void LLAppViewer::forceErrorWorkQueueCrash()
{
LL::WorkQueue::ptr_t workqueue = LL::WorkQueue::getInstance("General");
if (workqueue)
{
workqueue->post([]() { throw LLException("This is a deliberate crash from General Queue"); });
}
}

void LLAppViewer::forceErrorThreadCrash()
{
class LLCrashTestThread : public LLThread
Expand Down
2 changes: 2 additions & 0 deletions indra/newview/llappviewer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,8 @@ class LLAppViewer : public LLApp
virtual void forceErrorOSSpecificException();
virtual void forceErrorDriverCrash();
virtual void forceErrorCoroutineCrash();
virtual void forceErrorCoroprocedureCrash();
virtual void forceErrorWorkQueueCrash();
virtual void forceErrorThreadCrash();

// The list is found in app_settings/settings_files.xml
Expand Down
32 changes: 32 additions & 0 deletions indra/newview/llviewermenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,8 @@ void force_error_software_exception();
void force_error_os_exception();
void force_error_driver_crash();
void force_error_coroutine_crash();
void force_error_coroprocedure_crash();
void force_error_work_queue_crash();
void force_error_thread_crash();

void handle_force_delete();
Expand Down Expand Up @@ -2634,6 +2636,24 @@ class LLAdvancedForceErrorCoroutineCrash : public view_listener_t
}
};

class LLAdvancedForceErrorCoroprocedureCrash : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
force_error_coroprocedure_crash();
return true;
}
};

class LLAdvancedForceErrorWorkQueueCrash : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
{
force_error_work_queue_crash();
return true;
}
};

class LLAdvancedForceErrorThreadCrash : public view_listener_t
{
bool handleEvent(const LLSD& userdata)
Expand Down Expand Up @@ -8657,6 +8677,16 @@ void force_error_coroutine_crash()
LLAppViewer::instance()->forceErrorCoroutineCrash();
}

void force_error_coroprocedure_crash()
{
LLAppViewer::instance()->forceErrorCoroprocedureCrash();
}

void force_error_work_queue_crash()
{
LLAppViewer::instance()->forceErrorWorkQueueCrash();
}

void force_error_thread_crash()
{
LLAppViewer::instance()->forceErrorThreadCrash();
Expand Down Expand Up @@ -9861,6 +9891,8 @@ void initialize_menus()
view_listener_t::addMenu(new LLAdvancedForceErrorSoftwareExceptionCoro(), "Advanced.ForceErrorSoftwareExceptionCoro");
view_listener_t::addMenu(new LLAdvancedForceErrorDriverCrash(), "Advanced.ForceErrorDriverCrash");
view_listener_t::addMenu(new LLAdvancedForceErrorCoroutineCrash(), "Advanced.ForceErrorCoroutineCrash");
view_listener_t::addMenu(new LLAdvancedForceErrorCoroprocedureCrash(), "Advanced.ForceErrorCoroprocedureCrash");
view_listener_t::addMenu(new LLAdvancedForceErrorWorkQueueCrash(), "Advanced.ForceErrorWorkQueueCrash");
view_listener_t::addMenu(new LLAdvancedForceErrorThreadCrash(), "Advanced.ForceErrorThreadCrash");
view_listener_t::addMenu(new LLAdvancedForceErrorDisconnectViewer(), "Advanced.ForceErrorDisconnectViewer");

Expand Down
14 changes: 13 additions & 1 deletion indra/newview/skins/default/xui/en/menu_viewer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2788,13 +2788,25 @@ function="World.EnvPreset"
function="Advanced.ForceErrorOSException" />
<menu_item_call.on_visible
function="Advanced.EnableErrorOSException" />
</menu_item_call>
</menu_item_call>
<menu_item_call
label="Force a Crash in a Coroutine"
name="Force a Crash in a Coroutine">
<menu_item_call.on_click
function="Advanced.ForceErrorCoroutineCrash" />
</menu_item_call>
<menu_item_call
label="Force a Crash in a Coroprocedure"
name="Force a Crash in a Coroprocedure">
<menu_item_call.on_click
function="Advanced.ForceErrorCoroprocedureCrash" />
</menu_item_call>
<menu_item_call
label="Force a Crash in a Work Queue"
name="Force a Crash in a Work Queue">
<menu_item_call.on_click
function="Advanced.ForceErrorWorkQueueCrash" />
</menu_item_call>
<menu_item_call
label="Force a Crash in a Thread"
name="Force a Crash in a Thread">
Expand Down