mirror of
git://slackware.nl/current.git
synced 2025-01-29 08:36:40 +01:00
d31c50870d
Thu Jun 30 20:26:57 UTC 2016 Slackware 14.2 x86_64 stable is released! The long development cycle (the Linux community has lately been living in "interesting times", as they say) is finally behind us, and we're proud to announce the release of Slackware 14.2. The new release brings many updates and modern tools, has switched from udev to eudev (no systemd), and adds well over a hundred new packages to the system. Thanks to the team, the upstream developers, the dedicated Slackware community, and everyone else who pitched in to help make this release a reality. The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a dual-sided 32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware project by picking up a copy from store.slackware.com. We're taking pre-orders now, and offer a discount if you sign up for a subscription. Have fun! :-)
102 lines
3.3 KiB
Diff
102 lines
3.3 KiB
Diff
From: Takashi Iwai <tiwai@suse.de>
|
|
Date: Thu, 14 Apr 2016 15:33:03 +0000 (+0200)
|
|
Subject: pcm: Fallback open as the first instance for dmix & co
|
|
X-Git-Url: http://git.alsa-project.org/?p=alsa-lib.git;a=commitdiff_plain;h=fdba9e1bad8f769a6137e565471f0227f23a3132;hp=e57b521c61f0df14b660ce6ba8c5009a63f5b115
|
|
|
|
pcm: Fallback open as the first instance for dmix & co
|
|
|
|
dmix and other PCM plugins tries to open a secondary stream with
|
|
O_APPEND flag when the shmem was already attached by another.
|
|
However, when another streams have been already closed after the
|
|
shmem check, this open may return the error EBADFD, since the kernel
|
|
accepts O_APPEND only for the secondary streams.
|
|
|
|
This patch adds a workaround for such a case. It just retries opening
|
|
the stream as the first instance (i.e. without O_APPEND flag).
|
|
This is basically safe behavior (the kernel takes care of races), even
|
|
we may do this even unconditionally. But it's bad from the
|
|
performance POV, so we do it only when really needed.
|
|
|
|
Reported-by: Lars Lindqvist <lars.lindqvist@yandex.ru>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
|
|
diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c
|
|
index b26a5c7..007d356 100644
|
|
--- a/src/pcm/pcm_dmix.c
|
|
+++ b/src/pcm/pcm_dmix.c
|
|
@@ -1020,6 +1020,7 @@ int snd_pcm_dmix_open(snd_pcm_t **pcmp, const char *name,
|
|
dmix->max_periods = opts->max_periods;
|
|
dmix->sync_ptr = snd_pcm_dmix_sync_ptr;
|
|
|
|
+ retry:
|
|
if (first_instance) {
|
|
/* recursion is already checked in
|
|
snd_pcm_direct_get_slave_ipc_offset() */
|
|
@@ -1076,6 +1077,13 @@ int snd_pcm_dmix_open(snd_pcm_t **pcmp, const char *name,
|
|
SND_PCM_APPEND,
|
|
NULL);
|
|
if (ret < 0) {
|
|
+ /* all other streams have been closed;
|
|
+ * retry as the first instance
|
|
+ */
|
|
+ if (ret == -EBADFD) {
|
|
+ first_instance = 1;
|
|
+ goto retry;
|
|
+ }
|
|
SNDERR("unable to open slave");
|
|
goto _err;
|
|
}
|
|
diff --git a/src/pcm/pcm_dshare.c b/src/pcm/pcm_dshare.c
|
|
index 58e47bb..adb3587 100644
|
|
--- a/src/pcm/pcm_dshare.c
|
|
+++ b/src/pcm/pcm_dshare.c
|
|
@@ -690,6 +690,7 @@ int snd_pcm_dshare_open(snd_pcm_t **pcmp, const char *name,
|
|
break;
|
|
}
|
|
|
|
+ retry:
|
|
first_instance = ret = snd_pcm_direct_shm_create_or_connect(dshare);
|
|
if (ret < 0) {
|
|
SNDERR("unable to create IPC shm instance");
|
|
@@ -758,6 +759,13 @@ int snd_pcm_dshare_open(snd_pcm_t **pcmp, const char *name,
|
|
SND_PCM_APPEND,
|
|
NULL);
|
|
if (ret < 0) {
|
|
+ /* all other streams have been closed;
|
|
+ * retry as the first instance
|
|
+ */
|
|
+ if (ret == -EBADFD) {
|
|
+ first_instance = 1;
|
|
+ goto retry;
|
|
+ }
|
|
SNDERR("unable to open slave");
|
|
goto _err;
|
|
}
|
|
diff --git a/src/pcm/pcm_dsnoop.c b/src/pcm/pcm_dsnoop.c
|
|
index 576c35b..8ff0ba5 100644
|
|
--- a/src/pcm/pcm_dsnoop.c
|
|
+++ b/src/pcm/pcm_dsnoop.c
|
|
@@ -583,6 +583,7 @@ int snd_pcm_dsnoop_open(snd_pcm_t **pcmp, const char *name,
|
|
break;
|
|
}
|
|
|
|
+ retry:
|
|
first_instance = ret = snd_pcm_direct_shm_create_or_connect(dsnoop);
|
|
if (ret < 0) {
|
|
SNDERR("unable to create IPC shm instance");
|
|
@@ -651,6 +652,13 @@ int snd_pcm_dsnoop_open(snd_pcm_t **pcmp, const char *name,
|
|
SND_PCM_APPEND,
|
|
NULL);
|
|
if (ret < 0) {
|
|
+ /* all other streams have been closed;
|
|
+ * retry as the first instance
|
|
+ */
|
|
+ if (ret == -EBADFD) {
|
|
+ first_instance = 1;
|
|
+ goto retry;
|
|
+ }
|
|
SNDERR("unable to open slave");
|
|
goto _err;
|
|
}
|
|
|