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

direct plugins - added graceful shutdown for the resource server

Browse source 
- direct plugins
  - added graceful shutdown for the resource server
  - fixed error paths (unclosed socket) in the make_local_socket() function
This commit is contained in:
Jaroslav Kysela 2005-08-17 14:00:32 +00:00
parent 8737d1843c
commit 4bb0721a83
1 changed files with 34 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/pcm/pcm_direct.c
View file

@ -205,18 +205,22 @@ static int make_local_socket(const char *filename, int server, mode_t ipc_perm)
if (bind(sock, (struct sockaddr *) addr, size) < 0) { if (bind(sock, (struct sockaddr *) addr, size) < 0) {
int result = -errno; int result = -errno;
SYSERR("bind failed: %s", filename); SYSERR("bind failed: %s", filename);
close(sock);
return result; return result;
} else { } else {
if (chmod(filename, ipc_perm) < 0) { if (chmod(filename, ipc_perm) < 0) {
int result = -errno; int result = -errno;
SYSERR("chmod failed: %s", filename); SYSERR("chmod failed: %s", filename);
close(sock);
return result; return result;
} }
} }
} else { } else {
if (connect(sock, (struct sockaddr *) addr, size) < 0) { if (connect(sock, (struct sockaddr *) addr, size) < 0) {
int result = -errno;
SYSERR("connect failed: %s", filename); SYSERR("connect failed: %s", filename);
return -errno; close(sock);
return result;
} }
} }
return sock; return sock;
@ -230,12 +234,39 @@ static int make_local_socket(const char *filename, int server, mode_t ipc_perm)
#define server_printf(fmt, args...) /* nothing */ #define server_printf(fmt, args...) /* nothing */
#endif #endif
static snd_pcm_direct_t *server_job_dmix;
static void server_cleanup(snd_pcm_direct_t *dmix)
{
close(dmix->server_fd);
close(dmix->hw_fd);
if (dmix->server_free)
dmix->server_free(dmix);
unlink(dmix->shmptr->socket_name);
snd_pcm_direct_shm_discard(dmix);
snd_pcm_direct_semaphore_discard(dmix);
}
static void server_job_signal(int sig ATTRIBUTE_UNUSED)
{
snd_pcm_direct_semaphore_down(server_job_dmix, DIRECT_IPC_SEM_CLIENT);
server_cleanup(server_job_dmix);
server_printf("DIRECT SERVER EXIT - SIGNAL\n");
_exit(EXIT_SUCCESS);
}
static void server_job(snd_pcm_direct_t *dmix) static void server_job(snd_pcm_direct_t *dmix)
{ {
int ret, sck, i; int ret, sck, i;
int max = 128, current = 0; int max = 128, current = 0;
struct pollfd pfds[max + 1]; struct pollfd pfds[max + 1];
server_job_dmix = dmix;
/* don't allow to be killed */
signal(SIGHUP, server_job_signal);
signal(SIGQUIT, server_job_signal);
signal(SIGTERM, server_job_signal);
signal(SIGKILL, server_job_signal);
/* close all files to free resources */ /* close all files to free resources */
i = sysconf(_SC_OPEN_MAX); i = sysconf(_SC_OPEN_MAX);
#ifdef SERVER_JOB_DEBUG #ifdef SERVER_JOB_DEBUG
@ -259,7 +290,7 @@ static void server_job(snd_pcm_direct_t *dmix)
server_printf("DIRECT SERVER: poll ret = %i, revents[0] = 0x%x\n", ret, pfds[0].revents); server_printf("DIRECT SERVER: poll ret = %i, revents[0] = 0x%x\n", ret, pfds[0].revents);
if (ret < 0) /* some error */ if (ret < 0) /* some error */
break; break;
if (ret == 0 || pfds[0].revents & (POLLERR | POLLHUP)) { /* timeout or error? */ if (ret == 0 || (pfds[0].revents & (POLLERR | POLLHUP))) { /* timeout or error? */
struct shmid_ds buf; struct shmid_ds buf;
snd_pcm_direct_semaphore_down(dmix, DIRECT_IPC_SEM_CLIENT); snd_pcm_direct_semaphore_down(dmix, DIRECT_IPC_SEM_CLIENT);
if (shmctl(dmix->shmid, IPC_STAT, &buf) < 0) { if (shmctl(dmix->shmid, IPC_STAT, &buf) < 0) {
@ -314,13 +345,7 @@ static void server_job(snd_pcm_direct_t *dmix)
} }
} }
} }
close(dmix->server_fd); server_cleanup(dmix);
close(dmix->hw_fd);
if (dmix->server_free)
dmix->server_free(dmix);
unlink(dmix->shmptr->socket_name);
snd_pcm_direct_shm_discard(dmix);
snd_pcm_direct_semaphore_discard(dmix);
server_printf("DIRECT SERVER EXIT\n"); server_printf("DIRECT SERVER EXIT\n");
#ifdef SERVER_JOB_DEBUG #ifdef SERVER_JOB_DEBUG
close(0); close(1); close(2); close(0); close(1); close(2);