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

Try to replace a pnUtList with a std::queue.

Browse Source
This commit is contained in:
Darryl Pogue
2012-03-10 18:16:37 -08:00
parent 3bf303885a
commit b7035a631e
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Sources/Plasma/Apps/plClientPatcher/UruPlayer.cpp
View File

@ -47,6 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
#include "Pch.h"
#include "plStatusLog/plStatusLog.h"
#include <queue>
#pragma hdrstop
@ -67,7 +68,6 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
struct ManifestFile
{
LINK(ManifestFile) link;
ManifestFile(const wchar_t clientName[], const wchar_t downloadName[], const wchar_t md5val[], int flags, plLauncherInfo *info)
{
StrCopy(filename, clientName, arrsize(filename));
@ -142,13 +142,12 @@ static unsigned s_fileListRequests;
static bool s_patchComplete;
static PROCESS_INFORMATION s_pi;
static long s_numFiles;
static CCritSect s_critsect;
static char s_workingDir[MAX_PATH];
static bool s_patchError;
static long s_asyncCoreInitCount;
static long s_numConnectFailures;
static bool s_running;
static LISTDECL(ManifestFile, link) s_manifestQueue;
static std::queue<ManifestFile*> manifestQueue;
//static AsyncThreadTaskList * s_taskList;
// error strings
@ -347,10 +346,13 @@ void Shutdown(plLauncherInfo *info) {
//============================================================================
static void RequestNextManifestFile () {
bool success = true;
ManifestFile *nextfile = s_manifestQueue.Head();
if(!nextfile)
if (!manifestQueue.size())
return;
s_manifestQueue.Unlink(nextfile);
ManifestFile* nextFile = manifestQueue.front();
manifestQueue.pop();
char path[MAX_PATH];
wchar_t basePath[MAX_PATH];
StrPrintf(path, arrsize(path), "%s%S", s_workingDir, nextfile->filename);
@ -645,7 +647,7 @@ static void ProcessManifest (void * param) {
}
else {
// queue up this file download
s_manifestQueue.Link(mf);
manifestQueue.push(mf);
}
}
}
@ -916,8 +918,10 @@ void UruPrepProc (void * param) {
AsyncSleep(10);
} while ((!s_patchComplete && !s_patchError && s_running) || s_perf[kPerfThreadTaskCount]);
while(ManifestFile *mf = s_manifestQueue.Head())
while (manifestQueue.size())
{
ManifestFile* mf = manifestQueue.front()
manifestQueue.pop();
delete mf;
}
// If s_patchError, we don't wait around for s_numFiles