Added separate create() function for ProfileManager, and some cosmetic changes.
This commit is contained in:
hiker
parent
4d6b110e56
commit
1c6d63acc7
17
src/main.cpp
17
src/main.cpp
@ -158,8 +158,8 @@
|
||||
#include "guiengine/engine.hpp"
|
||||
#include "guiengine/event_handler.hpp"
|
||||
#include "guiengine/dialog_queue.hpp"
|
||||
#include "input/input_manager.hpp"
|
||||
#include "input/device_manager.hpp"
|
||||
#include "input/input_manager.hpp"
|
||||
#include "input/wiimote_manager.hpp"
|
||||
#include "io/file_manager.hpp"
|
||||
#include "items/attachment_manager.hpp"
|
||||
@ -170,20 +170,18 @@
|
||||
#include "karts/kart_properties_manager.hpp"
|
||||
#include "modes/demo_world.hpp"
|
||||
#include "modes/profile_world.hpp"
|
||||
#include "network/client_network_manager.hpp"
|
||||
#include "network/network_manager.hpp"
|
||||
#include "network/protocol_manager.hpp"
|
||||
#include "network/protocols/server_lobby_room_protocol.hpp"
|
||||
#include "network/server_network_manager.hpp"
|
||||
#include "network/client_network_manager.hpp"
|
||||
#include "network/server_network_manager.hpp"
|
||||
#include "network/protocol_manager.hpp"
|
||||
#include "network/protocols/server_lobby_room_protocol.hpp"
|
||||
#include "online/current_user.hpp"
|
||||
#include "online/request_manager.hpp"
|
||||
#include "network/client_network_manager.hpp"
|
||||
#include "network/server_network_manager.hpp"
|
||||
#include "network/protocol_manager.hpp"
|
||||
#include "network/protocols/server_lobby_room_protocol.hpp"
|
||||
#include "online/current_user.hpp"
|
||||
#include "online/request_manager.hpp"
|
||||
#include "online/profile_manager.hpp"
|
||||
#include "online/request_manager.hpp"
|
||||
#include "online/servers_manager.hpp"
|
||||
#include "race/grand_prix_manager.hpp"
|
||||
#include "race/highscore_manager.hpp"
|
||||
@ -1009,6 +1007,7 @@ void initRest()
|
||||
// online section of the addons manager will be initialised from a
|
||||
// separate thread running in network http.
|
||||
addons_manager = new AddonsManager();
|
||||
Online::ProfileManager::create();
|
||||
|
||||
Online::RequestManager::get()->startNetworkThread();
|
||||
NewsManager::get(); // this will create the news manager
|
||||
@ -1393,7 +1392,7 @@ static void cleanSuperTuxKart()
|
||||
//see InitTuxkart()
|
||||
Online::RequestManager::deallocate();
|
||||
Online::ServersManager::deallocate();
|
||||
Online::ProfileManager::deallocate();
|
||||
Online::ProfileManager::destroy();
|
||||
Online::CurrentUser::deallocate();
|
||||
GUIEngine::DialogQueue::deallocate();
|
||||
|
||||
|
||||
@ -29,30 +29,23 @@
|
||||
|
||||
using namespace Online;
|
||||
|
||||
namespace Online{
|
||||
static ProfileManager* profile_manager_singleton(NULL);
|
||||
|
||||
ProfileManager* ProfileManager::get()
|
||||
namespace Online
|
||||
{
|
||||
if (profile_manager_singleton == NULL)
|
||||
profile_manager_singleton = new ProfileManager();
|
||||
return profile_manager_singleton;
|
||||
}
|
||||
|
||||
void ProfileManager::deallocate()
|
||||
{
|
||||
delete profile_manager_singleton;
|
||||
profile_manager_singleton = NULL;
|
||||
} // deallocate
|
||||
ProfileManager* ProfileManager::m_profile_manager = NULL;
|
||||
|
||||
// ============================================================================
|
||||
// ------------------------------------------------------------------------
|
||||
/** Private constructor, used by static create() function.
|
||||
*/
|
||||
ProfileManager::ProfileManager()
|
||||
{
|
||||
assert(m_max_cache_size > 1);
|
||||
m_currently_visiting = NULL;
|
||||
}
|
||||
} // ProfileManager
|
||||
|
||||
// ============================================================================
|
||||
// ------------------------------------------------------------------------
|
||||
/** Destructor, which frees the persistent and cached data.
|
||||
*/
|
||||
ProfileManager::~ProfileManager()
|
||||
{
|
||||
clearPersistent();
|
||||
@ -60,9 +53,9 @@ namespace Online{
|
||||
for (it = m_profiles_cache.begin(); it != m_profiles_cache.end(); ++it) {
|
||||
delete it->second;
|
||||
}
|
||||
}
|
||||
} // ~ProfileManager
|
||||
|
||||
// ============================================================================
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
void ProfileManager::iterateCache(Profile * profile)
|
||||
{
|
||||
@ -83,9 +76,9 @@ namespace Online{
|
||||
profile->setCacheBit(true);
|
||||
}
|
||||
|
||||
}
|
||||
} // iterateCache
|
||||
|
||||
// ============================================================================
|
||||
// ------------------------------------------------------------------------
|
||||
/** Initialisation before the object is displayed. If necessary this function
|
||||
* will pause the race if it is running (i.e. world exists). While only some
|
||||
* of the screen can be shown during the race (via the in-game menu you
|
||||
@ -114,13 +107,13 @@ namespace Online{
|
||||
m_profiles_cache[profile->getID()] = profile;
|
||||
assert(m_profiles_cache.size() <= m_max_cache_size);
|
||||
|
||||
}
|
||||
} // directToCache
|
||||
|
||||
// ============================================================================
|
||||
/**
|
||||
* Adds a profile to the persistent map.
|
||||
* If a profile with the same id is already in there, the profiles are "merged" with as goal saving as much information.
|
||||
* (i.e. one profile instance could have already fetched the friends, while the other could have fetched the achievements.)
|
||||
// ------------------------------------------------------------------------
|
||||
/** Adds a profile to the persistent map. If a profile with the same id
|
||||
* is already in there, the profiles are "merged" with as goal saving as
|
||||
* much information (i.e. one profile instance could have already fetched
|
||||
* the friends, while the other could have fetched the achievements.)
|
||||
*/
|
||||
void ProfileManager::addPersistent(Profile * profile)
|
||||
{
|
||||
@ -132,8 +125,9 @@ namespace Online{
|
||||
{
|
||||
m_profiles_persistent[profile->getID()] = profile;
|
||||
}
|
||||
}
|
||||
// ============================================================================
|
||||
} // addPersistent
|
||||
|
||||
// ------------------------------------------------------------------------
|
||||
/**
|
||||
* Removes and deletes an entry from the persistent map.
|
||||
*/
|
||||
@ -146,9 +140,9 @@ namespace Online{
|
||||
}
|
||||
else
|
||||
Log::warn("ProfileManager::removePersistent", "Tried to remove profile with id %d from persistent while not present", id);
|
||||
}
|
||||
} // deleteFromPersistent
|
||||
|
||||
// ============================================================================
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
void ProfileManager::clearPersistent()
|
||||
{
|
||||
@ -157,10 +151,9 @@ namespace Online{
|
||||
delete it->second;
|
||||
}
|
||||
m_profiles_persistent.clear();
|
||||
}
|
||||
|
||||
// ============================================================================
|
||||
} // clearPersistent
|
||||
|
||||
// ------------------------------------------------------------------------
|
||||
void ProfileManager::moveToCache(const uint32_t id)
|
||||
{
|
||||
if (inPersistent(id))
|
||||
@ -171,9 +164,9 @@ namespace Online{
|
||||
}
|
||||
else
|
||||
Log::warn("ProfileManager::moveToCache", "Tried to move profile with id %d from persistent to cache while not present", id);
|
||||
}
|
||||
} // moveToCache
|
||||
|
||||
// ============================================================================
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
void ProfileManager::addToCache(Profile * profile)
|
||||
{
|
||||
@ -183,18 +176,18 @@ namespace Online{
|
||||
m_profiles_cache[profile->getID()]->merge(profile);
|
||||
else
|
||||
directToCache(profile);
|
||||
}
|
||||
} // addToCache
|
||||
|
||||
// ============================================================================
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
bool ProfileManager::inPersistent(const uint32_t id)
|
||||
{
|
||||
if (m_profiles_persistent.find(id) != m_profiles_persistent.end())
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
} // inPersistent
|
||||
|
||||
// ============================================================================
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
bool ProfileManager::cacheHit(const uint32_t id)
|
||||
{
|
||||
@ -204,15 +197,15 @@ namespace Online{
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
} // cacheHit
|
||||
|
||||
// ============================================================================
|
||||
// ------------------------------------------------------------------------
|
||||
void ProfileManager::setVisiting(const uint32_t id)
|
||||
{
|
||||
m_currently_visiting = getProfileByID(id);
|
||||
}
|
||||
} // setVisiting
|
||||
|
||||
// ============================================================================
|
||||
// ------------------------------------------------------------------------
|
||||
|
||||
Profile * ProfileManager::getProfileByID(const uint32_t id)
|
||||
{
|
||||
@ -221,10 +214,10 @@ namespace Online{
|
||||
return m_profiles_persistent[id];
|
||||
if (cacheHit(id))
|
||||
return m_profiles_cache[id];
|
||||
//FIXME not able to get! Now this should actually fetch the info from the server, but I haven't come up with a good asynchronous idea yet.
|
||||
//FIXME not able to get! Now this should actually fetch the info from the
|
||||
// server, but I haven't come up with a good asynchronous idea yet.
|
||||
return NULL;
|
||||
}
|
||||
|
||||
} // getProfileByID
|
||||
|
||||
|
||||
} // namespace Online
|
||||
|
||||
@ -27,28 +27,38 @@
|
||||
|
||||
#include <string>
|
||||
|
||||
namespace Online{
|
||||
/**
|
||||
* \brief Class that takes care of online profiles
|
||||
* \ingroup online
|
||||
namespace Online
|
||||
{
|
||||
|
||||
/** Class that takes care of online profiles.
|
||||
* \ingroup online.
|
||||
*/
|
||||
class ProfileManager
|
||||
{
|
||||
|
||||
private:
|
||||
/** Singleton pointer. */
|
||||
static ProfileManager* m_profile_manager;
|
||||
|
||||
ProfileManager();
|
||||
~ProfileManager();
|
||||
|
||||
/** The mapping of ids to profile. */
|
||||
typedef std::map<uint32_t, Profile*> ProfilesMap;
|
||||
|
||||
/** A map of profiles that is persistent. (i.e. no automatic removing happens) Normally used for the current user's profile and friends. */
|
||||
/** A map of profiles that is persistent. (i.e. no automatic
|
||||
* removing happens) Normally used for the current user's profile
|
||||
* and friends. */
|
||||
ProfilesMap m_profiles_persistent;
|
||||
/**
|
||||
* Any profiles that don't go into the persistent map, go here.
|
||||
* Using a Least Recent Used caching algorithm with age bits to remove entries when the max size is reached.
|
||||
**/
|
||||
|
||||
/** Any profiles that don't go into the persistent map, go here.
|
||||
* Using a Least Recent Used caching algorithm with age bits to
|
||||
* remove entries when the max size is reached.*/
|
||||
ProfilesMap m_profiles_cache;
|
||||
|
||||
/** A temporary profile that is currently being 'visited',
|
||||
* e.g. its data is shown in a gui. */
|
||||
Profile* m_currently_visiting;
|
||||
|
||||
/** The max size of the m_profiles cache. */
|
||||
static const unsigned int m_max_cache_size = 20;
|
||||
|
||||
@ -56,9 +66,30 @@ namespace Online{
|
||||
void directToCache(Profile * profile);
|
||||
|
||||
public:
|
||||
/**Singleton */
|
||||
static ProfileManager * get();
|
||||
static void deallocate();
|
||||
/** Create the singleton instance. */
|
||||
static void create()
|
||||
{
|
||||
assert(!m_profile_manager);
|
||||
m_profile_manager = new ProfileManager();
|
||||
} // create
|
||||
// ----------------------------------------------------------------
|
||||
/** Returns the singleton.
|
||||
* \pre create has been called to create the singleton.
|
||||
*/
|
||||
static ProfileManager* get()
|
||||
{
|
||||
assert(m_profile_manager);
|
||||
return m_profile_manager;
|
||||
} // get
|
||||
// ----------------------------------------------------------------
|
||||
/** Destroys the singleton. */
|
||||
static void destroy()
|
||||
{
|
||||
assert(m_profile_manager);
|
||||
delete m_profile_manager;
|
||||
m_profile_manager = NULL;
|
||||
} // destroy
|
||||
// ----------------------------------------------------------------
|
||||
|
||||
void addToCache(Profile * profile);
|
||||
void addPersistent(Profile * profile);
|
||||
@ -68,9 +99,11 @@ namespace Online{
|
||||
void setVisiting(const uint32_t id);
|
||||
bool cacheHit(const uint32_t id);
|
||||
bool inPersistent(const uint32_t id);
|
||||
/** \return the instance of the profile that's currently being visited */
|
||||
Profile * getVisitingProfile() {return m_currently_visiting;}
|
||||
Profile* getProfileByID(const uint32_t id);
|
||||
// ----------------------------------------------------------------
|
||||
/** \return the instance of the profile that's currently being
|
||||
* visited */
|
||||
Profile* getVisitingProfile() { return m_currently_visiting; }
|
||||
|
||||
}; // class CurrentUser
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user