OU/CWE-ou-minkata
2
3
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-14 02:27:40 -04:00
Code Releases Activity

Deprecate and remove NEWZERO macro

Browse Source
This commit is contained in:
Michael Hansen
2013-01-04 21:32:48 -08:00
parent b574a583f4
commit bc0d04da48
55 changed files with 455 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglAuth.cpp
View File

@ -659,7 +659,7 @@ struct VaultFetchNodeRefsTrans : NetAuthTrans {
unsigned m_nodeId;
FNetCliAuthVaultNodeRefsFetched m_callback;
void * m_param;
ARRAY(NetVaultNodeRef) m_refs;
VaultFetchNodeRefsTrans (
@ -667,7 +667,7 @@ struct VaultFetchNodeRefsTrans : NetAuthTrans {
FNetCliAuthVaultNodeRefsFetched callback,
void * param
);
bool Send ();
void Post ();
bool Recv (
@ -685,16 +685,16 @@ struct VaultInitAgeTrans : NetAuthTrans {
plUUID m_ageInstId;
plUUID m_parentAgeInstId;
wchar_t * m_ageFilename;
wchar_t * m_ageInstName;
wchar_t * m_ageUserName;
wchar_t * m_ageDesc;
wchar_t * m_ageFilename;
wchar_t * m_ageInstName;
wchar_t * m_ageUserName;
wchar_t * m_ageDesc;
unsigned m_ageSequenceNumber;
unsigned m_ageLanguage;
unsigned m_ageId;
unsigned m_ageInfoId;
VaultInitAgeTrans(
FNetCliAuthAgeInitCallback callback, // optional
void * param, // optional
@ -801,10 +801,10 @@ struct VaultSaveNodeTrans : NetAuthTrans {
unsigned m_nodeId;
plUUID m_revisionId;
ARRAY(uint8_t) m_buffer;
ARRAY(uint8_t) m_buffer;
FNetCliAuthVaultNodeSaveCallback m_callback;
void * m_param;
VaultSaveNodeTrans (
unsigned nodeId,
const plUUID& revisionId,
@ -858,7 +858,7 @@ struct VaultRemoveNodeTrans : NetAuthTrans {
unsigned m_childId;
FNetCliAuthVaultNodeRemoveCallback m_callback;
void * m_param;
VaultRemoveNodeTrans (
unsigned parentId,
unsigned childId,
@ -1532,7 +1532,7 @@ static void Connect (
) {
ASSERT(s_running);
CliAuConn * conn = NEWZERO(CliAuConn);
CliAuConn * conn = new CliAuConn;
conn->addr = addr;
conn->seq = ConnNextSequence();
conn->lastHeardTimeMs = GetNonZeroTimeMs(); // used in connect timeout, and ping timeout
@ -1586,7 +1586,14 @@ static unsigned CliAuConnPingTimerProc (void * param) {
}
//============================================================================
CliAuConn::CliAuConn () {
CliAuConn::CliAuConn ()
: reconnectTimer(nil), reconnectStartMs(0)
, pingTimer(nil), pingSendTimeMs(0), lastHeardTimeMs(0)
, sock(nil), cli(nil), seq(0), serverChallenge(0)
, cancelId(nil), abandoned(false)
{
memset(name, 0, sizeof(name));
AtomicAdd(&s_perf[kPerfConnCount], 1);
}
@ -3750,7 +3757,7 @@ VaultFetchNodeRefsTrans::VaultFetchNodeRefsTrans (
, m_param(param)
{
}
//============================================================================
bool VaultFetchNodeRefsTrans::Send () {
if (!AcquireConn())
@ -3824,6 +3831,8 @@ VaultInitAgeTrans::VaultInitAgeTrans (
, m_ageDesc(StrDup(ageDesc ? ageDesc : L""))
, m_ageSequenceNumber(ageSequenceNumber)
, m_ageLanguage(ageLanguage)
, m_ageId(0)
, m_ageInfoId(0)
{
}
@ -3901,6 +3910,7 @@ VaultFetchNodeTrans::VaultFetchNodeTrans (
, m_nodeId(nodeId)
, m_callback(callback)
, m_param(param)
, m_node(nil)
{
}
@ -3939,7 +3949,7 @@ bool VaultFetchNodeTrans::Recv (
const Auth2Cli_VaultNodeFetched & reply = *(const Auth2Cli_VaultNodeFetched *) msg;
if (IS_NET_SUCCESS(reply.result)) {
m_node = NEWZERO(NetVaultNode);
m_node = new NetVaultNode;
m_node->Read_LCS(reply.nodeBuffer, reply.nodeBytes, 0);
m_node->IncRef("Recv");
}
@ -3963,9 +3973,9 @@ VaultFindNodeTrans::VaultFindNodeTrans (
FNetCliAuthVaultNodeFind callback,
void * param
) : NetAuthTrans(kVaultFindNodeTrans)
, m_node(templateNode)
, m_callback(callback)
, m_param(param)
, m_node(templateNode)
{
m_node->IncRef();
}
@ -4041,6 +4051,7 @@ VaultCreateNodeTrans::VaultCreateNodeTrans (
, m_templateNode(templateNode)
, m_callback(callback)
, m_param(param)
, m_nodeId(0)
{
m_templateNode->IncRef();
}
@ -5560,7 +5571,7 @@ void NetCliAuthVaultNodeCreate (
FNetCliAuthVaultNodeCreated callback,
void * param
) {
VaultCreateNodeTrans * trans = NEWZERO(VaultCreateNodeTrans)(
VaultCreateNodeTrans * trans = new VaultCreateNodeTrans(
templateNode,
callback,
param
@ -5574,7 +5585,7 @@ void NetCliAuthVaultNodeFetch (
FNetCliAuthVaultNodeFetched callback,
void * param
) {
VaultFetchNodeTrans * trans = NEWZERO(VaultFetchNodeTrans)(
VaultFetchNodeTrans * trans = new VaultFetchNodeTrans(
nodeId,
callback,
param
@ -5588,7 +5599,7 @@ void NetCliAuthVaultNodeFind (
FNetCliAuthVaultNodeFind callback,
void * param
) {
VaultFindNodeTrans * trans = NEWZERO(VaultFindNodeTrans)(
VaultFindNodeTrans * trans = new VaultFindNodeTrans(
templateNode,
callback,
param
@ -5629,7 +5640,7 @@ unsigned NetCliAuthVaultNodeSave (
ARRAY(uint8_t) buffer;
unsigned bytes = node->Write_LCS(&buffer, NetVaultNode::kRwDirtyOnly | NetVaultNode::kRwUpdateDirty);
VaultSaveNodeTrans * trans = NEWZERO(VaultSaveNodeTrans)(
VaultSaveNodeTrans * trans = new VaultSaveNodeTrans(
node->nodeId,
node->revisionId,
buffer.Count(),
@ -5656,7 +5667,7 @@ void NetCliAuthVaultNodeAdd (
FNetCliAuthVaultNodeAddCallback callback,
void * param
) {
VaultAddNodeTrans * trans = NEWZERO(VaultAddNodeTrans)(
VaultAddNodeTrans * trans = new VaultAddNodeTrans(
parentId,
childId,
ownerId,
@ -5673,7 +5684,7 @@ void NetCliAuthVaultNodeRemove (
FNetCliAuthVaultNodeRemoveCallback callback,
void * param
) {
VaultRemoveNodeTrans * trans = NEWZERO(VaultRemoveNodeTrans)(
VaultRemoveNodeTrans * trans = new VaultRemoveNodeTrans(
parentId,
childId,
callback,
@ -5688,7 +5699,7 @@ void NetCliAuthVaultFetchNodeRefs (
FNetCliAuthVaultNodeRefsFetched callback,
void * param
) {
VaultFetchNodeRefsTrans * trans = NEWZERO(VaultFetchNodeRefsTrans)(
VaultFetchNodeRefsTrans * trans = new VaultFetchNodeRefsTrans(
nodeId,
callback,
param
@ -5742,16 +5753,16 @@ void NetCliAuthVaultSendNode (
void NetCliAuthVaultInitAge (
const plUUID& ageInstId, // optional. is used in match
const plUUID& parentAgeInstId, // optional. is used in match
const wchar_t ageFilename[], // optional. is used in match
const wchar_t ageInstName[], // optional. not used in match
const wchar_t ageUserName[], // optional. not used in match
const wchar_t ageDesc[], // optional. not used in match
const wchar_t ageFilename[], // optional. is used in match
const wchar_t ageInstName[], // optional. not used in match
const wchar_t ageUserName[], // optional. not used in match
const wchar_t ageDesc[], // optional. not used in match
unsigned ageSequenceNumber, // optional. not used in match
unsigned ageLanguage, // optional. not used in match
FNetCliAuthAgeInitCallback callback, // optional
void * param // optional
) {
VaultInitAgeTrans * trans = NEWZERO(VaultInitAgeTrans)(
VaultInitAgeTrans * trans = new VaultInitAgeTrans(
callback,
param,
ageInstId,

12
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglFile.cpp
View File

@ -67,7 +67,7 @@ struct CliFileConn : AtomicRef {
char name[MAX_PATH];
plNetAddress addr;
unsigned seq;
ARRAY(uint8_t) recvBuffer;
ARRAY(uint8_t) recvBuffer;
AsyncCancelId cancelId;
bool abandoned;
unsigned buildId;
@ -544,7 +544,7 @@ static void Connect (
) {
ASSERT(s_running);
CliFileConn * conn = NEWZERO(CliFileConn);
CliFileConn * conn = new CliFileConn;
strncpy(conn->name, name, arrsize(conn->name));
conn->addr = addr;
conn->buildId = s_connectBuildId;
@ -580,7 +580,13 @@ static void AsyncLookupCallback (
***/
//============================================================================
CliFileConn::CliFileConn () {
CliFileConn::CliFileConn ()
: sock(nil), seq(0), cancelId(nil), abandoned(false), buildId(0), serverType(0)
, reconnectTimer(nil), reconnectStartMs(0), connectStartMs(0)
, numImmediateDisconnects(0), numFailedConnects(0)
, pingTimer(nil), pingSendTimeMs(0), lastHeardTimeMs(0)
{
memset(name, 0, sizeof(name));
AtomicAdd(&s_perf[kPerfConnCount], 1);
}

13
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGame.cpp
View File

@ -356,7 +356,7 @@ static bool SocketNotifyCallback (
static void Connect (
const plNetAddress& addr
) {
CliGmConn * conn = NEWZERO(CliGmConn);
CliGmConn * conn = new CliGmConn;
conn->addr = addr;
conn->seq = ConnNextSequence();
conn->lastHeardTimeMs = GetNonZeroTimeMs();
@ -414,7 +414,10 @@ static unsigned CliGmConnPingTimerProc (void * param) {
}
//============================================================================
CliGmConn::CliGmConn () {
CliGmConn::CliGmConn ()
: sock(nil), cancelId(nil), cli(nil), seq(0), abandoned(false)
, pingTimer(nil), pingSendTimeMs(0), lastHeardTimeMs(0)
{
AtomicAdd(&s_perf[kPerfConnCount], 1);
}
@ -579,11 +582,11 @@ JoinAgeRequestTrans::JoinAgeRequestTrans (
FNetCliGameJoinAgeRequestCallback callback,
void * param
) : NetGameTrans(kJoinAgeRequestTrans)
, m_callback(callback)
, m_param(param)
, m_ageMcpId(ageMcpId)
, m_accountUuid(accountUuid)
, m_playerInt(playerInt)
, m_callback(callback)
, m_param(param)
{
}
@ -822,7 +825,7 @@ void NetCliGameJoinAgeRequest (
FNetCliGameJoinAgeRequestCallback callback,
void * param
) {
JoinAgeRequestTrans * trans = NEWZERO(JoinAgeRequestTrans)(
JoinAgeRequestTrans * trans = new JoinAgeRequestTrans(
ageMcpId,
accountUuid,
playerInt,

17
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglGateKeeper.cpp
View File

@ -63,7 +63,7 @@ struct CliGkConn : AtomicRef {
// Reconnection
AsyncTimer * reconnectTimer;
unsigned reconnectStartMs;
// Ping
AsyncTimer * pingTimer;
unsigned pingSendTimeMs;
@ -77,12 +77,12 @@ struct CliGkConn : AtomicRef {
void StopAutoReconnect (); // call before destruction
void StartAutoReconnect ();
void TimerReconnect ();
// ping
void AutoPing ();
void StopAutoPing ();
void TimerPing ();
void Send (const uintptr_t fields[], unsigned count);
CCritSect critsect;
@ -468,7 +468,7 @@ static void Connect (
) {
ASSERT(s_running);
CliGkConn * conn = NEWZERO(CliGkConn);
CliGkConn * conn = new CliGkConn;
conn->addr = addr;
conn->seq = ConnNextSequence();
conn->lastHeardTimeMs = GetNonZeroTimeMs(); // used in connect timeout, and ping timeout
@ -524,7 +524,14 @@ static unsigned CliGkConnPingTimerProc (void * param) {
}
//============================================================================
CliGkConn::CliGkConn () {
CliGkConn::CliGkConn ()
: reconnectTimer(nil), reconnectStartMs(0)
, pingTimer(nil), pingSendTimeMs(0), lastHeardTimeMs(0)
, sock(nil), cli(nil), seq(0), serverChallenge(0)
, cancelId(nil), abandoned(false)
{
memset(name, 0, sizeof(name));
AtomicAdd(&s_perf[kPerfConnCount], 1);
}

1
Sources/Plasma/PubUtilLib/plNetGameLib/Private/plNglTrans.cpp
View File

@ -123,6 +123,7 @@ NetTrans::NetTrans (ENetProtocol protocol, ETransType transType)
, m_connId(0)
, m_protocol(protocol)
, m_hasSubTrans(false)
, m_timeoutAtMs(0)
, m_transType(transType)
{
AtomicAdd(&s_perf[kPerfCurrTransactions], 1);