Changeset 3481:22f4d04a1114 in roaraudio

Timestamp:

02/14/10 05:42:34 (14 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

restarted poll() in case we got interuppted

File:

• libroarpulse/mainloop.c (modified) (6 diffs)

libroarpulse/mainloop.c

@@ -167 +167 @@
  int i;
 
+ ROAR_DBG("pa_mainloop_prepare(m=%p, timeout=%i) = ?", m, timeout);
+
  if ( m == NULL )
   return -1;
@@ -202 +204 @@
  m->poll_timeout = timeout;
 
+ ROAR_DBG("pa_mainloop_prepare(m=%p, timeout=%i) = 0", m, timeout);
  return 0;
 }
@@ -208 +211 @@
 int pa_mainloop_poll(pa_mainloop *m) {
  int ret;
+ int alive = 1;
+
+ ROAR_DBG("pa_mainloop_poll(m=%p) = ?", m);
 
  if ( m == NULL )
@@ -215 +221 @@
   return -2;
 
- if ( m->poll_func != NULL ) {
-  ret = m->poll_func(m->pollfd, m->pollfds, m->poll_timeout, m->poll_userdata);
- } else {
-  ret = poll(m->pollfd, m->pollfds, m->poll_timeout);
- }
-
+ while (alive) {
+  if ( m->poll_func != NULL ) {
+   ret = m->poll_func(m->pollfd, m->pollfds, m->poll_timeout, m->poll_userdata);
+  } else {
+   ret = poll(m->pollfd, m->pollfds, m->poll_timeout);
+  }
+
+  if ( ret != -1 || ( errno != EAGAIN && errno != EINTR ) ) {
+   alive = 0;
+  }
+ }
+
+ ROAR_DBG("pa_mainloop_poll(m=%p) = %i", m, ret);
  return ret;
 }
@@ -229 +242 @@
  pa_io_event_flags_t events;
  int count = 0;
-
  int i, h;
+
+ ROAR_DBG("pa_mainloop_dispatch(m=%p) = ?", m);
 
  if ( m == NULL )
@@ -265 +279 @@
  }
 
+ ROAR_DBG("pa_mainloop_dispatch(m=%p) = %i", m, count);
  return count;
 }