josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

** Cleanup in ObjectAccessor/HashMapHolder:

Browse Source 
* Correctly lock the HashMapHolder on access.
* Use ObjectAccessor wrappers (GetPlayers, GetCreatures, GetGameObjects) instead of raw HashMapHolder<Type>::GetContainer.
* General code style cleanup.

--HG--
branch : trunk
This commit is contained in:
XTZGZoReX
2010-03-13 16:17:25 +01:00
parent 76afec204d
commit f8c5b9a4a7
6 changed files with 154 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/LFGHandler.cpp
+2 -2
View File
@@ -32,7 +32,7 @@ static void AttemptJoin(Player* _player)
if(!_player->m_lookingForGroup.canAutoJoin() || _player->GetGroup()) if(!_player->m_lookingForGroup.canAutoJoin() || _player->GetGroup())
return; return;
//TODO: Guard Player Map ObjectAccessor::Guard guard(*HashMapHolder<Player>::GetLock());
HashMapHolder<Player>::MapType const& players = ObjectAccessor::Instance().GetPlayers(); HashMapHolder<Player>::MapType const& players = ObjectAccessor::Instance().GetPlayers();
for (HashMapHolder<Player>::MapType::const_iterator iter = players.begin(); iter != players.end(); ++iter) for (HashMapHolder<Player>::MapType::const_iterator iter = players.begin(); iter != players.end(); ++iter)
{ {
@@ -92,7 +92,7 @@ static void AttemptAddMore(Player* _player)
if(!_player->m_lookingForGroup.more.canAutoJoin()) if(!_player->m_lookingForGroup.more.canAutoJoin())
return; return;
//TODO: Guard Player map ObjectAccessor::Guard guard(*HashMapHolder<Player>::GetLock());
HashMapHolder<Player>::MapType const& players = ObjectAccessor::Instance().GetPlayers(); HashMapHolder<Player>::MapType const& players = ObjectAccessor::Instance().GetPlayers();
for (HashMapHolder<Player>::MapType::const_iterator iter = players.begin(); iter != players.end(); ++iter) for (HashMapHolder<Player>::MapType::const_iterator iter = players.begin(); iter != players.end(); ++iter)
{ {
src/game/Level0.cpp
+3 -3
View File
@@ -165,9 +165,9 @@ bool ChatHandler::HandleGMListIngameCommand(const char* /*args*/)
{ {
bool first = true; bool first = true;
HashMapHolder<Player>::MapType &m = HashMapHolder<Player>::GetContainer(); ObjectAccessor::Guard guard(*HashMapHolder<Player>::GetLock());
HashMapHolder<Player>::MapType::const_iterator itr = m.begin(); HashMapHolder<Player>::MapType &m = ObjectAccessor::Instance().GetPlayers();
for (; itr != m.end(); ++itr) for (HashMapHolder<Player>::MapType::const_iterator itr = m.begin(); itr != m.end(); ++itr)
{ {
AccountTypes itr_sec = itr->second->GetSession()->GetSecurity(); AccountTypes itr_sec = itr->second->GetSession()->GetSecurity();
if ((itr->second->isGameMaster() || (itr_sec > SEC_PLAYER && itr_sec <= sWorld.getConfig(CONFIG_GM_LEVEL_IN_GM_LIST))) && if ((itr->second->isGameMaster() || (itr_sec > SEC_PLAYER && itr_sec <= sWorld.getConfig(CONFIG_GM_LEVEL_IN_GM_LIST))) &&
src/game/Level3.cpp
+2
View File
@@ -5361,6 +5361,8 @@ bool ChatHandler::HandleResetAllCommand(const char * args)
} }
CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE (at_login & '%u') = '0'",atLogin,atLogin); CharacterDatabase.PExecute("UPDATE characters SET at_login = at_login | '%u' WHERE (at_login & '%u') = '0'",atLogin,atLogin);
ObjectAccessor::Guard guard(*HashMapHolder<Player>::GetLock());
HashMapHolder<Player>::MapType const& plist = ObjectAccessor::Instance().GetPlayers(); HashMapHolder<Player>::MapType const& plist = ObjectAccessor::Instance().GetPlayers();
for (HashMapHolder<Player>::MapType::const_iterator itr = plist.begin(); itr != plist.end(); ++itr) for (HashMapHolder<Player>::MapType::const_iterator itr = plist.begin(); itr != plist.end(); ++itr)
itr->second->SetAtLoginFlag(atLogin); itr->second->SetAtLoginFlag(atLogin);
src/game/MiscHandler.cpp
+1 -1
View File
@@ -220,7 +220,7 @@ void WorldSession::HandleWhoOpcode( WorldPacket & recv_data )
data << clientcount; // clientcount place holder data << clientcount; // clientcount place holder
data << clientcount; // clientcount place holder data << clientcount; // clientcount place holder
//TODO: Guard Player map ObjectAccessor::Guard guard(*HashMapHolder<Player>::GetLock());
HashMapHolder<Player>::MapType& m = ObjectAccessor::Instance().GetPlayers(); HashMapHolder<Player>::MapType& m = ObjectAccessor::Instance().GetPlayers();
for (HashMapHolder<Player>::MapType::const_iterator itr = m.begin(); itr != m.end(); ++itr) for (HashMapHolder<Player>::MapType::const_iterator itr = m.begin(); itr != m.end(); ++itr)
{ {
src/game/ObjectAccessor.cpp
+92 -124
View File
@@ -45,7 +45,10 @@
INSTANTIATE_SINGLETON_2(ObjectAccessor, CLASS_LOCK); INSTANTIATE_SINGLETON_2(ObjectAccessor, CLASS_LOCK);
INSTANTIATE_CLASS_MUTEX(ObjectAccessor, ACE_Thread_Mutex); INSTANTIATE_CLASS_MUTEX(ObjectAccessor, ACE_Thread_Mutex);
ObjectAccessor::ObjectAccessor() {} ObjectAccessor::ObjectAccessor()
{
}
ObjectAccessor::~ObjectAccessor() ObjectAccessor::~ObjectAccessor()
{ {
for (Player2CorpsesMapType::const_iterator itr = i_player2corpse.begin(); itr != i_player2corpse.end(); ++itr) for (Player2CorpsesMapType::const_iterator itr = i_player2corpse.begin(); itr != i_player2corpse.end(); ++itr)
@@ -55,71 +58,57 @@ ObjectAccessor::~ObjectAccessor()
} }
} }
Creature* Creature* ObjectAccessor::GetCreatureOrPetOrVehicle(WorldObject const& u, uint64 guid)
ObjectAccessor::GetCreatureOrPetOrVehicle(WorldObject const &u, uint64 guid)
{ {
if(IS_PLAYER_GUID(guid)) if (IS_PLAYER_GUID(guid))
return NULL; return NULL;
if(IS_PET_GUID(guid)) if (IS_PET_GUID(guid))
return GetPet(guid); return GetPet(guid);
return u.IsInWorld() ? u.GetMap()->GetCreature(guid) : NULL; return u.IsInWorld() ? u.GetMap()->GetCreature(guid) : NULL;
} }
/* Corpse* ObjectAccessor::GetCorpse(WorldObject const& u, uint64 guid)
Unit*
ObjectAccessor::GetUnit(WorldObject const &u, uint64 guid)
{ {
if(!guid) Corpse* ret = GetObjectInWorld(guid, (Corpse*)NULL);
if (!ret)
return NULL; return NULL;
if(IS_PLAYER_GUID(guid)) if (ret->GetMapId() != u.GetMapId())
return FindPlayer(guid); return NULL;
return GetCreatureOrPetOrVehicle(u, guid); if (ret->GetInstanceId() != u.GetInstanceId())
} return NULL;
*/
Corpse*
ObjectAccessor::GetCorpse(WorldObject const &u, uint64 guid)
{
Corpse * ret = GetObjectInWorld(guid, (Corpse*)NULL);
if(!ret)
return NULL;
if(ret->GetMapId() != u.GetMapId())
return NULL;
if(ret->GetInstanceId() != u.GetInstanceId())
return NULL;
return ret; return ret;
} }
WorldObject* ObjectAccessor::GetWorldObject(WorldObject const &p, uint64 guid) WorldObject* ObjectAccessor::GetWorldObject(WorldObject const& p, uint64 guid)
{ {
switch(GUID_HIPART(guid)) switch (GUID_HIPART(guid))
{ {
case HIGHGUID_PLAYER: return FindPlayer(guid); case HIGHGUID_PLAYER: return FindPlayer(guid);
case HIGHGUID_GAMEOBJECT: return p.GetMap()->GetGameObject(guid); case HIGHGUID_GAMEOBJECT: return p.GetMap()->GetGameObject(guid);
case HIGHGUID_VEHICLE: case HIGHGUID_VEHICLE:
case HIGHGUID_UNIT: return p.GetMap()->GetCreature(guid); case HIGHGUID_UNIT: return p.GetMap()->GetCreature(guid);
case HIGHGUID_PET: return GetPet(guid); case HIGHGUID_PET: return GetPet(guid);
case HIGHGUID_DYNAMICOBJECT:return p.GetMap()->GetDynamicObject(guid); case HIGHGUID_DYNAMICOBJECT: return p.GetMap()->GetDynamicObject(guid);
case HIGHGUID_TRANSPORT: return NULL; case HIGHGUID_TRANSPORT: return NULL;
case HIGHGUID_CORPSE: return GetCorpse(p,guid); case HIGHGUID_CORPSE: return GetCorpse(p,guid);
case HIGHGUID_MO_TRANSPORT: return NULL; case HIGHGUID_MO_TRANSPORT: return NULL;
default: break; default: return NULL;
} }
return NULL;
} }
Object* ObjectAccessor::GetObjectByTypeMask(WorldObject const &p, uint64 guid, uint32 typemask) Object* ObjectAccessor::GetObjectByTypeMask(WorldObject const& p, uint64 guid, uint32 typemask)
{ {
switch(GUID_HIPART(guid)) switch (GUID_HIPART(guid))
{ {
case HIGHGUID_ITEM: case HIGHGUID_ITEM:
if(typemask & TYPEMASK_ITEM && p.GetTypeId() == TYPEID_PLAYER) if (typemask & TYPEMASK_ITEM && p.GetTypeId() == TYPEID_PLAYER)
return ((Player const &)p).GetItemByGuid( guid ); return ((Player const&)p).GetItemByGuid(guid);
break; break;
case HIGHGUID_PLAYER: case HIGHGUID_PLAYER:
if(typemask & TYPEMASK_PLAYER) if(typemask & TYPEMASK_PLAYER)
@@ -151,135 +140,133 @@ Object* ObjectAccessor::GetObjectByTypeMask(WorldObject const &p, uint64 guid, u
return NULL; return NULL;
} }
Player* Player* ObjectAccessor::FindPlayer(uint64 guid)
ObjectAccessor::FindPlayer(uint64 guid)
{ {
Player * plr = GetObjectInWorld(guid, (Player*)NULL); Player* plr = GetObjectInWorld(guid, (Player*)NULL);
if(!plr || !plr->IsInWorld()) if (!plr || !plr->IsInWorld())
return NULL; return NULL;
return plr; return plr;
} }
Player* Player* ObjectAccessor::FindPlayerByName(const char* name)
ObjectAccessor::FindPlayerByName(const char *name)
{ {
//TODO: Player Guard
Guard guard(*HashMapHolder<Player>::GetLock()); Guard guard(*HashMapHolder<Player>::GetLock());
HashMapHolder<Player>::MapType& m = HashMapHolder<Player>::GetContainer(); HashMapHolder<Player>::MapType& m = HashMapHolder<Player>::GetContainer();
HashMapHolder<Player>::MapType::iterator iter = m.begin(); for (HashMapHolder<Player>::MapType::iterator iter = m.begin(); iter != m.end(); ++iter)
for (; iter != m.end(); ++iter) if (iter->second->IsInWorld() && strcmp(name, iter->second->GetName()) == 0)
if(iter->second->IsInWorld() && ( ::strcmp(name, iter->second->GetName()) == 0 ))
return iter->second; return iter->second;
return NULL; return NULL;
} }
void void ObjectAccessor::SaveAllPlayers()
ObjectAccessor::SaveAllPlayers()
{ {
Guard guard(*HashMapHolder<Player>::GetLock()); Guard guard(*HashMapHolder<Player>::GetLock());
HashMapHolder<Player>::MapType& m = HashMapHolder<Player>::GetContainer(); HashMapHolder<Player>::MapType& m = HashMapHolder<Player>::GetContainer();
HashMapHolder<Player>::MapType::iterator itr = m.begin(); for (HashMapHolder<Player>::MapType::iterator itr = m.begin(); itr != m.end(); ++itr)
for (; itr != m.end(); ++itr)
itr->second->SaveToDB(); itr->second->SaveToDB();
} }
Pet* Pet* ObjectAccessor::GetPet(uint64 guid)
ObjectAccessor::GetPet(uint64 guid)
{ {
return GetObjectInWorld(guid, (Pet*)NULL); return GetObjectInWorld(guid, (Pet*)NULL);
} }
Corpse* Corpse* ObjectAccessor::GetCorpseForPlayerGUID(uint64 guid)
ObjectAccessor::GetCorpseForPlayerGUID(uint64 guid)
{ {
Guard guard(i_corpseGuard); Guard guard(i_corpseGuard);
Player2CorpsesMapType::iterator iter = i_player2corpse.find(guid); Player2CorpsesMapType::iterator iter = i_player2corpse.find(guid);
if( iter == i_player2corpse.end() ) return NULL; if (iter == i_player2corpse.end())
return NULL;
assert(iter->second->GetType() != CORPSE_BONES); assert(iter->second->GetType() != CORPSE_BONES);
return iter->second; return iter->second;
} }
void void ObjectAccessor::RemoveCorpse(Corpse* corpse)
ObjectAccessor::RemoveCorpse(Corpse *corpse)
{ {
assert(corpse && corpse->GetType() != CORPSE_BONES); assert(corpse && corpse->GetType() != CORPSE_BONES);
if(corpse->FindMap()) if (corpse->FindMap())
corpse->FindMap()->Remove(corpse, false); corpse->FindMap()->Remove(corpse, false);
else else
corpse->RemoveFromWorld(); corpse->RemoveFromWorld();
Guard guard(i_corpseGuard); // Critical section
Player2CorpsesMapType::iterator iter = i_player2corpse.find(corpse->GetOwnerGUID()); {
if( iter == i_player2corpse.end() ) // i do not know when it happens but it happens Guard guard(i_corpseGuard);
return;
// build mapid*cellid -> guid_set map Player2CorpsesMapType::iterator iter = i_player2corpse.find(corpse->GetOwnerGUID());
CellPair cell_pair = Trinity::ComputeCellPair(corpse->GetPositionX(), corpse->GetPositionY()); if (iter == i_player2corpse.end()) // TODO: Fix this
uint32 cell_id = (cell_pair.y_coord*TOTAL_NUMBER_OF_CELLS_PER_MAP) + cell_pair.x_coord; return;
objmgr.DeleteCorpseCellData(corpse->GetMapId(), cell_id, corpse->GetOwnerGUID()); // build mapid*cellid -> guid_set map
CellPair cell_pair = Trinity::ComputeCellPair(corpse->GetPositionX(), corpse->GetPositionY());
uint32 cell_id = (cell_pair.y_coord * TOTAL_NUMBER_OF_CELLS_PER_MAP) + cell_pair.x_coord;
i_player2corpse.erase(iter); objmgr.DeleteCorpseCellData(corpse->GetMapId(), cell_id, corpse->GetOwnerGUID());
i_player2corpse.erase(iter);
}
} }
void void ObjectAccessor::AddCorpse(Corpse* corpse)
ObjectAccessor::AddCorpse(Corpse *corpse)
{ {
assert(corpse && corpse->GetType() != CORPSE_BONES); assert(corpse && corpse->GetType() != CORPSE_BONES);
Guard guard(i_corpseGuard); // Critical section
assert(i_player2corpse.find(corpse->GetOwnerGUID()) == i_player2corpse.end()); {
i_player2corpse[corpse->GetOwnerGUID()] = corpse; Guard guard(i_corpseGuard);
// build mapid*cellid -> guid_set map assert(i_player2corpse.find(corpse->GetOwnerGUID()) == i_player2corpse.end());
CellPair cell_pair = Trinity::ComputeCellPair(corpse->GetPositionX(), corpse->GetPositionY()); i_player2corpse[corpse->GetOwnerGUID()] = corpse;
uint32 cell_id = (cell_pair.y_coord*TOTAL_NUMBER_OF_CELLS_PER_MAP) + cell_pair.x_coord;
objmgr.AddCorpseCellData(corpse->GetMapId(), cell_id, corpse->GetOwnerGUID(), corpse->GetInstanceId()); // build mapid*cellid -> guid_set map
CellPair cell_pair = Trinity::ComputeCellPair(corpse->GetPositionX(), corpse->GetPositionY());
uint32 cell_id = (cell_pair.y_coord * TOTAL_NUMBER_OF_CELLS_PER_MAP) + cell_pair.x_coord;
objmgr.AddCorpseCellData(corpse->GetMapId(), cell_id, corpse->GetOwnerGUID(), corpse->GetInstanceId());
}
} }
void void ObjectAccessor::AddCorpsesToGrid(GridPair const& gridpair, GridType& grid, Map* map)
ObjectAccessor::AddCorpsesToGrid(GridPair const& gridpair,GridType& grid,Map* map)
{ {
Guard guard(i_corpseGuard); Guard guard(i_corpseGuard);
for (Player2CorpsesMapType::iterator iter = i_player2corpse.begin(); iter != i_player2corpse.end(); ++iter) for (Player2CorpsesMapType::iterator iter = i_player2corpse.begin(); iter != i_player2corpse.end(); ++iter)
if(iter->second->GetGrid() == gridpair)
{ {
// verify, if the corpse in our instance (add only corpses which are) if (iter->second->GetGrid() == gridpair)
if (map->Instanceable())
{ {
if (iter->second->GetInstanceId() == map->GetInstanceId()) // verify, if the corpse in our instance (add only corpses which are)
if (map->Instanceable())
{ {
grid.AddWorldObject(iter->second); if (iter->second->GetInstanceId() == map->GetInstanceId())
grid.AddWorldObject(iter->second);
} }
} else
else grid.AddWorldObject(iter->second);
{
grid.AddWorldObject(iter->second);
} }
} }
} }
Corpse* Corpse* ObjectAccessor::ConvertCorpseForPlayer(uint64 player_guid, bool insignia)
ObjectAccessor::ConvertCorpseForPlayer(uint64 player_guid, bool insignia)
{ {
Corpse *corpse = GetCorpseForPlayerGUID(player_guid); Corpse* corpse = GetCorpseForPlayerGUID(player_guid);
if(!corpse) if(!corpse)
{ {
//in fact this function is called from several places //in fact this function is called from several places
//even when player doesn't have a corpse, not an error //even when player doesn't have a corpse, not an error
// TODO: really, now...
//sLog.outError("Try remove corpse that not in map for GUID %ul", player_guid); //sLog.outError("Try remove corpse that not in map for GUID %ul", player_guid);
return NULL; return NULL;
} }
DEBUG_LOG("Deleting Corpse and spawning bones."); DEBUG_LOG("Deleting Corpse and spawning bones.");
Map *map = corpse->FindMap(); Map* map = corpse->FindMap();
// remove corpse from player_guid -> corpse map // remove corpse from player_guid -> corpse map
RemoveCorpse(corpse); RemoveCorpse(corpse);
@@ -298,7 +285,7 @@ ObjectAccessor::ConvertCorpseForPlayer(uint64 player_guid, bool insignia)
delete corpse; delete corpse;
return NULL; return NULL;
Corpse *bones = NULL; Corpse* bones = NULL;
// create the bones only if the map and the grid is loaded at the corpse's location // create the bones only if the map and the grid is loaded at the corpse's location
// ignore bones creating option in case insignia // ignore bones creating option in case insignia
if (map && (insignia || if (map && (insignia ||
@@ -314,7 +301,7 @@ ObjectAccessor::ConvertCorpseForPlayer(uint64 player_guid, bool insignia)
bones->SetGrid(corpse->GetGrid()); bones->SetGrid(corpse->GetGrid());
// bones->m_time = m_time; // don't overwrite time // bones->m_time = m_time; // don't overwrite time
// bones->m_inWorld = m_inWorld; // don't overwrite world state // bones->m_inWorld = m_inWorld; // don't overwrite in-world state
// bones->m_type = m_type; // don't overwrite type // bones->m_type = m_type; // don't overwrite type
bones->Relocate(corpse->GetPositionX(), corpse->GetPositionY(), corpse->GetPositionZ(), corpse->GetOrientation()); bones->Relocate(corpse->GetPositionX(), corpse->GetPositionY(), corpse->GetPositionZ(), corpse->GetOrientation());
bones->SetPhaseMask(corpse->GetPhaseMask(), false); bones->SetPhaseMask(corpse->GetPhaseMask(), false);
@@ -324,7 +311,7 @@ ObjectAccessor::ConvertCorpseForPlayer(uint64 player_guid, bool insignia)
for (int i = 0; i < EQUIPMENT_SLOT_END; ++i) for (int i = 0; i < EQUIPMENT_SLOT_END; ++i)
{ {
if(corpse->GetUInt32Value(CORPSE_FIELD_ITEM + i)) if (corpse->GetUInt32Value(CORPSE_FIELD_ITEM + i))
bones->SetUInt32Value(CORPSE_FIELD_ITEM + i, 0); bones->SetUInt32Value(CORPSE_FIELD_ITEM + i, 0);
} }
@@ -338,13 +325,15 @@ ObjectAccessor::ConvertCorpseForPlayer(uint64 player_guid, bool insignia)
return bones; return bones;
} }
void void ObjectAccessor::Update(uint32 diff)
ObjectAccessor::Update(uint32 diff)
{ {
UpdateDataMapType update_players; UpdateDataMapType update_players;
// Critical section
{ {
Guard guard(i_updateGuard); Guard guard(i_updateGuard);
while(!i_objects.empty())
while (!i_objects.empty())
{ {
Object* obj = *i_objects.begin(); Object* obj = *i_objects.begin();
assert(obj && obj->IsInWorld()); assert(obj && obj->IsInWorld());
@@ -362,28 +351,7 @@ ObjectAccessor::Update(uint32 diff)
} }
} }
/// Define the static members of HashMapHolder
/*void ObjectAccessor::UpdateVisibilityForPlayer( Player* player )
{
WorldObject const* viewPoint = player->GetViewPoint();
Map* m = player->GetMap();
CellPair p = Trinity::ComputeCellPair(player->GetPositionX(), player->GetPositionY());
Cell cell(p);
m->UpdatePlayerVisibility(player, cell, p);
if (player!=viewPoint)
{
CellPair pView(Trinity::ComputeCellPair(viewPoint->GetPositionX(), viewPoint->GetPositionY()));
Cell cellView(pView);
m->UpdateObjectsVisibilityFor(player, cellView, pView);
}
else
m->UpdateObjectsVisibilityFor(player, cell, p);
}*/
/// Define the static member of HashMapHolder
template <class T> UNORDERED_MAP< uint64, T* > HashMapHolder<T>::m_objectMap; template <class T> UNORDERED_MAP< uint64, T* > HashMapHolder<T>::m_objectMap;
template <class T> ACE_Thread_Mutex HashMapHolder<T>::i_lock; template <class T> ACE_Thread_Mutex HashMapHolder<T>::i_lock;
src/game/ObjectAccessor.h
+54 -49
View File
@@ -48,9 +48,9 @@ class HashMapHolder
{ {
public: public:
typedef UNORDERED_MAP< uint64, T* > MapType; typedef UNORDERED_MAP<uint64, T*> MapType;
typedef ACE_Thread_Mutex LockType; typedef ACE_Thread_Mutex LockType;
typedef Trinity::GeneralLock<LockType > Guard; typedef Trinity::GeneralLock<LockType> Guard;
static void Insert(T* o) static void Insert(T* o)
{ {
@@ -74,6 +74,7 @@ class HashMapHolder
static MapType& GetContainer() { return m_objectMap; } static MapType& GetContainer() { return m_objectMap; }
static LockType* GetLock() { return &i_lock; } static LockType* GetLock() { return &i_lock; }
private: private:
//Non instanceable only static //Non instanceable only static
@@ -85,15 +86,15 @@ class HashMapHolder
class ObjectAccessor : public Trinity::Singleton<ObjectAccessor, Trinity::ClassLevelLockable<ObjectAccessor, ACE_Thread_Mutex> > class ObjectAccessor : public Trinity::Singleton<ObjectAccessor, Trinity::ClassLevelLockable<ObjectAccessor, ACE_Thread_Mutex> >
{ {
friend class Trinity::OperatorNew<ObjectAccessor>; friend class Trinity::OperatorNew<ObjectAccessor>;
ObjectAccessor(); ObjectAccessor();
~ObjectAccessor(); ~ObjectAccessor();
ObjectAccessor(const ObjectAccessor &); ObjectAccessor(const ObjectAccessor&);
ObjectAccessor& operator=(const ObjectAccessor &); ObjectAccessor& operator=(const ObjectAccessor&);
public: public:
typedef UNORDERED_MAP<uint64, Corpse* > Player2CorpsesMapType;
typedef UNORDERED_MAP<uint64, Corpse*> Player2CorpsesMapType;
typedef UNORDERED_MAP<Player*, UpdateData>::value_type UpdateDataValueType; typedef UNORDERED_MAP<Player*, UpdateData>::value_type UpdateDataValueType;
template<class T> static T* GetObjectInWorld(uint64 guid, T* /*fake*/) template<class T> static T* GetObjectInWorld(uint64 guid, T* /*fake*/)
@@ -103,19 +104,19 @@ class ObjectAccessor : public Trinity::Singleton<ObjectAccessor, Trinity::ClassL
static Unit* GetObjectInWorld(uint64 guid, Unit* /*fake*/) static Unit* GetObjectInWorld(uint64 guid, Unit* /*fake*/)
{ {
if(!guid) if (!guid)
return NULL; return NULL;
if (IS_PLAYER_GUID(guid)) if (IS_PLAYER_GUID(guid))
{ {
Unit * u = (Unit*)HashMapHolder<Player>::Find(guid); Unit* u = (Unit*)HashMapHolder<Player>::Find(guid);
if(!u || !u->IsInWorld()) if (!u || !u->IsInWorld())
return NULL; return NULL;
return u; return u;
} }
if(IS_PET_GUID(guid)) if (IS_PET_GUID(guid))
return (Unit*)HashMapHolder<Pet>::Find(guid); return (Unit*)HashMapHolder<Pet>::Find(guid);
return (Unit*)HashMapHolder<Creature>::Find(guid); return (Unit*)HashMapHolder<Creature>::Find(guid);
@@ -123,34 +124,36 @@ class ObjectAccessor : public Trinity::Singleton<ObjectAccessor, Trinity::ClassL
static Unit* GetUnitInOrOutOfWorld(uint64 guid, Unit* /*fake*/) static Unit* GetUnitInOrOutOfWorld(uint64 guid, Unit* /*fake*/)
{ {
if(!guid) if (!guid)
return NULL; return NULL;
if (IS_PLAYER_GUID(guid)) if (IS_PLAYER_GUID(guid))
{ {
Unit * u = (Unit*)HashMapHolder<Player>::Find(guid); Unit* u = (Unit*)HashMapHolder<Player>::Find(guid);
if(!u) if(!u)
return NULL; return NULL;
return u; return u;
} }
// Other object types than player are unloaded while out of world // Other object types than player are unloaded while out of world
return GetObjectInWorld(guid, ((Unit*)NULL)); return GetObjectInWorld(guid, (Unit*)NULL);
} }
template<class T> static T* GetObjectInWorld(uint32 mapid, float x, float y, uint64 guid, T* /*fake*/) template<class T> static T* GetObjectInWorld(uint32 mapid, float x, float y, uint64 guid, T* /*fake*/)
{ {
T* obj = HashMapHolder<T>::Find(guid); T* obj = HashMapHolder<T>::Find(guid);
if(!obj || obj->GetMapId() != mapid) return NULL; if (!obj || obj->GetMapId() != mapid)
return NULL;
CellPair p = Trinity::ComputeCellPair(x,y); CellPair p = Trinity::ComputeCellPair(x, y);
if(p.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || p.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP ) if (p.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || p.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP )
{ {
sLog.outError("ObjectAccessor::GetObjectInWorld: invalid coordinates supplied X:%f Y:%f grid cell [%u:%u]", x, y, p.x_coord, p.y_coord); sLog.outError("ObjectAccessor::GetObjectInWorld: invalid coordinates supplied X:%f Y:%f grid cell [%u:%u]", x, y, p.x_coord, p.y_coord);
return NULL; return NULL;
} }
CellPair q = Trinity::ComputeCellPair(obj->GetPositionX(),obj->GetPositionY()); CellPair q = Trinity::ComputeCellPair(obj->GetPositionX(), obj->GetPositionY());
if(q.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || q.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP ) if(q.x_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP || q.y_coord >= TOTAL_NUMBER_OF_CELLS_PER_MAP )
{ {
sLog.outError("ObjectAccessor::GetObjecInWorld: object (GUID: %u TypeId: %u) has invalid coordinates X:%f Y:%f grid cell [%u:%u]", obj->GetGUIDLow(), obj->GetTypeId(), obj->GetPositionX(), obj->GetPositionY(), q.x_coord, q.y_coord); sLog.outError("ObjectAccessor::GetObjecInWorld: object (GUID: %u TypeId: %u) has invalid coordinates X:%f Y:%f grid cell [%u:%u]", obj->GetGUIDLow(), obj->GetTypeId(), obj->GetPositionX(), obj->GetPositionY(), q.x_coord, q.y_coord);
@@ -160,65 +163,68 @@ class ObjectAccessor : public Trinity::Singleton<ObjectAccessor, Trinity::ClassL
int32 dx = int32(p.x_coord) - int32(q.x_coord); int32 dx = int32(p.x_coord) - int32(q.x_coord);
int32 dy = int32(p.y_coord) - int32(q.y_coord); int32 dy = int32(p.y_coord) - int32(q.y_coord);
if (dx > -2 && dx < 2 && dy > -2 && dy < 2) return obj; if (dx > -2 && dx < 2 && dy > -2 && dy < 2)
else return NULL; return obj;
else
return NULL;
} }
static WorldObject* GetWorldObject(WorldObject const &, uint64); static WorldObject* GetWorldObject(WorldObject const&, uint64);
static Object* GetObjectByTypeMask(WorldObject const &, uint64, uint32 typemask); static Object* GetObjectByTypeMask(WorldObject const&, uint64, uint32 typemask);
static Creature* GetCreatureOrPetOrVehicle(WorldObject const &, uint64); static Creature* GetCreatureOrPetOrVehicle(WorldObject const&, uint64);
static Unit* GetUnit(WorldObject const &, uint64 guid) { return GetObjectInWorld(guid, (Unit*)NULL); } static Unit* GetUnit(WorldObject const&, uint64 guid) { return GetObjectInWorld(guid, (Unit*)NULL); }
static Unit* GetUnitInOrOutOfWorld(WorldObject const &, uint64 guid) { return GetUnitInOrOutOfWorld(guid, (Unit*)NULL); } static Unit* GetUnitInOrOutOfWorld(WorldObject const&, uint64 guid) { return GetUnitInOrOutOfWorld(guid, (Unit*)NULL); }
static Pet* GetPet(Unit const &, uint64 guid) { return GetPet(guid); } static Pet* GetPet(Unit const&, uint64 guid) { return GetPet(guid); }
static Player* GetPlayer(Unit const &, uint64 guid) { return FindPlayer(guid); } static Player* GetPlayer(Unit const&, uint64 guid) { return FindPlayer(guid); }
static Corpse* GetCorpse(WorldObject const &u, uint64 guid); static Corpse* GetCorpse(WorldObject const& u, uint64 guid);
static Pet* GetPet(uint64 guid); static Pet* GetPet(uint64 guid);
static Player* FindPlayer(uint64); static Player* FindPlayer(uint64);
Player* FindPlayerByName(const char *name) ; Player* FindPlayerByName(const char* name) ;
// when using this, you must use the hashmapholder's lock
HashMapHolder<Player>::MapType& GetPlayers() HashMapHolder<Player>::MapType& GetPlayers()
{ {
return HashMapHolder<Player>::GetContainer(); return HashMapHolder<Player>::GetContainer();
} }
// when using this, you must use the hashmapholder's lock
HashMapHolder<Creature>::MapType& GetCreatures() HashMapHolder<Creature>::MapType& GetCreatures()
{ {
return HashMapHolder<Creature>::GetContainer(); return HashMapHolder<Creature>::GetContainer();
} }
// when using this, you must use the hashmapholder's lock
HashMapHolder<GameObject>::MapType& GetGameObjects() HashMapHolder<GameObject>::MapType& GetGameObjects()
{ {
return HashMapHolder<GameObject>::GetContainer(); return HashMapHolder<GameObject>::GetContainer();
} }
template<class T> void AddObject(T *object) template<class T> void AddObject(T* object)
{ {
HashMapHolder<T>::Insert(object); HashMapHolder<T>::Insert(object);
} }
template<class T> void RemoveObject(T *object) template<class T> void RemoveObject(T* object)
{ {
HashMapHolder<T>::Remove(object); HashMapHolder<T>::Remove(object);
} }
void RemoveObject(Player *pl) void RemoveObject(Player* pl)
{ {
HashMapHolder<Player>::Remove(pl); HashMapHolder<Player>::Remove(pl);
RemoveUpdateObject((Object*)pl);
Guard guard(i_updateGuard);
i_objects.erase((Object *)pl);
} }
void SaveAllPlayers(); void SaveAllPlayers();
void AddUpdateObject(Object *obj) void AddUpdateObject(Object* obj)
{ {
Guard guard(i_updateGuard); Guard guard(i_updateGuard);
i_objects.insert(obj); i_objects.insert(obj);
} }
void RemoveUpdateObject(Object *obj) void RemoveUpdateObject(Object* obj)
{ {
Guard guard(i_updateGuard); Guard guard(i_updateGuard);
i_objects.erase( obj ); i_objects.erase( obj );
@@ -227,26 +233,25 @@ class ObjectAccessor : public Trinity::Singleton<ObjectAccessor, Trinity::ClassL
void Update(uint32 diff); void Update(uint32 diff);
Corpse* GetCorpseForPlayerGUID(uint64 guid); Corpse* GetCorpseForPlayerGUID(uint64 guid);
void RemoveCorpse(Corpse *corpse); void RemoveCorpse(Corpse* corpse);
void AddCorpse(Corpse *corpse); void AddCorpse(Corpse* corpse);
void AddCorpsesToGrid(GridPair const& gridpair,GridType& grid,Map* map); void AddCorpsesToGrid(GridPair const& gridpair, GridType& grid, Map* map);
Corpse* ConvertCorpseForPlayer(uint64 player_guid, bool insignia = false); Corpse* ConvertCorpseForPlayer(uint64 player_guid, bool insignia = false);
//static void UpdateVisibilityForPlayer(Player* player); typedef ACE_Thread_Mutex LockType;
typedef Trinity::GeneralLock<LockType> Guard;
private: private:
Player2CorpsesMapType i_player2corpse; Player2CorpsesMapType i_player2corpse;
typedef ACE_Thread_Mutex LockType; static void _buildChangeObjectForPlayer(WorldObject*, UpdateDataMapType&);
typedef Trinity::GeneralLock<LockType > Guard; static void _buildPacket(Player*, Object*, UpdateDataMapType&);
void _update();
std::set<Object*> i_objects;
static void _buildChangeObjectForPlayer(WorldObject *, UpdateDataMapType &);
static void _buildPacket(Player *, Object *, UpdateDataMapType &);
void _update(void);
std::set<Object *> i_objects;
LockType i_playerGuard;
LockType i_updateGuard; LockType i_updateGuard;
LockType i_corpseGuard; LockType i_corpseGuard;
LockType i_petGuard;
}; };
#endif #endif