diff options
Diffstat (limited to 'indra/llmessage/llcachename.cpp')
| -rw-r--r-- | indra/llmessage/llcachename.cpp | 196 |
1 files changed, 97 insertions, 99 deletions
diff --git a/indra/llmessage/llcachename.cpp b/indra/llmessage/llcachename.cpp index 9c6e5e7f85..f1d2925026 100644 --- a/indra/llmessage/llcachename.cpp +++ b/indra/llmessage/llcachename.cpp @@ -46,132 +46,130 @@ LLCacheName* gCacheName = NULL; /// class LLCacheNameEntry /// --------------------------------------------------------------------------- -namespace { - class LLCacheNameEntry - { - public: - LLCacheNameEntry(); +class LLCacheNameEntry +{ +public: + LLCacheNameEntry(); - public: - bool mIsGroup; - U32 mCreateTime; // unix time_t - char mFirstName[DB_FIRST_NAME_BUF_SIZE]; /*Flawfinder: ignore*/ - char mLastName[DB_LAST_NAME_BUF_SIZE]; /*Flawfinder: ignore*/ - char mGroupName[DB_GROUP_NAME_BUF_SIZE]; /*Flawfinder: ignore*/ - }; +public: + bool mIsGroup; + U32 mCreateTime; // unix time_t + char mFirstName[DB_FIRST_NAME_BUF_SIZE]; /*Flawfinder: ignore*/ + char mLastName[DB_LAST_NAME_BUF_SIZE]; /*Flawfinder: ignore*/ + char mGroupName[DB_GROUP_NAME_BUF_SIZE]; /*Flawfinder: ignore*/ +}; - LLCacheNameEntry::LLCacheNameEntry() - { - mFirstName[0] = '\0'; - mLastName[0] = '\0'; - mGroupName[0] = '\0'; - } +LLCacheNameEntry::LLCacheNameEntry() +{ + mFirstName[0] = '\0'; + mLastName[0] = '\0'; + mGroupName[0] = '\0'; +} - class PendingReply - { - public: - LLUUID mID; - LLCacheNameCallback mCallback; - LLHost mHost; - void* mData; - PendingReply(const LLUUID& id, LLCacheNameCallback callback, void* data = NULL) - : mID(id), mCallback(callback), mData(data) - { } +class PendingReply +{ +public: + LLUUID mID; + LLCacheNameCallback mCallback; + LLHost mHost; + void* mData; + PendingReply(const LLUUID& id, LLCacheNameCallback callback, void* data = NULL) + : mID(id), mCallback(callback), mData(data) + { } - PendingReply(const LLUUID& id, const LLHost& host) - : mID(id), mCallback(0), mHost(host) - { } + PendingReply(const LLUUID& id, const LLHost& host) + : mID(id), mCallback(0), mHost(host) + { } - void done() { mID.setNull(); } - bool isDone() const { return mID.isNull() != FALSE; } - }; + void done() { mID.setNull(); } + bool isDone() const { return mID.isNull() != FALSE; } +}; - class ReplySender - { - public: - ReplySender(LLMessageSystem* msg); - ~ReplySender(); +class ReplySender +{ +public: + ReplySender(LLMessageSystem* msg); + ~ReplySender(); - void send(const LLUUID& id, - const LLCacheNameEntry& entry, const LLHost& host); + void send(const LLUUID& id, + const LLCacheNameEntry& entry, const LLHost& host); - private: - void flush(); +private: + void flush(); - LLMessageSystem* mMsg; - bool mPending; - bool mCurrIsGroup; - LLHost mCurrHost; - }; + LLMessageSystem* mMsg; + bool mPending; + bool mCurrIsGroup; + LLHost mCurrHost; +}; - ReplySender::ReplySender(LLMessageSystem* msg) - : mMsg(msg), mPending(false) - { } +ReplySender::ReplySender(LLMessageSystem* msg) + : mMsg(msg), mPending(false) +{ } - ReplySender::~ReplySender() - { - flush(); - } +ReplySender::~ReplySender() +{ + flush(); +} - void ReplySender::send(const LLUUID& id, - const LLCacheNameEntry& entry, const LLHost& host) +void ReplySender::send(const LLUUID& id, + const LLCacheNameEntry& entry, const LLHost& host) +{ + if (mPending) { - if (mPending) + if (mCurrIsGroup != entry.mIsGroup + || mCurrHost != host) { - if (mCurrIsGroup != entry.mIsGroup - || mCurrHost != host) - { - flush(); - } + flush(); } + } - if (!mPending) - { - mPending = true; - mCurrIsGroup = entry.mIsGroup; - mCurrHost = host; - - if(mCurrIsGroup) - mMsg->newMessageFast(_PREHASH_UUIDGroupNameReply); - else - mMsg->newMessageFast(_PREHASH_UUIDNameReply); - } + if (!mPending) + { + mPending = true; + mCurrIsGroup = entry.mIsGroup; + mCurrHost = host; - mMsg->nextBlockFast(_PREHASH_UUIDNameBlock); - mMsg->addUUIDFast(_PREHASH_ID, id); if(mCurrIsGroup) - { - mMsg->addStringFast(_PREHASH_GroupName, entry.mGroupName); - } + mMsg->newMessageFast(_PREHASH_UUIDGroupNameReply); else - { - mMsg->addStringFast(_PREHASH_FirstName, entry.mFirstName); - mMsg->addStringFast(_PREHASH_LastName, entry.mLastName); - } + mMsg->newMessageFast(_PREHASH_UUIDNameReply); + } - if(mMsg->isSendFullFast(_PREHASH_UUIDNameBlock)) - { - flush(); - } + mMsg->nextBlockFast(_PREHASH_UUIDNameBlock); + mMsg->addUUIDFast(_PREHASH_ID, id); + if(mCurrIsGroup) + { + mMsg->addStringFast(_PREHASH_GroupName, entry.mGroupName); + } + else + { + mMsg->addStringFast(_PREHASH_FirstName, entry.mFirstName); + mMsg->addStringFast(_PREHASH_LastName, entry.mLastName); } - void ReplySender::flush() + if(mMsg->isSendFullFast(_PREHASH_UUIDNameBlock)) { - if (mPending) - { - mMsg->sendReliable(mCurrHost); - mPending = false; - } + flush(); } +} +void ReplySender::flush() +{ + if (mPending) + { + mMsg->sendReliable(mCurrHost); + mPending = false; + } +} - typedef std::set<LLUUID> AskQueue; - typedef std::vector<PendingReply> ReplyQueue; - typedef std::map<LLUUID,U32> PendingQueue; - typedef std::map<LLUUID, LLCacheNameEntry*> Cache; - typedef std::vector<LLCacheNameCallback> Observers; -}; + +typedef std::set<LLUUID> AskQueue; +typedef std::vector<PendingReply> ReplyQueue; +typedef std::map<LLUUID,U32> PendingQueue; +typedef std::map<LLUUID, LLCacheNameEntry*> Cache; +typedef std::vector<LLCacheNameCallback> Observers; class LLCacheName::Impl { |