UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix vprof crashing in some games (#1541)

Browse Source 
Some engines are very sensitive to exactly when in a frame vprof is
enabled, the vprof commands use a special command registration method
to defer their execution to the start of the next frame. Instead of
starting/stopping vprof directly ourselves, use the built-in commands
to ensure that the timing is correct and the server does not crash.

Fixes #1162
This commit is contained in:
Asher Baker 2021-07-18 19:08:36 +01:00 committed by GitHub
parent 2d241316c7
commit f8f5a18d67
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
core/vprof_tool.cpp
View File

@ -36,11 +36,6 @@
VProfTool sVProfTool;
VProfTool::VProfTool()
: active_(false)
{
}
void
VProfTool::OnSourceModAllInitialized()
{
@ -62,14 +57,24 @@ VProfTool::Description()
bool
VProfTool::Start()
{
g_VProfCurrentProfile.Start();
return IsActive();
// Some engines are very sensitive to exactly when in a frame vprof is
// enabled, the vprof commands use a special command registration method
// to defer their execution to the start of the next frame. Instead of
// starting/stopping vprof directly ourselves, we use the built-in commands
// to ensure that the timing is correct and the server does not crash.
//
// g_VProfCurrentProfile.Start();
engine->ServerCommand("vprof_on\n");
return true; // IsActive();
}
void
VProfTool::Stop(void (*render)(const char *fmt, ...))
{
g_VProfCurrentProfile.Stop();
// See note in VProfTool::Start
//
// g_VProfCurrentProfile.Stop();
engine->ServerCommand("vprof_off\n");
RenderHelp(render);
}

5
core/vprof_tool.h
View File

@ -37,8 +37,6 @@ class VProfTool
public SMGlobalClass
{
public:
VProfTool();
// IProfilingTool
const char *Name() override;
const char *Description() override;
@ -53,9 +51,6 @@ public:
// SMGlobalClass
void OnSourceModAllInitialized() override;
private:
bool active_;
};
#endif // _include_sourcemod_core_vprof_bridge_h_