really fix cpu usage when using esddsp with polypaudio

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@243 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/polyp/iochannel.c b/polyp/iochannel.c
index 72bdac2..5e3e936 100644 (file)
--- a/polyp/iochannel.c
+++ b/polyp/iochannel.c
@@ -52,7 +52,7 @@ struct pa_iochannel {
 static void enable_mainloop_sources(struct pa_iochannel *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;
         assert(io->input_event);
         
@@ -78,18 +78,29 @@ 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) {
         io->hungup = 1;
         changed = 1;
-    }
-    
-    if ((f & PA_IO_EVENT_INPUT) && !io->readable) {
-        io->readable = 1;
-        changed = 1;
-        assert(e == io->input_event);
-    }
-    
-    if ((f & PA_IO_EVENT_OUTPUT) && !io->writable) {
-        io->writable = 1;
-        changed = 1;
-        assert(e == io->output_event);
+
+        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) {
+            io->readable = 1;
+            changed = 1;
+            assert(e == io->input_event);
+        }
+        
+        if ((f & PA_IO_EVENT_OUTPUT) && !io->writable) {
+            io->writable = 1;
+            changed = 1;
+            assert(e == io->output_event);
+        }
     }
 
     if (changed) {
@@ -158,12 +169,12 @@ void pa_iochannel_free(struct pa_iochannel*io) {
 
 int pa_iochannel_is_readable(struct pa_iochannel*io) {
     assert(io);
-    return io->readable;
+    return io->readable || io->hungup;
 }
 
 int pa_iochannel_is_writable(struct pa_iochannel*io) {
     assert(io);
-    return io->writable;
+    return io->writable && !io->hungup;
 }
 
 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 r;
-    assert(io);
-    assert(data);
-    assert(l);
-    assert(io->ofd >= 0);
-
-    
     assert(io && data && l && io->ofd >= 0);
 
-
-    
     if ((r = write(io->ofd, data, l)) >= 0) {
         io->writable = 0;
         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 r;
-    
     assert(io && data && io->ifd >= 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);
 }
 
-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);
-}

diff --git a/polyp/iochannel.h b/polyp/iochannel.h
index a4edbfa..6f5f351 100644 (file)
--- a/polyp/iochannel.h
+++ b/polyp/iochannel.h
@@ -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_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_callback(struct pa_iochannel*io, void (*callback)(struct pa_iochannel*io, void *userdata), void *userdata);

diff --git a/polyp/protocol-esound.c b/polyp/protocol-esound.c
index 4498a75..b6caeb3 100644 (file)
--- a/polyp/protocol-esound.c
+++ b/polyp/protocol-esound.c
@@ -193,8 +193,9 @@ static void connection_free(struct connection *c) {
     
     pa_xfree(c->read_data);
     pa_xfree(c->write_data);
-    
-    pa_iochannel_free(c->io);
+
+    if (c->io)
+        pa_iochannel_free(c->io);
     
     if (c->defer_event)
         c->protocol->core->mainloop->defer_free(c->defer_event);
@@ -680,6 +681,8 @@ static void client_kill_cb(struct pa_client *c) {
 static int do_read(struct connection *c) {
     assert(c && c->io);
 
+/*      pa_log("READ\n");  */
+    
     if (c->state == ESD_NEXT_REQUEST) {
         ssize_t r;
         assert(c->read_data_length < sizeof(c->request));
@@ -702,7 +705,7 @@ static int do_read(struct connection *c) {
 
             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) {
                 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);
 
+/*         pa_log("STREAMING_DATA\n"); */
+
         if (!(l = pa_memblockq_missing(c->input_memblockq)))
             return 0;
 
@@ -812,6 +817,8 @@ static int do_read(struct connection *c) {
             pa_log(__FILE__": read() failed: %s\n", r == 0 ? "EOF" : strerror(errno));
             return -1;
         }
+
+/*         pa_log(__FILE__": read %u\n", r); */
         
         chunk.memblock = c->playback.current_memblock;
         chunk.index = c->playback.memblock_index;
@@ -832,6 +839,8 @@ static int do_read(struct connection *c) {
 static int do_write(struct connection *c) {
     assert(c && c->io);
 
+/*     pa_log("WRITE\n"); */
+    
     if (c->write_data_length) {
         ssize_t r;
         
@@ -872,18 +881,20 @@ static void do_work(struct connection *c) {
 
     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);
+
+/*     pa_log("DOWORK\n");  */
     
-    if (c->dead)
+    if (c->dead || !c->io)
         return;
-    
+
     if (pa_iochannel_is_readable(c->io))
         if (do_read(c) < 0)
             goto fail;
-
+    
     if (pa_iochannel_is_writable(c->io))
         if (do_write(c) < 0)
             goto fail;
-
+    
     return;
 
 fail:
@@ -891,7 +902,10 @@ fail:
     if (c->state == ESD_STREAMING_DATA && c->sink_input) {
         c->dead = 1;
         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
         connection_free(c);
 }
@@ -900,6 +914,8 @@ static void io_callback(struct pa_iochannel*io, void *userdata) {
     struct connection *c = userdata;
     assert(io && c && c->io == io);
 
+/*     pa_log("IO\n");  */
+    
     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;
     assert(a && c && c->defer_event == e);
 
+/*     pa_log("DEFER\n"); */
+    
     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;
     assert(i && c && length);
 
+/*     pa_log("DROP\n"); */
+    
     pa_memblockq_drop(c->input_memblockq, chunk, length);
 
     /* do something */