kvazar
/
kevacoin
mirror of https://github.com/kvazar-network/kevacoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Util: Create ArgsManager class... 

- Introduce ArgsManager::GetArgs()
- Adapt util_tests.cpp to ArgsManager
0.15
Jorge Timón 8 years ago
parent
35da2aeed7
commit
f2957ce6cd
No known key found for this signature in database
GPG Key ID: 8866C18EA1C944A2
3 changed files with 120 additions and 46 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 77
      src/test/util_tests.cpp
  2. 28
      src/util.cpp
  3. 61
      src/util.h

77
src/test/util_tests.cpp
Unescape View File

@ -17,8 +17,6 @@
#include <boost/test/unit_test.hpp> #include <boost/test/unit_test.hpp>
extern std::map<std::string, std::string> mapArgs;
BOOST_FIXTURE_TEST_SUITE(util_tests, BasicTestingSetup) BOOST_FIXTURE_TEST_SUITE(util_tests, BasicTestingSetup)
BOOST_AUTO_TEST_CASE(util_criticalsection) BOOST_AUTO_TEST_CASE(util_criticalsection)
@ -100,52 +98,67 @@ BOOST_AUTO_TEST_CASE(util_DateTimeStrFormat)
BOOST_CHECK_EQUAL(DateTimeStrFormat("%a, %d %b %Y %H:%M:%S +0000", 1317425777), "Fri, 30 Sep 2011 23:36:17 +0000"); BOOST_CHECK_EQUAL(DateTimeStrFormat("%a, %d %b %Y %H:%M:%S +0000", 1317425777), "Fri, 30 Sep 2011 23:36:17 +0000");
} }
class TestArgsManager : public ArgsManager
{
public:
std::map<std::string, std::string>& GetMapArgs()
{
return mapArgs;
};
const std::map<std::string, std::vector<std::string> >& GetMapMultiArgs()
{
return mapMultiArgs;
};
};
BOOST_AUTO_TEST_CASE(util_ParseParameters) BOOST_AUTO_TEST_CASE(util_ParseParameters)
{ {
TestArgsManager testArgs;
const char *argv_test[] = {"-ignored", "-a", "-b", "-ccc=argument", "-ccc=multiple", "f", "-d=e"}; const char *argv_test[] = {"-ignored", "-a", "-b", "-ccc=argument", "-ccc=multiple", "f", "-d=e"};
ParseParameters(0, (char**)argv_test); testArgs.ParseParameters(0, (char**)argv_test);
BOOST_CHECK(mapArgs.empty() && mapMultiArgs.empty()); BOOST_CHECK(testArgs.GetMapArgs().empty() && testArgs.GetMapMultiArgs().empty());
ParseParameters(1, (char**)argv_test); testArgs.ParseParameters(1, (char**)argv_test);
BOOST_CHECK(mapArgs.empty() && mapMultiArgs.empty()); BOOST_CHECK(testArgs.GetMapArgs().empty() && testArgs.GetMapMultiArgs().empty());
ParseParameters(5, (char**)argv_test); testArgs.ParseParameters(5, (char**)argv_test);
// expectation: -ignored is ignored (program name argument), // expectation: -ignored is ignored (program name argument),
// -a, -b and -ccc end up in map, -d ignored because it is after // -a, -b and -ccc end up in map, -d ignored because it is after
// a non-option argument (non-GNU option parsing) // a non-option argument (non-GNU option parsing)
BOOST_CHECK(mapArgs.size() == 3 && mapMultiArgs.size() == 3); BOOST_CHECK(testArgs.GetMapArgs().size() == 3 && testArgs.GetMapMultiArgs().size() == 3);
BOOST_CHECK(IsArgSet("-a") && IsArgSet("-b") && IsArgSet("-ccc") BOOST_CHECK(testArgs.IsArgSet("-a") && testArgs.IsArgSet("-b") && testArgs.IsArgSet("-ccc")
&& !IsArgSet("f") && !IsArgSet("-d")); && !testArgs.IsArgSet("f") && !testArgs.IsArgSet("-d"));
BOOST_CHECK(mapMultiArgs.count("-a") && mapMultiArgs.count("-b") && mapMultiArgs.count("-ccc") BOOST_CHECK(testArgs.GetMapMultiArgs().count("-a") && testArgs.GetMapMultiArgs().count("-b") && testArgs.GetMapMultiArgs().count("-ccc")
&& !mapMultiArgs.count("f") && !mapMultiArgs.count("-d")); && !testArgs.GetMapMultiArgs().count("f") && !testArgs.GetMapMultiArgs().count("-d"));
BOOST_CHECK(mapArgs["-a"] == "" && mapArgs["-ccc"] == "multiple"); BOOST_CHECK(testArgs.GetMapArgs()["-a"] == "" && testArgs.GetMapArgs()["-ccc"] == "multiple");
BOOST_CHECK(mapMultiArgs.at("-ccc").size() == 2); BOOST_CHECK(testArgs.GetArgs("-ccc").size() == 2);
} }
BOOST_AUTO_TEST_CASE(util_GetArg) BOOST_AUTO_TEST_CASE(util_GetArg)
{ {
mapArgs.clear(); TestArgsManager testArgs;
mapArgs["strtest1"] = "string..."; testArgs.GetMapArgs().clear();
testArgs.GetMapArgs()["strtest1"] = "string...";
// strtest2 undefined on purpose // strtest2 undefined on purpose
mapArgs["inttest1"] = "12345"; testArgs.GetMapArgs()["inttest1"] = "12345";
mapArgs["inttest2"] = "81985529216486895"; testArgs.GetMapArgs()["inttest2"] = "81985529216486895";
// inttest3 undefined on purpose // inttest3 undefined on purpose
mapArgs["booltest1"] = ""; testArgs.GetMapArgs()["booltest1"] = "";
// booltest2 undefined on purpose // booltest2 undefined on purpose
mapArgs["booltest3"] = "0"; testArgs.GetMapArgs()["booltest3"] = "0";
mapArgs["booltest4"] = "1"; testArgs.GetMapArgs()["booltest4"] = "1";
BOOST_CHECK_EQUAL(GetArg("strtest1", "default"), "string..."); BOOST_CHECK_EQUAL(testArgs.GetArg("strtest1", "default"), "string...");
BOOST_CHECK_EQUAL(GetArg("strtest2", "default"), "default"); BOOST_CHECK_EQUAL(testArgs.GetArg("strtest2", "default"), "default");
BOOST_CHECK_EQUAL(GetArg("inttest1", -1), 12345); BOOST_CHECK_EQUAL(testArgs.GetArg("inttest1", -1), 12345);
BOOST_CHECK_EQUAL(GetArg("inttest2", -1), 81985529216486895LL); BOOST_CHECK_EQUAL(testArgs.GetArg("inttest2", -1), 81985529216486895LL);
BOOST_CHECK_EQUAL(GetArg("inttest3", -1), -1); BOOST_CHECK_EQUAL(testArgs.GetArg("inttest3", -1), -1);
BOOST_CHECK_EQUAL(GetBoolArg("booltest1", false), true); BOOST_CHECK_EQUAL(testArgs.GetBoolArg("booltest1", false), true);
BOOST_CHECK_EQUAL(GetBoolArg("booltest2", false), false); BOOST_CHECK_EQUAL(testArgs.GetBoolArg("booltest2", false), false);
BOOST_CHECK_EQUAL(GetBoolArg("booltest3", false), false); BOOST_CHECK_EQUAL(testArgs.GetBoolArg("booltest3", false), false);
BOOST_CHECK_EQUAL(GetBoolArg("booltest4", false), true); BOOST_CHECK_EQUAL(testArgs.GetBoolArg("booltest4", false), true);
} }
BOOST_AUTO_TEST_CASE(util_FormatMoney) BOOST_AUTO_TEST_CASE(util_FormatMoney)

