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

[DEV] correct basic client

Browse Source
This commit is contained in:
Edouard DUPIN 2017-06-15 23:42:22 +02:00
parent 6951f04742
commit 0a8dc71521
4 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/cli/appl/main-tool-client.cpp
View File

@ -523,14 +523,18 @@ int main(int _argc, const char *_argv[]) {
APPL_PRINT(" desc=" << proxy.sys.getDescription().wait().get()); APPL_PRINT(" desc=" << proxy.sys.getDescription().wait().get());
APPL_PRINT(" version=" << proxy.sys.getVersion().wait().get()); APPL_PRINT(" version=" << proxy.sys.getVersion().wait().get());
APPL_PRINT(" type=" << proxy.sys.getType().wait().get()); APPL_PRINT(" type=" << proxy.sys.getType().wait().get());
APPL_PRINT(" extention=" << proxy.sys.getExtention().wait().get());
APPL_PRINT(" authors=" << proxy.sys.getAuthors().wait().get()); APPL_PRINT(" authors=" << proxy.sys.getAuthors().wait().get());
auto listFunctions = proxy.sys.getFunctions().wait().get(); auto listFunctions = proxy.sys.getFunctions().wait().get();
APPL_PRINT(" functions: " << listFunctions.size()); APPL_PRINT(" functions: " << listFunctions.size());
for (auto &it: listFunctions) { for (auto &it: listFunctions) {
#if 0
APPL_PRINT(" " << it); APPL_PRINT(" " << it);
APPL_PRINT(" prototype=" << proxy.sys.getFunctionPrototype(it).wait().get()); APPL_PRINT(" prototype=" << proxy.sys.getFunctionPrototype(it).wait().get());
APPL_PRINT(" desc=" << proxy.sys.getFunctionDescription(it).wait().get()); APPL_PRINT(" desc=" << proxy.sys.getFunctionDescription(it).wait().get());
#else
APPL_PRINT(" " << proxy.sys.getFunctionPrototype(it).wait().get());
APPL_PRINT(" " << proxy.sys.getFunctionDescription(it).wait().get());
#endif
} }
} }
} else { } else {

4
zeus/ObjectIntrospect.cpp
View File

@ -23,10 +23,6 @@ zeus::Future<std::string> zeus::ObjectIntrospect::getType() {
return m_obj.call("sys.getType"); return m_obj.call("sys.getType");
} }
zeus::Future<std::vector<std::string>> zeus::ObjectIntrospect::getExtention() {
return m_obj.call("sys.getExtention");
}
zeus::Future<std::vector<std::string>> zeus::ObjectIntrospect::getAuthors() { zeus::Future<std::vector<std::string>> zeus::ObjectIntrospect::getAuthors() {
return m_obj.call("sys.getAuthors"); return m_obj.call("sys.getAuthors");
} }

5
zeus/ObjectIntrospect.hpp
View File

@ -35,11 +35,6 @@ namespace zeus {
* @return A future of the string type * @return A future of the string type
*/ */
zeus::Future<std::string> getType(); zeus::Future<std::string> getType();
/**
* @brief Get the list of extention availlable of the object (more specific of the service)
* @return A future on all extention availlable. Format: "typeExtention:xx.yy.zz"
*/
zeus::Future<std::vector<std::string>> getExtention();
/** /**
* @brief get the list of all authors of the objects * @brief get the list of all authors of the objects
* @return A future on the list of authors. Format: "NAME surname <email@someware.xxx>" * @return A future on the list of authors. Format: "NAME surname <email@someware.xxx>"

7
zeus/message/Parameter.cpp
View File

@ -63,7 +63,8 @@ void zeus::message::Parameter::composeWith(const uint8_t* _buffer, uint32_t _len
} }
zeus::message::ParamType zeus::message::Parameter::getParameterType(int32_t _id) const { zeus::message::ParamType zeus::message::Parameter::getParameterType(int32_t _id) const {
if (m_parameter.size() <= _id) { if ( m_parameter.size() <= _id
|| _id < 0) {
ZEUS_ERROR("out of range Id for parameter ... " << _id << " have " << m_parameter.size()); ZEUS_ERROR("out of range Id for parameter ... " << _id << " have " << m_parameter.size());
return createType<void>(); return createType<void>();
} }
@ -124,7 +125,7 @@ zeus::message::ParamType zeus::message::Parameter::getParameterType(int32_t _id)
const uint8_t* zeus::message::Parameter::getParameterPointer(int32_t _id) const { const uint8_t* zeus::message::Parameter::getParameterPointer(int32_t _id) const {
const uint8_t* out = nullptr; const uint8_t* out = nullptr;
if ( m_parameter.size() <= _id if ( m_parameter.size() <= _id
&& _id < 0) { || _id < 0) {
ZEUS_ERROR("out of range Id for parameter ... " << _id << " have " << m_parameter.size()); ZEUS_ERROR("out of range Id for parameter ... " << _id << " have " << m_parameter.size());
return out; return out;
} }
@ -143,7 +144,7 @@ const uint8_t* zeus::message::Parameter::getParameterPointer(int32_t _id) const
uint32_t zeus::message::Parameter::getParameterSize(int32_t _id) const { uint32_t zeus::message::Parameter::getParameterSize(int32_t _id) const {
int32_t out = 0; int32_t out = 0;
if ( m_parameter.size() <= _id if ( m_parameter.size() <= _id
&& _id < 0) { || _id < 0) {
ZEUS_ERROR("out of range Id for parameter ... " << _id << " have " << m_parameter.size()); ZEUS_ERROR("out of range Id for parameter ... " << _id << " have " << m_parameter.size());
return 0; return 0;
} }