Skip to content

Commit

Permalink
Revert "cras_dlc: Reduce D-Bus timeout to 0.5 seconds"
Browse files Browse the repository at this point in the history
This reverts commit a661e14.

Reason for revert: cras_dlc has a dedicated thread now so it
should no longer block CRAS clients.

Original change's description:
> cras_dlc: Reduce D-Bus timeout to 0.5 seconds
>
> Chrome expects the audio (cras client) thread to terminate within
> 3 seconds.
>
> At worst cras_dlc_manager may block CRAS clients for
> 2 * ${number of DLCs} * ${timeout per D-Bus call}.
>
> Reduce the timeout as a quick and dirty fix.
>
> BUG=b:281964203
> TEST=None
>
> Change-Id: I629376114db9f9a308b7e508cbaf555021639315
> Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/4531332
> Reviewed-by: Yu-Hsuan Hsu <[email protected]>
> Tested-by: ChromeOS Audio Quick Verifier <[email protected]>
> Reviewed-by: Hung-Hsien Chen <[email protected]>
> Commit-Queue: Hung-Hsien Chen <[email protected]>
> Commit-Queue: Li-Yu Yu <[email protected]>

BUG=b:281964203
BUG=b:356757499
TEST=None

Change-Id: I4c7cf587e80a38dc47edcb3f52750b4f6a33d5a1
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/third_party/adhd/+/6051286
Commit-Queue: Li-Yu Yu <[email protected]>
Tested-by: Li-Yu Yu <[email protected]>
Reviewed-by: Hung-Hsien Chen <[email protected]>
Reviewed-by: Yu-Hsuan Hsu <[email protected]>
  • Loading branch information
afq984 authored and Chromeos LUCI committed Nov 27, 2024
1 parent 98f7b51 commit e3af164
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion cras/server/platform/dlc/src/chromiumos.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ use system_api::dlcservice::InstallRequest;

use super::Result;

const DBUS_TIMEOUT: Duration = Duration::from_millis(500);
const DBUS_TIMEOUT: Duration = Duration::from_secs(3);

fn get_dlcservice_connection_path(connection: &Connection) -> Proxy<&Connection> {
connection.with_proxy(
Expand Down

0 comments on commit e3af164

Please sign in to comment.