diff options
| author |   Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2021-10-18 14:24:52 +0200 |
|---|---|---|
| committer | Jan-Simon Moeller <jsmoeller@linuxfoundation.org> | 2021-11-04 14:24:38 +0000 |
| commit | e345e16bb494864caf1f7dbe8864aa40df401a70 (patch) | |
| tree | c309d39646f3e796344cc68081f5bff48cf63e2c /meta-speech-framework/meta-aac/recipes-avs | |
| parent | 796e9aefb7eee0fc7526e5613a03bc7f6697cef4 (diff) | |
Prepare master for new framework integration
During the last workshop the transition to the new framework was presented.
This change essentially deprecates the SMACK-based application framework.
To prepare the integration of it, we remove the deprecated components:
- meta-speech-framework and the voiceagent services
Bug-AGL: SPEC-4121
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: I803dd18184338a1f5519af27136e1d5a58ee9369
Diffstat (limited to 'meta-speech-framework/meta-aac/recipes-avs')
2 files changed, 0 insertions, 38 deletions
diff --git a/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk/0001-connection-deadlock-workaround.patch b/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk/0001-connection-deadlock-workaround.patch deleted file mode 100644 index 3bf79835..00000000 --- a/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk/0001-connection-deadlock-workaround.patch +++ /dev/null @@ -1,35 +0,0 @@ -Workaround for connection deadlock - -Change the maximum (effectively infinite) delay in HTTP2Transport's -connecting state handling code to use the inactivity timeout value, -which is currently 5 minutes. This seems to avoid triggering a -deadlock between the condition variable checking in the -monitorSharedQueueWhileWaiting method and use of the object's m_mutex -member in sendPostConnectMessage and onActivity methods. -At present, my theory is this issue stems from some change or bug -in the newer g++/libstdc++ coming with dunfell versus the thud release -that Amazon supports. - -Upstream-Status: Inappropriate [other] - -Signed-off-by: Scott Murray <scott.murray@konsulko.com> - -diff --git a/ACL/src/Transport/HTTP2Transport.cpp b/ACL/src/Transport/HTTP2Transport.cpp -index f1b5c03..dec7424 100644 ---- a/ACL/src/Transport/HTTP2Transport.cpp -+++ b/ACL/src/Transport/HTTP2Transport.cpp -@@ -618,7 +618,13 @@ HTTP2Transport::State HTTP2Transport::handleConnecting() { - return m_state; - } - -- return monitorSharedQueueWhileWaiting(State::CONNECTING); -+ // Wait for connection for the same length of time as the post-connection -+ // inactivity monitor timeout (currently 5 minutes). -+ // This seems to avoid triggering an issue where connecting deadlocks when -+ // using the maximum timeout of std::chrono:steady_clock. -+ std::chrono::time_point<std::chrono::steady_clock> timeout = -+ std::chrono::steady_clock::now() + INACTIVITY_TIMEOUT; -+ return monitorSharedQueueWhileWaiting(State::CONNECTING, timeout); - } - - HTTP2Transport::State HTTP2Transport::handleWaitingToRetryConnecting() { diff --git a/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk_1.19.1.bbappend b/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk_1.19.1.bbappend deleted file mode 100644 index 3b1bc32c..00000000 --- a/meta-speech-framework/meta-aac/recipes-avs/avs-device-sdk/avs-device-sdk_1.19.1.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${BPN}:" - -SRC_URI += "file://0001-connection-deadlock-workaround.patch" |