atria-soft/zeus
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] remove vector of class ==> faster

Browse Source
This commit is contained in:
Edouard DUPIN 2016-05-20 21:55:10 +02:00
parent 33c78cc567
commit a7166a5da3
2 changed files with 67 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
jus/Service.h
View File

@ -51,39 +51,18 @@ class CmdBase {
const std::string& getDescription() const { const std::string& getDescription() const {
return m_description; return m_description;
} }
protected:
ParamType m_returnType;
std::vector<ParamType> m_listParamType;
protected: protected:
CmdBase(const std::string& _name, CmdBase(const std::string& _name,
const std::string& _desc, const std::string& _desc):
const ParamType& _retType,
const std::vector<ParamType>& _params):
m_name(_name), m_name(_name),
m_description(_desc), m_description(_desc) {
m_returnType(_retType),
m_listParamType(_params) {
} }
public: public:
virtual ~CmdBase() {}; virtual ~CmdBase() {};
//virtual bool checkArguments(const std::vector<CmdBase::Variant>& _params) = 0; //virtual bool checkArguments(const std::vector<CmdBase::Variant>& _params) = 0;
public: public:
std::string getPrototype() const { virtual std::string getPrototype() const = 0;
std::string ret;
ret += m_returnType.getName();
ret += " ";
ret += m_name;
ret += "(";
for (size_t iii=0; iii<m_listParamType.size(); ++iii) {
if (iii != 0) {
ret += ", ";
}
ret += m_listParamType[iii].getName();
}
ret += ");";
return ret;
}
virtual ejson::Value execute(const ejson::Array& _params) = 0; virtual ejson::Value execute(const ejson::Array& _params) = 0;
}; };
@ -95,24 +74,41 @@ ejson::Value convertToJson(const JUS_TYPE& _value);
template <class JUS_RETURN, class... JUS_TYPES> template <class JUS_RETURN, class... JUS_TYPES>
class TypeList: public CmdBase { class TypeList: public CmdBase {
protected:
static const ParamType m_returnType;
static const ParamType m_paramType[sizeof...(JUS_TYPES)];
static const int32_t m_paramCount;
public: public:
using functionType = JUS_RETURN (*)(JUS_TYPES...); using functionType = JUS_RETURN (*)(JUS_TYPES...);
functionType m_function; functionType m_function;
TypeList(const std::string& _name, const std::string& _desc, functionType _fptr): TypeList(const std::string& _name, const std::string& _desc, functionType _fptr):
CmdBase(_name, _desc, createType<JUS_RETURN>(), {createType<JUS_TYPES>()...}), CmdBase(_name, _desc),
//m_sizeParam(sizeof...(JUS_TYPES)),
m_function(_fptr) { m_function(_fptr) {
} }
ejson::Value execute(const ejson::Array& _params) { std::string getPrototype() const override {
std::string ret;
ret += m_returnType.getName();
ret += " ";
ret += m_name;
ret += "(";
for (size_t iii=0; iii<m_paramCount; ++iii) {
if (iii != 0) {
ret += ", ";
}
ret += m_paramType[iii].getName();
}
ret += ");";
return ret;
}
ejson::Value execute(const ejson::Array& _params) override {
ejson::Object out; ejson::Object out;
if (_params.size() != m_listParamType.size()) { if (_params.size() != m_paramCount) {
JUS_ERROR("Wrong number of Parameters ..."); JUS_ERROR("Wrong number of Parameters ...");
out.add("error", ejson::String("WRONG-PARAMETER-NUMBER")); out.add("error", ejson::String("WRONG-PARAMETER-NUMBER"));
std::string help = "request "; std::string help = "request ";
help += etk::to_string(_params.size()); help += etk::to_string(_params.size());
help += " parameters and need "; help += " parameters and need ";
help += etk::to_string(m_listParamType.size()); help += etk::to_string(m_paramCount);
help += " parameters. prototype function:"; help += " parameters. prototype function:";
help += getPrototype(); help += getPrototype();
out.add("error-help", ejson::String(help)); out.add("error-help", ejson::String(help));
@ -126,7 +122,7 @@ class TypeList: public CmdBase {
int32_t idParam = 0; int32_t idParam = 0;
ejson::Value retVal = convertToJson(m_function(convertJsonTo<JUS_TYPES>(_params[idParam++])...)); ejson::Value retVal = convertToJson(m_function(convertJsonTo<JUS_TYPES>(_params[idParam++])...));
#elif defined(__GNUC__) || defined(__GNUG__) || defined(_MSC_VER) #elif defined(__GNUC__) || defined(__GNUG__) || defined(_MSC_VER)
int32_t idParam = m_listParamType.size()-1; int32_t idParam = m_paramCount-1;
ejson::Value retVal = convertToJson(m_function(convertJsonTo<JUS_TYPES>(_params[idParam--])...)); ejson::Value retVal = convertToJson(m_function(convertJsonTo<JUS_TYPES>(_params[idParam--])...));
#else #else
#error Must be implemented ... #error Must be implemented ...
@ -135,27 +131,54 @@ class TypeList: public CmdBase {
return out; return out;
} }
}; };
template <class JUS_RETURN, class... JUS_TYPES>
const ParamType TypeList<JUS_RETURN, JUS_TYPES...>::m_returnType = createType<JUS_RETURN>();
template <class JUS_RETURN, class... JUS_TYPES>
const ParamType TypeList<JUS_RETURN, JUS_TYPES...>::m_paramType[sizeof...(JUS_TYPES)] = {createType<JUS_TYPES>()...};
template <class JUS_RETURN, class... JUS_TYPES>
const int32_t TypeList<JUS_RETURN, JUS_TYPES...>::m_paramCount = sizeof...(JUS_TYPES);
// Void special case: // Void special case:
template <class... JUS_TYPES> template <class... JUS_TYPES>
class TypeListVoid: public CmdBase { class TypeListVoid: public CmdBase {
protected:
static const ParamType m_paramType[sizeof...(JUS_TYPES)];
static const int32_t m_paramCount;
public: public:
using functionType = void (*)(JUS_TYPES...); using functionType = void (*)(JUS_TYPES...);
functionType m_function; functionType m_function;
TypeListVoid(const std::string& _name, const std::string& _desc, functionType _fptr): TypeListVoid(const std::string& _name, const std::string& _desc, functionType _fptr):
CmdBase(_name, _desc, createType<void>(), {createType<JUS_TYPES>()...}), CmdBase(_name, _desc),
//m_sizeParam(sizeof...(JUS_TYPES)),
m_function(_fptr) { m_function(_fptr) {
} }
std::string getPrototype() const override {
std::string ret;
ret += createType<void>().getName();
ret += " ";
ret += m_name;
ret += "(";
for (size_t iii=0; iii<m_paramCount; ++iii) {
if (iii != 0) {
ret += ", ";
}
ret += m_paramType[iii].getName();
}
ret += ");";
return ret;
}
ejson::Value execute(const ejson::Array& _params) override { ejson::Value execute(const ejson::Array& _params) override {
ejson::Object out; ejson::Object out;
if (_params.size() != m_listParamType.size()) { if (_params.size() != m_paramCount) {
JUS_ERROR("Wrong number of Parameters ..."); JUS_ERROR("Wrong number of Parameters ...");
out.add("error", ejson::String("WRONG-PARAMETER-NUMBER")); out.add("error", ejson::String("WRONG-PARAMETER-NUMBER"));
std::string help = "request "; std::string help = "request ";
help += etk::to_string(_params.size()); help += etk::to_string(_params.size());
help += " parameters and need "; help += " parameters and need ";
help += etk::to_string(m_listParamType.size()); help += etk::to_string(m_paramCount);
help += " parameters. prototype function:"; help += " parameters. prototype function:";
help += getPrototype(); help += getPrototype();
out.add("error-help", ejson::String(help)); out.add("error-help", ejson::String(help));
@ -178,6 +201,13 @@ class TypeListVoid: public CmdBase {
return out; return out;
} }
}; };
template <class... JUS_TYPES>
const ParamType TypeListVoid<JUS_TYPES...>::m_paramType[sizeof...(JUS_TYPES)] = {createType<JUS_TYPES>()...};
template <class... JUS_TYPES>
const int32_t TypeListVoid<JUS_TYPES...>::m_paramCount = sizeof...(JUS_TYPES);
template <typename JUS_RETURN, typename... JUS_TYPES> template <typename JUS_RETURN, typename... JUS_TYPES>
CmdBase* createCmd(const std::string& _name, const std::string& _desc, JUS_RETURN (*_fffp)(JUS_TYPES...)) { CmdBase* createCmd(const std::string& _name, const std::string& _desc, JUS_RETURN (*_fffp)(JUS_TYPES...)) {

2
lutin_jus.py
View File

@ -48,6 +48,8 @@ def create(target, module_name):
'jus/Service.h', 'jus/Service.h',
'jus/TcpString.h', 'jus/TcpString.h',
]) ])
if target.config["compilator"] == "clang":
my_module.add_export_flag('c++', "-Wno-unsequenced")
# build in C++ mode # build in C++ mode
my_module.compile_version("c++", 2011) my_module.compile_version("c++", 2011)
return my_module return my_module