Changeset 5634:7ad2a55f0205 in roaraudio

Timestamp:

08/24/12 13:52:47 (12 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Updated CMD VIO to no longer eat more than needed. Helps resolving a endless loop in rpld.

Files:

• ChangeLog (modified) (1 diff)
• libroar/vio_cmd.c (modified) (4 diffs)

ChangeLog

@@ -1 +1 @@
 v. 1.0beta6 - ?
         * Fixed memory leak in hash framwork. Affacted RNG (Closes: #310)
+        * Updated CMD VIO to no longer eat more than needed. Helps resolving
+          a endless loop in rpld.
 
 v. 1.0beta5 - Mon Aug 20 2012 23:52 CEST

libroar/vio_cmd.c

@@ -308 +308 @@
  int     nonblock = state->options & ROAR_VIO_CMD_OPTS_NONBLOCK;
  int     in, out;
- int     eating = 1;
 
  ROAR_DBG("roar_vio_cmd_read(*) = ?");
@@ -326 +325 @@
  out = state->reader.out;
 
- while (done < count || eating) {
+ while (done < count) {
   if ( nonblock ) {
    tv.tv_sec  =    0;
@@ -374 +373 @@
    if ( out != -1 && FD_ISSET(out, wfhs) ) {
     ROAR_DBG("roar_vio_cmd_read(*): event on writer");
-    eating = 1;
 
     if ( !tlen ) {
@@ -392 +390 @@
      state->reader.out = out = -1;
     }
-   } else {
-    eating = 0;
    }
   }