Skip to content

Implement AddRef/Release using atomic ref counting for ConnectionSignaling #214

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

Open
seer-by-sentry wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −1
Open

Implement AddRef/Release using atomic ref counting for ConnectionSignaling #214

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
15 changes: 14 additions & 1 deletion GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/NetworkMesh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include "GameNetwork/GeneralsOnline/NGMP_interfaces.h"

#include <ws2ipdef.h>
#include <atomic>
#include "GameNetwork/NetworkDefs.h"
#include "GameNetwork/NetworkInterface.h"
#include "GameLogic/GameLogic.h"
Expand Down Expand Up @@ -324,17 +325,25 @@
{
CSignalingClient* const m_pOwner;
int64_t const m_targetUserID;
std::atomic<int> m_refCount;

ConnectionSignaling(CSignalingClient* owner, int64_t target_user_id)
: m_pOwner(owner)
, m_targetUserID(target_user_id)
, m_refCount(1)
{
}

//
// Implements ISteamNetworkingConnectionSignaling
//

// AddRef - increment reference count
virtual int AddRef() override

Check failure on line 342 in GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/NetworkMesh.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-debug+e 

 'CSignalingClient::ConnectionSignaling::AddRef': method with override specifier 'override' did not override any base class methods

Check failure on line 342 in GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/NetworkMesh.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32+e 

 'CSignalingClient::ConnectionSignaling::AddRef': method with override specifier 'override' did not override any base class methods

Check failure on line 342 in GeneralsMD/Code/GameEngine/Source/GameNetwork/GeneralsOnline/NetworkMesh.cpp

View workflow job for this annotation

GitHub Actions / Build GeneralsMD / win32-profile+e 

 'CSignalingClient::ConnectionSignaling::AddRef': method with override specifier 'override' did not override any base class methods
{
return ++m_refCount;
}

// This is called from SteamNetworkingSockets to send a signal. This could be called from any thread,
// so we need to be threadsafe, and avoid duoing slow stuff or calling back into SteamNetworkingSockets
virtual bool SendSignal(HSteamNetConnection hConn, const SteamNetConnectionInfo_t& info, const void* pMsg, int cbMsg) override
Expand All @@ -353,7 +362,11 @@
// Self destruct. This will be called by SteamNetworkingSockets when it's done with us.
virtual void Release() override
{
delete this;
int refCount = --m_refCount;
if (refCount == 0)
{
delete this;
}
}
};

Expand Down
Loading