OU/CWE-ou-minkata
1
0
Fork 0
mirror of https://foundry.openuru.org/gitblit/r/CWE-ou-minkata.git synced 2025-07-18 11:19:10 +00:00
Code Releases Activity

Get rid of pnUtSync and CLock.

Browse Source
This commit is contained in:
Darryl Pogue
2012-04-14 17:36:27 -07:00
parent c0d0dea7f6
commit 1ae3979753
9 changed files with 24 additions and 480 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Sources/Plasma/NucleusLib/pnAsyncCoreExe/Pch.h
View File

@ -54,6 +54,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "pnProduct/pnProduct.h"
#include "pnNetBase/pnNetBase.h"
#include "pnAsyncCore/pnAsyncCore.h"
#include "hsThread.h"
#include "Private/pnAceInt.h"
#include "Private/W9x/pnAceW9x.h"

14
Sources/Plasma/NucleusLib/pnAsyncCoreExe/pnAceIo.cpp
View File

@ -83,7 +83,7 @@ struct ISocketConnType : ISocketConnHash {
};
static CLock s_notifyProcLock;
static hsReaderWriterLock s_notifyProcLock;
static HASHTABLEDECL(
ISocketConnType,
ISocketConnHash,
@ -340,11 +340,11 @@ void AsyncSocketRegisterNotifyProc (
ct->productId = productId;
ct->flags = kConnHashFlagsIgnore;
s_notifyProcLock.EnterWrite();
s_notifyProcLock.LockForWriting();
{
s_notifyProcs.Add(ct);
}
s_notifyProcLock.LeaveWrite();
s_notifyProcLock.UnlockForWriting();
}
//===========================================================================
@ -365,7 +365,7 @@ void AsyncSocketUnregisterNotifyProc (
hash.flags = kConnHashFlagsExactMatch;
ISocketConnType * scan;
s_notifyProcLock.EnterWrite();
s_notifyProcLock.LockForWriting();
{
scan = s_notifyProcs.Find(hash);
for (; scan; scan = s_notifyProcs.FindNext(hash, scan)) {
@ -377,7 +377,7 @@ void AsyncSocketUnregisterNotifyProc (
break;
}
}
s_notifyProcLock.LeaveWrite();
s_notifyProcLock.UnlockForWriting();
// perform memory deallocation outside the lock
delete scan;
@ -403,12 +403,12 @@ FAsyncNotifySocketProc AsyncSocketFindNotifyProc (
// Lookup notifyProc based on connType
FAsyncNotifySocketProc proc;
s_notifyProcLock.EnterRead();
s_notifyProcLock.LockForReading();
if (const ISocketConnType * scan = s_notifyProcs.Find(hash))
proc = scan->notifyProc;
else
proc = nil;
s_notifyProcLock.LeaveRead();
s_notifyProcLock.UnlockForReading();
if (!proc)
break;