Merge branch 'sched'
[paraslash.git] / filter_chain.c
index 5b87b08..17f6705 100644 (file)
@@ -69,8 +69,11 @@ static void close_callbacks(struct filter_node *fn)
 {
        struct filter_callback *fcb, *tmp;
 
-       list_for_each_entry_safe(fcb, tmp, &fn->callbacks, node)
+       list_for_each_entry_safe(fcb, tmp, &fn->callbacks, node) {
+               PARA_INFO_LOG("closing %s filter callback\n",
+                       fn->filter->name);
                close_filter_callback(fcb);
+       }
 }
 
 static void call_callbacks(struct filter_node *fn, char *inbuf, size_t inlen,
@@ -138,7 +141,7 @@ again:
                        *loaded -= t->ret;
                        conv += t->ret;
                        if (*loaded && t->ret) {
-                               PARA_DEBUG_LOG("moving %zd bytes in input buffer for %s filter\n",
+                               PARA_INFO_LOG("moving %zd bytes in input buffer for %s filter\n",
                                        *loaded,  fn->filter->name);
                                memmove(ib, ib + t->ret, *loaded);
                        }
@@ -147,7 +150,7 @@ again:
                loaded = &fn->loaded;
        }
        conv_total += conv;
-       PARA_DEBUG_LOG("eof (in/out/fc): %d/%d/%d out_loaded: %d, conv: %d, conv_total: %d\n", *fc->input_eof,
+       PARA_INFO_LOG("eof (in/out/fc): %d/%d/%d out_loaded: %d, conv: %d, conv_total: %d\n", *fc->input_eof,
                *fc->output_eof, fc->eof, *fc->out_loaded, conv, conv_total);
        if (conv)
                goto again;
@@ -181,11 +184,10 @@ void close_filters(struct filter_chain *fc)
 
        if (!fc)
                return;
-       PARA_DEBUG_LOG("closing filter chain %p\n", fc);
+       PARA_NOTICE_LOG("closing filter chain %p\n", fc);
        list_for_each_entry_safe(fn, tmp, &fc->filters, node) {
-               PARA_NOTICE_LOG("closing %s filter callbacks (fc %p, fn %p)\n", fn->filter->name, fc, fn);
                close_callbacks(fn);
-               PARA_NOTICE_LOG("closing %s filter (fc %p, fn %p)\n", fn->filter->name, fc, fn);
+               PARA_INFO_LOG("closing %s filter\n", fn->filter->name);
                fn->filter->close(fn);
                list_del(&fn->node);
                free(fn);