ichthyo/LUMIERA.clone
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DiffMesage: use as payload within MutationMessage and pass Diff by RValue

Browse source 
now this highlights the unsettled decision still the more,
as can be seen by all that unnecessary copying. Basically we move the
Diff into the lambda-closure, from there into an anonymous instance,
from there into the embedded Buffer in MutationMessage, which again
just happens to sit in the closure storage when the action is invoked.
And all of this copying just to move the DiffMessage for consumption
into the TreeMutator...

thus by #1066 we should really get rid of the MutationMessage class altogether!
This commit is contained in:
Fischlurch 2017-08-11 02:00:54 +02:00
parent fd0a011ea4
commit fdcf431a9b
7 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gui/ctrl/mutation-message.hpp
View file

@ -26,7 +26,7 @@
** The UI-Bus offers a dedicated API to direct MutationMessages towards Tangible elements,
** as designated by the given ID. Actually, such messages serve as capsule to transport a
** diff-sequence -- since a diff sequence as such is always concrete and tied to a specific context,
** we can not represent it directly as an abstract type on interface level. The receiver of a diff
** we can not represent it easily as an abstract type on interface level. The receiver of a diff
** sequence must offer the ability to be reshaped through diff messages, which is expressed through
** the interface DiffMutable. In the case at question here, gui::model::Tangible offers this interface
** and thus the ability to construct a concrete lib::diff::TreeMutator, which in turn is bound to the
@ -42,9 +42,9 @@
**
** @todo as of 1/2017 there is an unsolved problem how such messages can be passed from lower layers.
** A direct symptom is the dependency of this header on model::Tangible, which in turn requires
** sigc::Trackable. This is a challenging topic, since we need to hand over to the UI-Event Thread /////////////////////////////////#1066 : Concept for passing Diff Messages
** `sigc::Trackable`. This is a challenging topic, since we need to hand over to the UI-Event Thread /////////////////////////////////TICKET #1066 : Concept for passing Diff Messages
**
** @see [AbstractTangible_test]
** @see AbstractTangible_test
**
*/

2
src/gui/notification-interface-proxy.hpp
View file

@ -72,7 +72,7 @@ namespace facade {
void displayInfo (Level level, string const& text) override { _i_.displayInfo (level, cStr(text)); }
void markError (ID uiElement, string const& text) override { _i_.markError(uiElement.getHash().get(), cStr(text)); }
void markNote (ID uiElement, string const& text) override { _i_.markNote (uiElement.getHash().get(), cStr(text)); }
void mutate (ID uiElement, DiffMessage& diff) override { _i_.mutate (uiElement.getHash().get(), &diff); }
void mutate (ID uiElement, DiffMessage&& diff) override { _i_.mutate (uiElement.getHash().get(), &diff); }
void triggerGuiShutdown (string const& cause) override { _i_.triggerGuiShutdown (cStr(cause)); }

13
src/gui/notification-service.cpp
View file

@ -49,6 +49,7 @@
#include "gui/ctrl/ui-manager.hpp"
#include "gui/ctrl/ui-dispatcher.hpp"
#include "gui/ctrl/mutation-message.hpp"
#include "gui/notification-service.hpp"
#include "lib/diff/gen-node.hpp"
#include "include/logging.h"
@ -63,6 +64,7 @@ extern "C" {
using lib::diff::GenNode;
using lib::diff::TreeMutator;
using gui::ctrl::MutationMessage;
using gui::ctrl::UiDispatcher;
using gui::ctrl::BusTerm;
using std::string;
@ -109,10 +111,13 @@ namespace gui {
void
NotificationService::mutate (ID uiElement, DiffMessage&) /////////////////////////////////////////////////TICKET #1066 : how to pass a diff message
NotificationService::mutate (ID uiElement, DiffMessage&& diff)
{
UNIMPLEMENTED ("actually produce a MutationMessage on the UI-Bus"); ///////////////////////////////////TICKET #1066 : how to build and pass a MutationMessage
////////////////////////TODO actually push the information to the GUI ///////////////////////////////////TICKET #1098 : use a suitable Dispatcher
dispatch_->event ([=]()
{
MutationMessage diffHolder{DiffMessage(diff)}; //////////////////////////////////TICKET #1066 : unnecessary repackaging; could get rid of MutationMessage altogether
this->change (uiElement, diffHolder);
});
}
@ -245,7 +250,7 @@ namespace gui {
{
if (!_instance) lumiera_error_set(LUMIERA_ERROR_FACADE_LIFECYCLE, "passing diff message");
else
_instance->mutate (reinterpret_cast<ID> (*element), *reinterpret_cast<DiffMessage*> (diff));
_instance->mutate (reinterpret_cast<ID> (*element), move(*reinterpret_cast<DiffMessage*> (diff)));
}
)
, LUMIERA_INTERFACE_INLINE (triggerGuiShutdown,

2
src/gui/notification-service.hpp
View file

@ -83,7 +83,7 @@ namespace gui {
void displayInfo (NotifyLevel,string const& text) override;
void markError (ID uiElement, string const& text) override;
void markNote (ID uiElement, string const& text) override;
void mutate (ID uiElement, DiffMessage&) override; ////////////////////////////////////////TICKET #1066 : how to pass a diff message
void mutate (ID uiElement, DiffMessage&&) override; ////////////////////////////////////////TICKET #1066 : how to pass a diff message
void triggerGuiShutdown (string const& cause) override;
private:

3
src/gui/ui-bus.cpp
View file

@ -198,7 +198,8 @@ namespace ctrl {
/** alter and reshape the designated subject by applying the given diff message.
* @param diff encapsulated representation of a concrete diff sequence for the target.
* @return if the target was known and the diff was applied without accident
* @return `true` if the target was known and the diff was applied without accident,
* `false` if no diff was applied because the desired target is unconnected.
* @throws lumiera::error::State when diff application fails due to the target's shape
* or state being different than implicitly assumed by the given diff.
* @remark each tangible offers to build a custom TreeMutator, which is appropriately

2
src/include/gui-notification-facade.h
View file

@ -98,7 +98,7 @@ namespace gui {
* the UI model elements subject to this change.
* @see diff-language.hpp
*/
virtual void mutate (ID uiElement, DiffMessage&) =0; /////////////////////////////////////TICKET #1066 : how to pass a diff message
virtual void mutate (ID uiElement, DiffMessage&&) =0; /////////////////////////////////////TICKET #1066 : how to pass a diff message
/** causes the GUI to shut down unconditionally
* @param cause user visible explanation of the

7
src/lib/diff/diff-message.hpp
View file

@ -82,14 +82,17 @@ namespace diff{
* diff messages need to be conserved beyond the producer's thread context, because
* it will be pulled asynchronous from within the UI event thread!
*/
class DiffMessage
: public DiffSource::iterator
struct DiffMessage
: DiffSource::iterator
{
DiffMessage() = default;
/**
* DiffMessage builder:
* take ownership of an opaque heap allocated context
* from which the concrete diff can be pulled on demand
*/
explicit
DiffMessage(DiffSource* diffGenerationContext)
: DiffSource::iterator{DiffSource::build (diffGenerationContext)}
{ }