[GNUnet-SVN] r23097 - Extractor/src/main

[gnunet]

Author: grothoff
Date: 2012-08-04 20:53:17 +0200 (Sat, 04 Aug 2012)
New Revision: 23097

Modified:
   Extractor/src/main/TODO
   Extractor/src/main/extractor.c
   Extractor/src/main/extractor_ipc_gnu.c
Log:
-fixed

Modified: Extractor/src/main/TODO
===================================================================
--- Extractor/src/main/TODO     2012-08-04 18:48:26 UTC (rev 23096)
+++ Extractor/src/main/TODO     2012-08-04 18:53:17 UTC (rev 23097)
@@ -3,6 +3,3 @@
 
 * MAX_META_DATA buffer of 32 MB is a bit big as a non-growing default size;
   also, valgrind reports it is leaked even though printf-debugging shows it is 
not (!?)
-
-* for some reason, if a plugin crashes or something goes wrong (i.e. with a 
seek),
-  the whole system hangs (not good...)

Modified: Extractor/src/main/extractor.c
===================================================================
--- Extractor/src/main/extractor.c      2012-08-04 18:48:26 UTC (rev 23096)
+++ Extractor/src/main/extractor.c      2012-08-04 18:53:17 UTC (rev 23097)
@@ -446,8 +446,12 @@
       /* calculate minimum seek request (or set done=0 to continue here) */
       done = 1;
       min_seek = -1;
+      plugin_count = 0;
       for (pos = plugins; NULL != pos; pos = pos->next)
        {
+         if (NULL == channels[plugin_count])
+           pos->channel = NULL;
+         plugin_count++;
          if ( (1 == pos->round_finished) ||
               (NULL == pos->channel) )
            continue; /* inactive plugin */

Modified: Extractor/src/main/extractor_ipc_gnu.c
===================================================================
--- Extractor/src/main/extractor_ipc_gnu.c      2012-08-04 18:48:26 UTC (rev 
23096)
+++ Extractor/src/main/extractor_ipc_gnu.c      2012-08-04 18:53:17 UTC (rev 
23097)
@@ -468,6 +468,7 @@
       if ( (-1 == (iret = read (channel->cpipe_out,
                                &channel->data[channel->size],
                                MAX_META_DATA - channel->size)) ) ||
+          (0 == iret) ||
           (-1 == (ret = EXTRACTOR_IPC_process_reply_ (channel->plugin,
                                                       channel->data, 
                                                       channel->size + iret,