Standardize facelift dbus communication #303
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,14 +36,10 @@ | |
| {% set className = interfaceName + proxyTypeNameSuffix %} | ||
|
|
||
| #include "{{className}}.h" | ||
| {{module.namespaceCppOpen}} | ||
|
|
||
| {{className}}::{{className}}(QObject *parent) : BaseType(parent) | ||
| {% for property in interface.properties %} | ||
| {% if property.type.is_model %} | ||
| , m_{{property.name}}(*this) | ||
| {% endif %} | ||
|
|
@@ -55,76 +51,132 @@ | |
| {% endif %} | ||
| } | ||
|
|
||
| void {{className}}::unmarshalProperties(const QVariantMap& values) | ||
| { | ||
| QMap<QString, bool> emitChangeSignal; | ||
|
idleroamer marked this conversation as resolved.
Outdated
|
||
| for (const QString &propertyName: values.keys()) { | ||
| {% for property in interface.properties %} | ||
| if (propertyName == QStringLiteral("{{property.name}}")) { | ||
| {% if property.type.is_interface %} | ||
| const {{property.interfaceCppType}} previous_{{property.name}}_Value = m_{{property.name}}; | ||
| m_{{property.name}} = castFromQVariant<{{property.interfaceCppType}}>(values[propertyName]); | ||
| emitChangeSignal[QStringLiteral("{{property.name}}")] = ((previous_{{property.name}}_Value != m_{{property.name}})); | ||
| {% elif property.type.is_model %} | ||
| emitChangeSignal[QStringLiteral("{{property.name}}")] = true; | ||
| int {{property.name}}Size = castFromQVariant<int>(values[propertyName]); | ||
| m_{{property.name}}.beginResetModel(); | ||
| m_{{property.name}}.reset({{property.name}}Size, std::bind(&ThisType::{{property.name}}Data, this, std::placeholders::_1)); | ||
| m_{{property.name}}.endResetModel(); | ||
| {% else %} | ||
| const auto previous_{{property.name}}_Value = m_{{property.name}}; | ||
| m_{{property.name}} = castFromQVariant<{{property.interfaceCppType}}>(values[propertyName]); | ||
| emitChangeSignal[QStringLiteral("{{property.name}}")] = ((previous_{{property.name}}_Value != m_{{property.name}})); | ||
| {% endif %} | ||
| } | ||
|
idleroamer marked this conversation as resolved.
Outdated
|
||
| {% endfor %} | ||
| if (propertyName == QStringLiteral("ready")) { | ||
| bool previousIsReady = this->ready(); | ||
| m_serviceReady = castFromQVariant<bool>(values[propertyName]); | ||
| emitChangeSignal[QStringLiteral("ready")] = (previousIsReady != m_serviceReady); | ||
| } | ||
| } | ||
| for (const QString &propertyName: emitChangeSignal.keys()) { | ||
| {% for property in interface.properties %} | ||
| if (propertyName == QStringLiteral("{{property.name}}") && emitChangeSignal[propertyName]) { | ||
| emit {{property.name}}Changed(); | ||
| } | ||
| {% endfor %} | ||
| if (propertyName == QStringLiteral("ready") && emitChangeSignal[propertyName]) { | ||
| emit readyChanged(); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| void {{className}}::handleSignals(InputIPCMessage& msg) | ||
| { | ||
| Q_UNUSED(msg) | ||
| {% for event in interface.signals %} | ||
| if (msg.member() == QStringLiteral("{{event}}")) { | ||
| QListIterator<QVariant> argumentsIterator(msg.arguments()); | ||
| {% for parameter in event.parameters %} | ||
| {{parameter.interfaceCppType}} param_{{parameter.name}}; | ||
| param_{{parameter.name}} = (argumentsIterator.hasNext() ? castFromQVariant<{{parameter.interfaceCppType}}>(argumentsIterator.next()):{% if not parameter.type.is_interface %}{{parameter.interfaceCppType}}(){% else %}nullptr{% endif %}); | ||
| {% endfor %} | ||
| emit {{event}}( | ||
| {%- set comma = joiner(", ") -%} | ||
| {%- for parameter in event.parameters -%} | ||
| {{ comma() }}param_{{parameter.name}} | ||
| {%- endfor -%} ); | ||
|
idleroamer marked this conversation as resolved.
|
||
| } | ||
| {% endfor %} | ||
|
|
||
| {% if interface.hasModelProperty %} | ||
| this->onModelUpdateEvent(msg); | ||
| {% endif %} | ||
| } | ||
|
|
||
| const QList<QString>& {{className}}::getSignals() const | ||
|
idleroamer marked this conversation as resolved.
|
||
| { | ||
| static QList<QString> allSignals{ | ||
| {% for event in interface.signals %} | ||
| "{{event}}", | ||
| {% endfor %} | ||
| {% if interface.hasModelProperty %} | ||
| facelift::IPCCommon::MODEL_DATA_CHANGED_MESSAGE_NAME, | ||
| facelift::IPCCommon::MODEL_INSERT_MESSAGE_NAME, | ||
| facelift::IPCCommon::MODEL_REMOVE_MESSAGE_NAME, | ||
| facelift::IPCCommon::MODEL_MOVE_MESSAGE_NAME, | ||
| facelift::IPCCommon::MODEL_RESET_MESSAGE_NAME, | ||
| {% endif %} | ||
| }; | ||
|
|
||
| return allSignals; | ||
| } | ||
|
|
||
| {% if interface.hasModelProperty %} | ||
| void {{className}}::onModelUpdateEvent(const InputIPCMessage& msg) | ||
| { | ||
| QListIterator<QVariant> argumentsIterator(msg.arguments()); | ||
| const QString& modelPropertyName = (argumentsIterator.hasNext() ? castFromQVariant<QString>(argumentsIterator.next()): QString()); | ||
| {% for property in interface.properties %} | ||
| {% if property.type.is_model %} | ||
| if (modelPropertyName == QStringLiteral("{{property.name}}")) { | ||
| m_{{property.name}}.handleSignal(msg); | ||
| } | ||
| {% endif %} | ||
| {% endfor %} | ||
| } | ||
| {% endif %} | ||
|
|
||
| void {{className}}::unmarshalPropertiesChanged(const QVariantMap& changedProperties) | ||
| { | ||
| {% if interface.properties %} | ||
| for (const QString &propertyName: changedProperties.keys()) { | ||
| {% for property in interface.properties %} | ||
| if (propertyName == QStringLiteral("{{property.name}}")) { | ||
| {% if property.type.is_model %} | ||
| int {{property.name}}Size = castFromQVariant<int>(changedProperties[propertyName]); | ||
| m_{{property.name}}.beginResetModel(); | ||
| m_{{property.name}}.reset({{property.name}}Size, std::bind(&ThisType::{{property.name}}Data, this, std::placeholders::_1)); | ||
| m_{{property.name}}.endResetModel(); | ||
| {% else %} | ||
| m_{{property.name}} = castFromQVariant<{{property.interfaceCppType}}>(changedProperties[propertyName]); | ||
| {% endif %} | ||
| } | ||
| {% endfor %} | ||
| } | ||
| for (const QString &propertyName: changedProperties.keys()) { | ||
| {% for property in interface.properties %} | ||
| if (propertyName == QStringLiteral("{{property.name}}")) { | ||
| {% if not property.type.is_model %} | ||
| emit {{property.name}}Changed(); | ||
| {% endif %} | ||
| } | ||
| {% endfor %} | ||
| } | ||
| {% else %} | ||
| Q_UNUSED(changedProperties); | ||
| {% endif %} | ||
| } | ||
|
|
||
| {% for property in interface.properties %} | ||
|
|
@@ -134,7 +186,7 @@ void {{className}}::deserializeSignal(InputIPCMessage &msg) | |
| void {{className}}::set{{property}}({{property.cppMethodArgumentType}} newValue) | ||
| { | ||
| {% if (not property.type.is_interface) %} | ||
| ipc()->sendSetterCall("{{property.name}}", newValue); | ||
|
Collaborator
There was a problem hiding this comment. FYI, the construct you broke here is meant to provide a way for that generated code to be usable with both an IPC transport channel where method IDs are strings (such as DBus), and an IPC where method IDs are integer (such as the the current "local" IPC, and the hi-performance IPC which I have been working on). Using integers instead of strings is obviously more efficient.
Author
There was a problem hiding this comment. Can we please stop the "performance" discussion? now you are discussing about "future possible performance degrades with some not in-place high performance IPC!!!".
Collaborator
There was a problem hiding this comment. The local IPC uses integer IDs, so we are not talking about the future.. The current approach should work with your changes.
Author
There was a problem hiding this comment. The performance claims needs to be backed up by actuall KPI measurement
Collaborator
There was a problem hiding this comment. I have no doubt that sending an integer (which does not even need to be wider than 8 bits) is faster than sending a multi-character string. Also, string comparisons are not free, so the processing of an incoming request is also faster if an integer is used as method ID since no comparison is even needed.
Author
There was a problem hiding this comment. A simple benchmark of signal 30 character long being emitted/received 10000 times shows followings: Current implementation Current PR: A signal name comparison is not a bottleneck.
Collaborator
There was a problem hiding this comment. Do those figures tell us that using a string is faster than using an integer ?
Author
There was a problem hiding this comment. No, those figures tell us whether we send MessageIDs as strings or as integers is not a performance bottleneck. I appreciate your time but I have the feeling you even haven't looked at the PR? the "sendSetterCall" is internal call between IPCProxy and Local/DBusIPCProxyBinder and using integers is simply superfluous You had performance claims now you are talking again about some IPC which is not even there yet AGAIN.
Collaborator
There was a problem hiding this comment. There is a misunderstanding here.
Author
There was a problem hiding this comment. That is a fine suggestion. Though tomorrow is a little tight in the afternoon, so let me know if tomorrow morning or the Friday's afternoon fits your calendar, otherwise we postpone to next week. |
||
| {% else %} | ||
| Q_ASSERT(false); // Writable interface properties are unsupported | ||
| {% endif %} | ||
|
|
@@ -168,12 +220,11 @@ void {{className}}::{{operation.name}}( | |
| {%- endfor -%} ){% if operation.is_const %} const{% endif %} | ||
| { | ||
| {% if (operation.hasReturnValue) %} | ||
| QList<QVariant> args = ipc()->sendMethodCallWithReturn(memberID(MethodID::{{operation.name}}, "{{operation.name}}") | ||
| {%- for parameter in operation.parameters -%} | ||
| , {{parameter.name}} | ||
| {%- endfor -%} ); | ||
| return (!args.isEmpty() ? castFromQVariant<{{operation.interfaceCppType}}>(args.first()):{% if not (operation.type.is_interface) %}{{operation.cppType}}(){% else %}nullptr{% endif %}); | ||
| {% else %} | ||
| ipc()->sendMethodCall(memberID(MethodID::{{operation.name}}, "{{operation.name}}") | ||
| {%- for parameter in operation.parameters -%} | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.