mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-20 08:56:47 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

really fix cpu usage when using esddsp with polypaudio

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@243 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2004-09-27 17:21:27 +00:00
parent 35148d8c05
commit f014d466cd
3 changed files with 54 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

36
polyp/iochannel.c
View file

@ -52,7 +52,7 @@ struct pa_iochannel {
static void enable_mainloop_sources(struct pa_iochannel *io) { static void enable_mainloop_sources(struct pa_iochannel *io) {
assert(io); assert(io);
if (io->input_event == io->output_event) { if (io->input_event == io->output_event && io->input_event) {
enum pa_io_event_flags f = PA_IO_EVENT_NULL; enum pa_io_event_flags f = PA_IO_EVENT_NULL;
assert(io->input_event); assert(io->input_event);
@ -78,8 +78,18 @@ static void callback(struct pa_mainloop_api* m, struct pa_io_event *e, int fd, e
if ((f & (PA_IO_EVENT_HANGUP|PA_IO_EVENT_ERROR)) && !io->hungup) { if ((f & (PA_IO_EVENT_HANGUP|PA_IO_EVENT_ERROR)) && !io->hungup) {
io->hungup = 1; io->hungup = 1;
changed = 1; changed = 1;
if (e == io->input_event) {
io->mainloop->io_free(io->input_event);
io->input_event = NULL;
} }
if (e == io->output_event) {
io->mainloop->io_free(io->output_event);
io->output_event = NULL;
}
} else {
if ((f & PA_IO_EVENT_INPUT) && !io->readable) { if ((f & PA_IO_EVENT_INPUT) && !io->readable) {
io->readable = 1; io->readable = 1;
changed = 1; changed = 1;
@ -91,6 +101,7 @@ static void callback(struct pa_mainloop_api* m, struct pa_io_event *e, int fd, e
changed = 1; changed = 1;
assert(e == io->output_event); assert(e == io->output_event);
} }
}
if (changed) { if (changed) {
enable_mainloop_sources(io); enable_mainloop_sources(io);
@ -158,12 +169,12 @@ void pa_iochannel_free(struct pa_iochannel*io) {
int pa_iochannel_is_readable(struct pa_iochannel*io) { int pa_iochannel_is_readable(struct pa_iochannel*io) {
assert(io); assert(io);
return io->readable; return io->readable || io->hungup;
} }
int pa_iochannel_is_writable(struct pa_iochannel*io) { int pa_iochannel_is_writable(struct pa_iochannel*io) {
assert(io); assert(io);
return io->writable; return io->writable && !io->hungup;
} }
int pa_iochannel_is_hungup(struct pa_iochannel*io) { int pa_iochannel_is_hungup(struct pa_iochannel*io) {
@ -173,16 +184,8 @@ int pa_iochannel_is_hungup(struct pa_iochannel*io) {
ssize_t pa_iochannel_write(struct pa_iochannel*io, const void*data, size_t l) { ssize_t pa_iochannel_write(struct pa_iochannel*io, const void*data, size_t l) {
ssize_t r; ssize_t r;
assert(io);
assert(data);
assert(l);
assert(io->ofd >= 0);
assert(io && data && l && io->ofd >= 0); assert(io && data && l && io->ofd >= 0);
if ((r = write(io->ofd, data, l)) >= 0) { if ((r = write(io->ofd, data, l)) >= 0) {
io->writable = 0; io->writable = 0;
enable_mainloop_sources(io); enable_mainloop_sources(io);
@ -193,7 +196,6 @@ ssize_t pa_iochannel_write(struct pa_iochannel*io, const void*data, size_t l) {
ssize_t pa_iochannel_read(struct pa_iochannel*io, void*data, size_t l) { ssize_t pa_iochannel_read(struct pa_iochannel*io, void*data, size_t l) {
ssize_t r; ssize_t r;
assert(io && data && io->ifd >= 0); assert(io && data && io->ifd >= 0);
if ((r = read(io->ifd, data, l)) >= 0) { if ((r = read(io->ifd, data, l)) >= 0) {
@ -230,13 +232,3 @@ int pa_iochannel_socket_set_sndbuf(struct pa_iochannel *io, size_t l) {
return pa_socket_set_sndbuf(io->ofd, l); return pa_socket_set_sndbuf(io->ofd, l);
} }
void pa_iochannel_force_unreadable(struct pa_iochannel *io) {
assert(io);
io->readable = 0;
enable_mainloop_sources(io);
}
void pa_iochannel_force_unwritable(struct pa_iochannel *io) {
io->writable = 0;
enable_mainloop_sources(io);
}

3
polyp/iochannel.h
View file

@ -39,9 +39,6 @@ int pa_iochannel_is_readable(struct pa_iochannel*io);
int pa_iochannel_is_writable(struct pa_iochannel*io); int pa_iochannel_is_writable(struct pa_iochannel*io);
int pa_iochannel_is_hungup(struct pa_iochannel*io); int pa_iochannel_is_hungup(struct pa_iochannel*io);
void pa_iochannel_force_unreadable(struct pa_iochannel *io);
void pa_iochannel_force_unwritable(struct pa_iochannel *io);
void pa_iochannel_set_noclose(struct pa_iochannel*io, int b); void pa_iochannel_set_noclose(struct pa_iochannel*io, int b);
void pa_iochannel_set_callback(struct pa_iochannel*io, void (*callback)(struct pa_iochannel*io, void *userdata), void *userdata); void pa_iochannel_set_callback(struct pa_iochannel*io, void (*callback)(struct pa_iochannel*io, void *userdata), void *userdata);

26
polyp/protocol-esound.c
View file

@ -194,6 +194,7 @@ static void connection_free(struct connection *c) {
pa_xfree(c->read_data); pa_xfree(c->read_data);
pa_xfree(c->write_data); pa_xfree(c->write_data);
if (c->io)
pa_iochannel_free(c->io); pa_iochannel_free(c->io);
if (c->defer_event) if (c->defer_event)
@ -680,6 +681,8 @@ static void client_kill_cb(struct pa_client *c) {
static int do_read(struct connection *c) { static int do_read(struct connection *c) {
assert(c && c->io); assert(c && c->io);
/* pa_log("READ\n"); */
if (c->state == ESD_NEXT_REQUEST) { if (c->state == ESD_NEXT_REQUEST) {
ssize_t r; ssize_t r;
assert(c->read_data_length < sizeof(c->request)); assert(c->read_data_length < sizeof(c->request));
@ -702,7 +705,7 @@ static int do_read(struct connection *c) {
handler = proto_map+c->request; handler = proto_map+c->request;
pa_log(__FILE__": executing request #%u\n", c->request); /* pa_log(__FILE__": executing request #%u\n", c->request); */
if (!handler->proc) { if (!handler->proc) {
pa_log(__FILE__": recieved unimplemented request #%u.\n", c->request); pa_log(__FILE__": recieved unimplemented request #%u.\n", c->request);
@ -789,6 +792,8 @@ static int do_read(struct connection *c) {
assert(c->input_memblockq); assert(c->input_memblockq);
/* pa_log("STREAMING_DATA\n"); */
if (!(l = pa_memblockq_missing(c->input_memblockq))) if (!(l = pa_memblockq_missing(c->input_memblockq)))
return 0; return 0;
@ -813,6 +818,8 @@ static int do_read(struct connection *c) {
return -1; return -1;
} }
/* pa_log(__FILE__": read %u\n", r); */
chunk.memblock = c->playback.current_memblock; chunk.memblock = c->playback.current_memblock;
chunk.index = c->playback.memblock_index; chunk.index = c->playback.memblock_index;
chunk.length = r; chunk.length = r;
@ -832,6 +839,8 @@ static int do_read(struct connection *c) {
static int do_write(struct connection *c) { static int do_write(struct connection *c) {
assert(c && c->io); assert(c && c->io);
/* pa_log("WRITE\n"); */
if (c->write_data_length) { if (c->write_data_length) {
ssize_t r; ssize_t r;
@ -873,7 +882,9 @@ static void do_work(struct connection *c) {
assert(c->protocol && c->protocol->core && c->protocol->core->mainloop && c->protocol->core->mainloop->defer_enable); assert(c->protocol && c->protocol->core && c->protocol->core->mainloop && c->protocol->core->mainloop->defer_enable);
c->protocol->core->mainloop->defer_enable(c->defer_event, 0); c->protocol->core->mainloop->defer_enable(c->defer_event, 0);
if (c->dead) /* pa_log("DOWORK\n"); */
if (c->dead || !c->io)
return; return;
if (pa_iochannel_is_readable(c->io)) if (pa_iochannel_is_readable(c->io))
@ -891,7 +902,10 @@ fail:
if (c->state == ESD_STREAMING_DATA && c->sink_input) { if (c->state == ESD_STREAMING_DATA && c->sink_input) {
c->dead = 1; c->dead = 1;
pa_memblockq_prebuf_disable(c->input_memblockq); pa_memblockq_prebuf_disable(c->input_memblockq);
c->protocol->core->mainloop->defer_enable(c->defer_event, 0);
pa_iochannel_free(c->io);
c->io = NULL;
} else } else
connection_free(c); connection_free(c);
} }
@ -900,6 +914,8 @@ static void io_callback(struct pa_iochannel*io, void *userdata) {
struct connection *c = userdata; struct connection *c = userdata;
assert(io && c && c->io == io); assert(io && c && c->io == io);
/* pa_log("IO\n"); */
do_work(c); do_work(c);
} }
@ -909,6 +925,8 @@ static void defer_callback(struct pa_mainloop_api*a, struct pa_defer_event *e, v
struct connection *c = userdata; struct connection *c = userdata;
assert(a && c && c->defer_event == e); assert(a && c && c->defer_event == e);
/* pa_log("DEFER\n"); */
do_work(c); do_work(c);
} }
@ -934,6 +952,8 @@ static void sink_input_drop_cb(struct pa_sink_input *i, const struct pa_memchunk
struct connection*c = i->userdata; struct connection*c = i->userdata;
assert(i && c && length); assert(i && c && length);
/* pa_log("DROP\n"); */
pa_memblockq_drop(c->input_memblockq, chunk, length); pa_memblockq_drop(c->input_memblockq, chunk, length);
/* do something */ /* do something */