X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvlibmemory%2Fmemory_shared.c;h=1263f2c9433d023a989022034ffe27f7188fe836;hb=a09c1ff5b6ae535932b4fc9477ffc4e39748ca62;hp=d6b2b9887d02e21741cfd9ce37063571b606d103;hpb=0c4fec0134f32bc913299b37d048a99293b1a851;p=vpp.git

diff --git a/src/vlibmemory/memory_shared.c b/src/vlibmemory/memory_shared.c
index d6b2b9887d0..1263f2c9433 100644
--- a/src/vlibmemory/memory_shared.c
+++ b/src/vlibmemory/memory_shared.c
@@ -176,6 +176,7 @@ vl_msg_api_alloc_internal (int nbytes, int pool, int may_return_null)
     rv = clib_mem_alloc (nbytes);
 
   rv->q = 0;
+  rv->gc_mark_timestamp = 0;
   svm_pop_heap (oldheap);
   pthread_mutex_unlock (&am->vlib_rp->mutex);
 
@@ -532,6 +533,35 @@ vl_map_shmem (const char *region_name, int is_vlib)
 
   if (is_vlib == 0)
     {
+      int tfd;
+      u8 *api_name;
+      /*
+       * Clients wait for vpp to set up the root / API regioins
+       */
+      if (am->root_path)
+	api_name = format (0, "/dev/shm/%s-%s%c", am->root_path,
+			   region_name + 1, 0);
+      else
+	api_name = format (0, "/dev/shm%s%c", region_name, 0);
+
+      /* Wait up to 100 seconds... */
+      for (i = 0; i < 10000; i++)
+	{
+	  ts.tv_sec = 0;
+	  ts.tv_nsec = 10000 * 1000;	/* 10 ms */
+	  while (nanosleep (&ts, &tsrem) < 0)
+	    ts = tsrem;
+	  tfd = open ((char *) api_name, O_RDWR);
+	  if (tfd > 0)
+	    break;
+	}
+      vec_free (api_name);
+      if (tfd < 0)
+	{
+	  clib_warning ("region init fail");
+	  return -2;
+	}
+      close (tfd);
       rv = svm_region_init_chroot (am->root_path);
       if (rv)
 	return rv;