vls: multi-process and multi-threaded apps improvements

[vpp.git] / src / vcl / ldp.c

diff --git a/src/vcl/ldp.c b/src/vcl/ldp.c
index 36cff2a..ab4cfbf 100644 (file)
--- a/src/vcl/ldp.c
+++ b/src/vcl/ldp.c
@@ -739,10 +739,9 @@ ldp_pselect (int nfds, fd_set * __restrict readfds,
                              vec_len (ldpw->ex_bitmap) *
                              sizeof (clib_bitmap_t));
 
-         rv = vppcom_select (si_bits, readfds ? ldpw->rd_bitmap : NULL,
-                             writefds ? ldpw->wr_bitmap : NULL,
-                             exceptfds ? ldpw->ex_bitmap : NULL,
-                             vcl_timeout);
+         rv = vls_select (si_bits, readfds ? ldpw->rd_bitmap : NULL,
+                          writefds ? ldpw->wr_bitmap : NULL,
+                          exceptfds ? ldpw->ex_bitmap : NULL, vcl_timeout);
          if (rv < 0)
            {
              errno = -rv;
@@ -2370,16 +2369,18 @@ ldp_constructor (void)
 void
 ldp_destructor (void)
 {
-  swrap_destructor ();
-  if (ldp->init)
-    ldp->init = 0;
+  /*
+     swrap_destructor ();
+     if (ldp->init)
+     ldp->init = 0;
+   */
 
   /* Don't use clib_warning() here because that calls writev()
    * which will call ldp_init().
    */
   if (LDP_DEBUG > 0)
-    printf ("%s:%d: LDP<%d>: LDP destructor: done!\n",
-           __func__, __LINE__, getpid ());
+    fprintf (stderr, "%s:%d: LDP<%d>: LDP destructor: done!\n",
+            __func__, __LINE__, getpid ());
 }