Skip to content

Commit

Permalink
Messaging fixes (#1804)
Browse files Browse the repository at this point in the history
* [GCC13]  Warnings end up as errors. Fixed.

* [FIXES] You fix some, you break some :-)

Make sure anything present on the FrameBuffer is cleared a few seconds after Thunder is started..
Make sure we pass the ExchangeId and not the Descriptor Id for COMRPC clients.
  • Loading branch information
pwielders authored Dec 3, 2024
1 parent fb301f6 commit 49ef0ef
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
9 changes: 3 additions & 6 deletions Source/Thunder/scripts/thunder.in
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,14 @@ start() {
#mkdir -p @ROOT_PATH@/cores
#ulimit -c unlimited

if [ ! -d @ROOT_PATH@/Netflix/dpi ]; then
mkdir -p @ROOT_PATH@/Netflix/dpi
ln -sfn @CMAKE_INSTALL_FULL_SYSCONFDIR@/playready @ROOT_PATH@/Netflix/dpi/playready
fi

# needed for wayland/westeros/weston
# needed for wayland/westeros/weston
export XDG_RUNTIME_DIR=@CMAKE_INSTALL_FULL_RUNSTATEDIR@

echo -n "Starting Thunder: "
start-stop-daemon -S -q -b -m -p @CMAKE_INSTALL_FULL_RUNSTATEDIR@/Thunder.pid --exec @CMAKE_INSTALL_FULL_BINDIR@/Thunder -- -b </dev/null >/dev/null 2>&1
[ $? == 0 ] && echo "OK" || echo "FAIL"
sleep 8
echo 1 > /sys/class/graphics/fb0/blank
}
stop() {
echo -n "Stopping Thunder: "
Expand Down
15 changes: 9 additions & 6 deletions Source/com/Communicator.h
Original file line number Diff line number Diff line change
Expand Up @@ -550,29 +550,32 @@ namespace RPC {
~ChannelLink() = default;

public:
void Link(RemoteConnectionMap& connectionMap, const uint32_t id)
inline void Link(RemoteConnectionMap& connectionMap, const uint32_t id)
{
_connectionMap = &connectionMap;
_id = id;
}
void StateChange()
inline void StateChange()
{
// If the connection closes, we need to clean up....
if ((_channel.IsOpen() == false) && (_connectionMap != nullptr)) {
_connectionMap->Closed(_id);
}
}
bool IsRegistered() const
inline bool IsRegistered() const
{
return (_connectionMap != nullptr);
}
uint32_t Id() const
inline uint32_t Id() const
{
return (_channel.Descriptor());
}
string Origin() const {
inline string Origin() const {
return (_connectionMap->Origin());
}
inline uint32_t ExchangeId() const {
return (_id);
}

private:
// Non ref-counted reference to our parent, of which we are a composit :-)
Expand Down Expand Up @@ -1565,7 +1568,7 @@ namespace RPC {

void* result = _parent.Announce(proxyChannel, message->Parameters(), message->Response());

message->Response().Set(instance_cast<void*>(result), proxyChannel->Extension().Id(), _parent.ProxyStubPath(), jsonDefaultMessagingSettings, jsonDefaultWarningReportingSettings);
message->Response().Set(instance_cast<void*>(result), proxyChannel->Extension().ExchangeId(), _parent.ProxyStubPath(), jsonDefaultMessagingSettings, jsonDefaultWarningReportingSettings);

// We are done, report completion
channel.ReportResponse(data);
Expand Down

0 comments on commit 49ef0ef

Please sign in to comment.