sco/pokerth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

The sender thread has been rewritten with a new algorithm in mind. The sender should not stall any more, and no timeout is required. There are no more send priorities.

Browse Source 
The avatar manager no longer serializes access to avatar files.
This commit is contained in:
lotodore
2007-11-20 23:58:24 +00:00
parent a5999eb30b
commit 689b22e0b9
9 changed files with 179 additions and 225 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/avatarmanager.h
+3 -5
View File
@@ -47,10 +47,10 @@ public:
void AddSingleAvatar(const std::string &fileName);
boost::shared_ptr<AvatarFileState> OpenAvatarFileForChunkRead(const std::string &fileName, unsigned &outFileSize, AvatarFileType &outFileType);
unsigned ChunkReadAvatarFile(boost::shared_ptr<AvatarFileState> fileState, unsigned char *data, unsigned chunkSize);
static boost::shared_ptr<AvatarFileState> OpenAvatarFileForChunkRead(const std::string &fileName, unsigned &outFileSize, AvatarFileType &outFileType);
static unsigned ChunkReadAvatarFile(boost::shared_ptr<AvatarFileState> fileState, unsigned char *data, unsigned chunkSize);
int AvatarFileToNetPackets(const std::string &fileName, unsigned requestId, NetPacketList &packets);
static int AvatarFileToNetPackets(const std::string &fileName, unsigned requestId, NetPacketList &packets);
bool GetHashForAvatar(const std::string &fileName, MD5Buf &md5buf) const;
bool GetAvatarFileName(const MD5Buf &md5buf, std::string &fileName) const;
@@ -77,8 +77,6 @@ private:
mutable boost::mutex m_cacheDirMutex;
std::string m_cacheDir;
mutable boost::mutex m_loadMutex;
};
#endif
src/core/common/avatarmanager.cpp
-3
View File
@@ -192,9 +192,6 @@ AvatarManager::ChunkReadAvatarFile(boost::shared_ptr<AvatarFileState> fileState,
int
AvatarManager::AvatarFileToNetPackets(const string &fileName, unsigned requestId, NetPacketList &packets)
{
// Serialize avatar access for now.
boost::mutex::scoped_lock lock(m_loadMutex);
int retVal = ERR_NET_INVALID_AVATAR_FILE;
unsigned fileSize;
AvatarFileType fileType;