From: Florin Coras <fcoras@cisco.com>
Date: Tue, 4 Dec 2018 21:43:45 +0000 (-0800)
Subject: ldp: avoid calling write in destructors
X-Git-Tag: v19.04-rc0~230
X-Git-Url: https://gerrit.fd.io/r/gitweb?p=vpp.git;a=commitdiff_plain;h=955bfbbb6968bdc99171bdebcda6dbe605af2004

ldp: avoid calling write in destructors

Change-Id: Ia9c3d7a68a23dc4ab3be06f88fdfb053db422372
Signed-off-by: Florin Coras <fcoras@cisco.com>
---

diff --git a/src/vcl/ldp.c b/src/vcl/ldp.c
index 453ddeb3340..c3dc64a4d3b 100644
--- a/src/vcl/ldp.c
+++ b/src/vcl/ldp.c
@@ -258,9 +258,12 @@ ldp_init (void)
   rv = vppcom_app_create (ldp_get_app_name ());
   if (rv != VPPCOM_OK)
     {
-      fprintf (stderr, "\nLDP<%d>: ERROR: ldp_init: vppcom_app_create()"
-	       " failed!  rv = %d (%s)\n",
-	       getpid (), rv, vppcom_retval_str (rv));
+      ldp->vcl_needs_real_epoll = 0;
+      if (rv == VPPCOM_EEXIST)
+	return 0;
+      LDBG (2, "\nLDP<%d>: ERROR: ldp_init: vppcom_app_create()"
+	    " failed!  rv = %d (%s)\n",
+	    getpid (), rv, vppcom_retval_str (rv));
       ldp->init = 0;
       return rv;
     }
diff --git a/src/vcl/vppcom.c b/src/vcl/vppcom.c
index 07136e9c6c8..dbb0d657b8d 100644
--- a/src/vcl/vppcom.c
+++ b/src/vcl/vppcom.c
@@ -862,8 +862,8 @@ vppcom_app_create (char *app_name)
 
   if (vcm->is_init)
     {
-      clib_warning ("vcl<%u> already initialized", getpid ());
-      return -1;
+      VDBG (1, "already initialized");
+      return VPPCOM_EEXIST;
     }
 
   vcm->is_init = 1;