mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-31 22:25:35 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fix bugs in the last change of ipc_gid option

Browse source 
- Fix semaphore gid control
- Do semaphore discard for all semaphores (although currently defined as 1)
- Fix the wrong check of return value from shmctl
This commit is contained in:
Takashi Iwai 2005-05-30 17:56:12 +00:00
parent 270da603fd
commit b69ab56881
2 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/pcm/pcm_direct.c
View file

@ -50,7 +50,8 @@
int snd_pcm_direct_semaphore_create_or_connect(snd_pcm_direct_t *dmix) int snd_pcm_direct_semaphore_create_or_connect(snd_pcm_direct_t *dmix)
{ {
struct shmid_ds buf; struct semid_ds buf;
int i;
dmix->semid = semget(dmix->ipc_key, DIRECT_IPC_SEMS, dmix->semid = semget(dmix->ipc_key, DIRECT_IPC_SEMS,
IPC_CREAT | dmix->ipc_perm); IPC_CREAT | dmix->ipc_perm);
@ -58,22 +59,28 @@ int snd_pcm_direct_semaphore_create_or_connect(snd_pcm_direct_t *dmix)
return -errno; return -errno;
if (dmix->ipc_gid < 0) if (dmix->ipc_gid < 0)
return 0; return 0;
if (shmctl(dmix->semid, IPC_STAT, &buf) < 0) { for (i = 0; i < DIRECT_IPC_SEMS; i++) {
int err = -errno; if (semctl(dmix->semid, i, IPC_STAT, &buf) < 0) {
snd_pcm_direct_semaphore_discard(dmix); int err = -errno;
return err; snd_pcm_direct_semaphore_discard(dmix);
return err;
}
buf.sem_perm.gid = dmix->ipc_gid;
semctl(dmix->semid, i, IPC_SET, &buf);
} }
buf.shm_perm.gid = dmix->ipc_gid;
shmctl(dmix->semid, IPC_SET, &buf);
return 0; return 0;
} }
int snd_pcm_direct_semaphore_discard(snd_pcm_direct_t *dmix) int snd_pcm_direct_semaphore_discard(snd_pcm_direct_t *dmix)
{ {
int i;
if (dmix->semid < 0) if (dmix->semid < 0)
return -EINVAL; return -EINVAL;
if (semctl(dmix->semid, 0, IPC_RMID, NULL) < 0) for (i = 0; i < DIRECT_IPC_SEMS; i++) {
return -errno; if (semctl(dmix->semid, i, IPC_RMID, NULL) < 0)
return -errno;
}
dmix->semid = -1; dmix->semid = -1;
return 0; return 0;
} }

2
src/pcm/pcm_dmix.c
View file

@ -87,7 +87,7 @@ retryshm:
goto retryshm; goto retryshm;
return err; return err;
} }
if (!shmctl(dmix->u.dmix.shmid_sum, IPC_STAT, &buf)) { if (shmctl(dmix->u.dmix.shmid_sum, IPC_STAT, &buf) < 0) {
err = -errno; err = -errno;
shm_sum_discard(dmix); shm_sum_discard(dmix);
return err; return err;