Skip to content

feat: add timeout parameter to xml2cpp codegen tool (#509) #510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pavelkaryukov wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −6
Open

feat: add timeout parameter to xml2cpp codegen tool (#509) #510

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 22 additions & 6 deletions tools/xml2cpp-codegen/ProxyGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#include <algorithm>
#include <iterator>
#include <regex>
#include <unordered_map>

using std::endl;

Expand Down Expand Up @@ -62,6 +63,20 @@ int ProxyGenerator::transformXmlToFileImpl(const Document &doc, const char *file
return writeToFile(filename, code.str());
}

std::string prepareDefaultTimeout(const std::string& val, const std::string& unit)
{
const std::unordered_map<std::string, std::string> chronoTypes = {
{"us", "std::chrono::microseconds"},
{"ms", "std::chrono::milliseconds"},
{"s", "std::chrono::seconds"},
{"min", "std::chrono::minutes"}
};
const auto iter = chronoTypes.find(unit);

const std::string type = (iter != chronoTypes.end()) ? iter->second : "std::chrono::microseconds";
const std::string defaultValue = type + "(" + val + ")";
return defaultValue;
}

std::string ProxyGenerator::processInterface(Node& interface) const
{
Expand Down Expand Up @@ -212,13 +227,16 @@ std::tuple<std::string, std::string> ProxyGenerator::processMethods(const Nodes&
std::tie(outArgStr, outArgTypeStr, std::ignore, std::ignore) = argsToNamesAndTypes(outArgs);

const std::string realRetType = (async && !dontExpectReply ? (future ? "std::future<" + retType + ">" : "sdbus::PendingAsyncCall") : async ? "void" : retType);
definitionSS << tab << realRetType << " " << nameSafe << "(" << inArgTypeStr << ")" << endl
<< tab << "{" << endl;

std::string timeoutDefaultValue;
if (!timeoutValue.empty())
{
definitionSS << tab << tab << "using namespace std::chrono_literals;" << endl;
const auto val = smTimeout.str(1);
const auto unit = smTimeout.str(2);
timeoutDefaultValue = prepareDefaultTimeout(val, unit);
}
definitionSS << tab << realRetType << " " << nameSafe << "(" << inArgTypeStr << (!timeoutDefaultValue.empty() ? ", const std::chrono::microseconds& timeout = " + timeoutDefaultValue : "") << ")" << endl
<< tab << "{" << endl;

if (outArgs.size() > 0 && !async)
{
Expand All @@ -230,9 +248,7 @@ std::tuple<std::string, std::string> ProxyGenerator::processMethods(const Nodes&

if (!timeoutValue.empty())
{
const auto val = smTimeout.str(1);
const auto unit = smTimeout.str(2);
definitionSS << ".withTimeout(" << val << (unit.empty() ? "us" : unit) << ")";
definitionSS << ".withTimeout(" << "timeout" << ")";
}

if (inArgs.size() > 0)
Expand Down