session: segment handle in accept/connect notifications

[vpp.git] / src / svm / svmdb.c

diff --git a/src/svm/svmdb.c b/src/svm/svmdb.c
index 03dfe7c..f2aea5a 100644 (file)
--- a/src/svm/svmdb.c
+++ b/src/svm/svmdb.c
@@ -106,11 +106,16 @@ svmdb_map (svmdb_map_args_t * dba)
     }
   /* Nope, it's our problem... */
 
-  /* Add a bogus client (pid=0) so the svm won't be deallocated */
-  oldheap = svm_push_pvt_heap (db_rp);
-  vec_add1 (client->db_rp->client_pids, 0);
-  svm_pop_heap (oldheap);
-
+  if (CLIB_DEBUG > 2)
+    {
+      /* Add a bogus client (pid=0) so the svm won't be deallocated */
+      clib_warning
+       ("[%d] adding fake client (pid=0) so '%s' won't be unlinked",
+        getpid (), db_rp->region_name);
+      oldheap = svm_push_pvt_heap (db_rp);
+      vec_add1 (client->db_rp->client_pids, 0);
+      svm_pop_heap (oldheap);
+    }
   oldheap = svm_push_data_heap (db_rp);
 
   vec_validate (hp, 0);
@@ -320,7 +325,7 @@ local_set_variable_nolock (svmdb_client_t * client,
     {
       svmdb_value_t *newvalue;
       pool_get (shm->values, newvalue);
-      memset (newvalue, 0, sizeof (*newvalue));
+      clib_memset (newvalue, 0, sizeof (*newvalue));
       newvalue->elsize = elsize;
       vec_alloc (newvalue->value, vec_len (val) * elsize);
       clib_memcpy (newvalue->value, val, vec_len (val) * elsize);
@@ -451,7 +456,7 @@ svmdb_local_serialize_strings (svmdb_client_t * client, char *filename)
       goto out;
     }
 
-  serialize_open_unix_file_descriptor (sm, fd);
+  serialize_open_clib_file_descriptor (sm, fd);
 
   region_lock (client->db_rp, 20);
 
@@ -507,7 +512,7 @@ svmdb_local_unserialize_strings (svmdb_client_t * client, char *filename)
       goto out;
     }
 
-  unserialize_open_unix_file_descriptor (sm, fd);
+  unserialize_open_clib_file_descriptor (sm, fd);
 
   region_lock (client->db_rp, 21);
   oldheap = svm_push_data_heap (client->db_rp);
@@ -646,7 +651,7 @@ svmdb_local_find_or_add_vec_variable (svmdb_client_t * client,
       h = shm->namespaces[SVMDB_NAMESPACE_VEC];
 
       pool_get (shm->values, newvalue);
-      memset (newvalue, 0, sizeof (*newvalue));
+      clib_memset (newvalue, 0, sizeof (*newvalue));
       newvalue->elsize = 1;
       vec_alloc (newvalue->value, nbytes);
       _vec_len (newvalue->value) = nbytes;