28
src/util.cpp
Unescape View File

@ -13,7 +13,6 @@
#include "fs.h" #include "fs.h"
#include "random.h" #include "random.h"
#include "serialize.h" #include "serialize.h"
#include "sync.h"
#include "utilstrencodings.h" #include "utilstrencodings.h"
#include "utiltime.h" #include "utiltime.h"
@ -92,8 +91,7 @@
const char * const BITCOIN_CONF_FILENAME = "bitcoin.conf"; const char * const BITCOIN_CONF_FILENAME = "bitcoin.conf";
const char * const BITCOIN_PID_FILENAME = "bitcoind.pid"; const char * const BITCOIN_PID_FILENAME = "bitcoind.pid";
CCriticalSection cs_args; ArgsManager gArgs;
std::map<std::string, std::string> mapArgs;
static std::map<std::string, std::vector<std::string> > _mapMultiArgs; static std::map<std::string, std::vector<std::string> > _mapMultiArgs;
const std::map<std::string, std::vector<std::string> >& mapMultiArgs = _mapMultiArgs; const std::map<std::string, std::vector<std::string> >& mapMultiArgs = _mapMultiArgs;
bool fPrintToConsole = false; bool fPrintToConsole = false;
@ -384,7 +382,7 @@ static void InterpretNegativeSetting(std::string& strKey, std::string& strValue)
} }
} }
void ParseParameters(int argc, const char* const argv[]) void ArgsManager::ParseParameters(int argc, const char* const argv[])
{ {
LOCK(cs_args); LOCK(cs_args);
mapArgs.clear(); mapArgs.clear();
@ -420,13 +418,19 @@ void ParseParameters(int argc, const char* const argv[])
} }
} }
bool IsArgSet(const std::string& strArg) std::vector<std::string> ArgsManager::GetArgs(const std::string& strArg)
{
LOCK(cs_args);
return mapMultiArgs.at(strArg);
}
bool ArgsManager::IsArgSet(const std::string& strArg)
{ {
LOCK(cs_args); LOCK(cs_args);
return mapArgs.count(strArg); return mapArgs.count(strArg);
} }
std::string GetArg(const std::string& strArg, const std::string& strDefault) std::string ArgsManager::GetArg(const std::string& strArg, const std::string& strDefault)
{ {
LOCK(cs_args); LOCK(cs_args);
if (mapArgs.count(strArg)) if (mapArgs.count(strArg))
@ -434,7 +438,7 @@ std::string GetArg(const std::string& strArg, const std::string& strDefault)
return strDefault; return strDefault;
} }
int64_t GetArg(const std::string& strArg, int64_t nDefault) int64_t ArgsManager::GetArg(const std::string& strArg, int64_t nDefault)
{ {
LOCK(cs_args); LOCK(cs_args);
if (mapArgs.count(strArg)) if (mapArgs.count(strArg))
@ -442,7 +446,7 @@ int64_t GetArg(const std::string& strArg, int64_t nDefault)
return nDefault; return nDefault;
} }
bool GetBoolArg(const std::string& strArg, bool fDefault) bool ArgsManager::GetBoolArg(const std::string& strArg, bool fDefault)
{ {
LOCK(cs_args); LOCK(cs_args);
if (mapArgs.count(strArg)) if (mapArgs.count(strArg))
@ -450,7 +454,7 @@ bool GetBoolArg(const std::string& strArg, bool fDefault)
return fDefault; return fDefault;
} }
bool SoftSetArg(const std::string& strArg, const std::string& strValue) bool ArgsManager::SoftSetArg(const std::string& strArg, const std::string& strValue)
{ {
LOCK(cs_args); LOCK(cs_args);
if (mapArgs.count(strArg)) if (mapArgs.count(strArg))
@ -459,7 +463,7 @@ bool SoftSetArg(const std::string& strArg, const std::string& strValue)
return true; return true;
} }
bool SoftSetBoolArg(const std::string& strArg, bool fValue) bool ArgsManager::SoftSetBoolArg(const std::string& strArg, bool fValue)
{ {
if (fValue) if (fValue)
return SoftSetArg(strArg, std::string("1")); return SoftSetArg(strArg, std::string("1"));
@ -467,7 +471,7 @@ bool SoftSetBoolArg(const std::string& strArg, bool fValue)
return SoftSetArg(strArg, std::string("0")); return SoftSetArg(strArg, std::string("0"));
} }
void ForceSetArg(const std::string& strArg, const std::string& strValue) void ArgsManager::ForceSetArg(const std::string& strArg, const std::string& strValue)
{ {
LOCK(cs_args); LOCK(cs_args);
mapArgs[strArg] = strValue; mapArgs[strArg] = strValue;
@ -589,7 +593,7 @@ fs::path GetConfigFile(const std::string& confPath)
return pathConfigFile; return pathConfigFile;
} }
void ReadConfigFile(const std::string& confPath) void ArgsManager::ReadConfigFile(const std::string& confPath)
{ {
fs::ifstream streamConfig(GetConfigFile(confPath)); fs::ifstream streamConfig(GetConfigFile(confPath));
if (!streamConfig.good()) if (!streamConfig.good())

61
src/util.h
Unescape View File

@ -16,6 +16,7 @@
#include "compat.h" #include "compat.h"
#include "fs.h" #include "fs.h"
#include "sync.h"
#include "tinyformat.h" #include "tinyformat.h"
#include "utiltime.h" #include "utiltime.h"
@ -148,7 +149,6 @@ bool error(const char* fmt, const Args&... args)
} }
void PrintExceptionContinue(const std::exception *pex, const char* pszThread); void PrintExceptionContinue(const std::exception *pex, const char* pszThread);
void ParseParameters(int argc, const char*const argv[]);
void FileCommit(FILE *file); void FileCommit(FILE *file);
bool TruncateFile(FILE *file, unsigned int length); bool TruncateFile(FILE *file, unsigned int length);
int RaiseFileDescriptorLimit(int nMinFD); int RaiseFileDescriptorLimit(int nMinFD);
@ -163,7 +163,6 @@ fs::path GetConfigFile(const std::string& confPath);
fs::path GetPidFile(); fs::path GetPidFile();
void CreatePidFile(const fs::path &path, pid_t pid); void CreatePidFile(const fs::path &path, pid_t pid);
#endif #endif
void ReadConfigFile(const std::string& confPath);
#ifdef WIN32 #ifdef WIN32
fs::path GetSpecialFolderPath(int nFolder, bool fCreate = true); fs::path GetSpecialFolderPath(int nFolder, bool fCreate = true);
#endif #endif
@ -180,6 +179,15 @@ inline bool IsSwitchChar(char c)
#endif #endif
} }
class ArgsManager
{
protected:
CCriticalSection cs_args;
std::map<std::string, std::string> mapArgs;
public:
void ParseParameters(int argc, const char*const argv[]);
void ReadConfigFile(const std::string& confPath);
std::vector<std::string> GetArgs(const std::string& strArg);
/** /**
* Return true if the given argument has been manually set * Return true if the given argument has been manually set
* *
@ -235,6 +243,55 @@ bool SoftSetBoolArg(const std::string& strArg, bool fValue);
// Forces a arg setting, used only in testing // Forces a arg setting, used only in testing
void ForceSetArg(const std::string& strArg, const std::string& strValue); void ForceSetArg(const std::string& strArg, const std::string& strValue);
};
extern ArgsManager gArgs;
// wrappers using the global ArgsManager:
static inline void ParseParameters(int argc, const char*const argv[])
{
gArgs.ParseParameters(argc, argv);
}
static inline void ReadConfigFile(const std::string& confPath)
{
gArgs.ReadConfigFile(confPath);
}
static inline bool SoftSetArg(const std::string& strArg, const std::string& strValue)
{
return gArgs.SoftSetArg(strArg, strValue);
}
static inline void ForceSetArg(const std::string& strArg, const std::string& strValue)
{
gArgs.ForceSetArg(strArg, strValue);
}
static inline bool IsArgSet(const std::string& strArg)
{
return gArgs.IsArgSet(strArg);
}
static inline std::string GetArg(const std::string& strArg, const std::string& strDefault)
{
return gArgs.GetArg(strArg, strDefault);
}
static inline int64_t GetArg(const std::string& strArg, int64_t nDefault)
{
return gArgs.GetArg(strArg, nDefault);
}
static inline bool GetBoolArg(const std::string& strArg, bool fDefault)
{
return gArgs.GetBoolArg(strArg, fDefault);
}
static inline bool SoftSetBoolArg(const std::string& strArg, bool fValue)
{
return gArgs.SoftSetBoolArg(strArg, fValue);
}
/** /**
* Format a string to be used as group of options in help messages * Format a string to be used as group of options in help messages

Write Preview
Loading…
Cancel
Save