0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added support for passing config object as reference to config_cache

Browse source
This commit is contained in:
Pauli Nieminen 2008-08-27 09:13:02 +00:00
parent 43ca9ef2cc
commit fd90310daf
2 changed files with 97 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/config_cache.cpp
View file

@ -77,6 +77,11 @@ namespace game_config {
}
void config_cache::get_config(const std::string& path, config& cfg)
{
load_configs(path, cfg);
}
config_ptr config_cache::get_config(const std::string& path)
{
config_ptr ret(new config());

177
src/config_cache.hpp
View file

@ -22,96 +22,103 @@
namespace game_config {
/**
* Singleton object to manage game configs
* and cache reading.
* @TODO: Make smarter filetree checksum caching so only required parts
* of tree are checked at startup. Trees are overlapping so have
* to split trees to subtrees to only do check once per file.
**/
class config_cache : private boost::noncopyable {
static config_cache cache_;
bool force_valid_cache_, use_cache_;
preproc_map defines_map_;
void read_configs(config&, std::string&);
void read_file(const std::string& file, config& cfg);
void write_file(std::string file, const config& cfg);
void read_cache(const std::string& path, config& cfg);
void read_configs(const std::string& path, config& cfg);
// Protected to let test code access
protected:
config_cache();
const preproc_map& get_preproc_map() const;
void load_configs(const std::string& path, config& cfg);
public:
/**
* Get reference to the singleton object
* Singleton object to manage game configs
* and cache reading.
* @TODO: Make smarter filetree checksum caching so only required parts
* of tree are checked at startup. Trees are overlapping so have
* to split trees to subtrees to only do check once per file.
**/
static config_cache& instance();
class config_cache : private boost::noncopyable {
static config_cache cache_;
bool force_valid_cache_, use_cache_;
preproc_map defines_map_;
void read_configs(config&, std::string&);
void read_file(const std::string& file, config& cfg);
void write_file(std::string file, const config& cfg);
void read_cache(const std::string& path, config& cfg);
void read_configs(const std::string& path, config& cfg);
// Protected to let test code access
protected:
config_cache();
const preproc_map& get_preproc_map() const;
void load_configs(const std::string& path, config& cfg);
public:
/**
* Get reference to the singleton object
**/
static config_cache& instance();
/**
* get config object from given path
* @param path which to load. Should be _main.cfg.
* @param config object that is writen to, It should be empty
* because there is no quarentee how filled in config is handled
**/
void get_config(const std::string& path, config& cfg);
/**
* get config_ptr from given path
* @return shread_ptr config object
* @param config object that is writen to
**/
config_ptr get_config(const std::string& path);
/**
* Clear stored defines map to default values
**/
void clear_defines();
/**
* Add a entry to preproc defines map
**/
void add_define(const std::string& define);
/**
* Remove a entry to preproc defines map
**/
void remove_define(const std::string& define);
/**
* Enable/disable caching
**/
void set_use_cache(bool use);
/**
* Enable/disable cache validation
**/
void set_force_valid_cache(bool force);
/**
* Force cache checksum validation.
**/
void recheck_filetree_checksum();
};
/**
* get config object from given path
* @param path which to load. Should be _main.cfg.
* @return shread_ptr config object
* Used to set and unset scoped defines to preproc_map
* This is prefered form to set defines that aren't global
**/
config_ptr get_config(const std::string& path);
/**
* Clear stored defines map to default values
**/
void clear_defines();
/**
* Add a entry to preproc defines map
**/
void add_define(const std::string& define);
/**
* Remove a entry to preproc defines map
**/
void remove_define(const std::string& define);
/**
* Enable/disable caching
**/
void set_use_cache(bool use);
/**
* Enable/disable cache validation
**/
void set_force_valid_cache(bool force);
/**
* Force cache checksum validation.
**/
void recheck_filetree_checksum();
};
/**
* Used to set and unset scoped defines to preproc_map
* This is prefered form to set defines that aren't global
**/
template <class T>
class scoped_preproc_define_internal : private boost::noncopyable {
// Protected to let test code access
protected:
std::string name_;
public:
scoped_preproc_define_internal(const std::string& name) : name_(name)
{
T::instance().add_define(name_);
}
~scoped_preproc_define_internal()
{
T::instance().remove_define(name_);
}
};
typedef scoped_preproc_define_internal<config_cache> scoped_preproc_define;
template <class T>
class scoped_preproc_define_internal : private boost::noncopyable {
// Protected to let test code access
protected:
std::string name_;
public:
scoped_preproc_define_internal(const std::string& name) : name_(name)
{
T::instance().add_define(name_);
}
~scoped_preproc_define_internal()
{
T::instance().remove_define(name_);
}
};
typedef scoped_preproc_define_internal<config_cache> scoped_preproc_define;
}
#endif