mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-03 09:01:50 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

proper ref counting for more objects

Browse source 
some documentation update


git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@124 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2004-08-15 00:02:26 +00:00
parent 22cb23eedb
commit c17545108b
24 changed files with 251 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

28
polyp/socket-server.c
View file

@ -40,6 +40,7 @@
#include "xmalloc.h"
struct pa_socket_server {
int ref;
int fd;
char *filename;
@ -57,14 +58,16 @@ static void callback(struct pa_mainloop_api *mainloop, struct pa_io_event *e, in
int nfd;
assert(s && s->mainloop == mainloop && s->io_event == e && e && fd >= 0 && fd == s->fd);
pa_socket_server_ref(s);
if ((nfd = accept(fd, NULL, NULL)) < 0) {
fprintf(stderr, "accept(): %s\n", strerror(errno));
return;
goto finish;
}
if (!s->on_connection) {
close(nfd);
return;
goto finish;
}
/* There should be a check for socket type here */
@ -76,6 +79,9 @@ static void callback(struct pa_mainloop_api *mainloop, struct pa_io_event *e, in
io = pa_iochannel_new(s->mainloop, nfd, nfd);
assert(io);
s->on_connection(s, io, s->userdata);
finish:
pa_socket_server_unref(s);
}
struct pa_socket_server* pa_socket_server_new(struct pa_mainloop_api *m, int fd) {
@ -83,6 +89,7 @@ struct pa_socket_server* pa_socket_server_new(struct pa_mainloop_api *m, int fd)
assert(m && fd >= 0);
s = pa_xmalloc(sizeof(struct pa_socket_server));
s->ref = 1;
s->fd = fd;
s->filename = NULL;
s->on_connection = NULL;
@ -97,6 +104,12 @@ struct pa_socket_server* pa_socket_server_new(struct pa_mainloop_api *m, int fd)
return s;
}
struct pa_socket_server* pa_socket_server_ref(struct pa_socket_server *s) {
assert(s && s->ref >= 1);
s->ref++;
return s;
}
struct pa_socket_server* pa_socket_server_new_unix(struct pa_mainloop_api *m, const char *filename) {
int fd = -1;
struct sockaddr_un sa;
@ -184,7 +197,7 @@ fail:
return NULL;
}
void pa_socket_server_free(struct pa_socket_server*s) {
static void socket_server_free(struct pa_socket_server*s) {
assert(s);
close(s->fd);
@ -197,8 +210,15 @@ void pa_socket_server_free(struct pa_socket_server*s) {
pa_xfree(s);
}
void pa_socket_server_unref(struct pa_socket_server *s) {
assert(s && s->ref >= 1);
if (!(--(s->ref)))
socket_server_free(s);
}
void pa_socket_server_set_callback(struct pa_socket_server*s, void (*on_connection)(struct pa_socket_server*s, struct pa_iochannel *io, void *userdata), void *userdata) {
assert(s);
assert(s && s->ref >= 1);
s->on_connection = on_connection;
s->userdata = userdata;