span: fix wrong next1 feature index in dual loop

[vpp.git] / svm / svm.h

diff --git a/svm/svm.h b/svm/svm.h
index 1682b7a..0b87dbc 100644 (file)
--- a/svm/svm.h
+++ b/svm/svm.h
@@ -71,8 +71,9 @@ typedef struct svm_map_region_args_
 {
   char *root_path;             /* NULL means use the truly global arena */
   char *name;
-  uword baseva;
-  uword size;
+  u64 baseva;
+  u64 size;
+  u64 pvt_heap_size;
   uword flags;
   char *backing_file;
   uword backing_mmap_size;
@@ -116,6 +117,7 @@ void *svm_region_find_or_create (svm_map_region_args_t * a);
 void svm_region_init (void);
 void svm_region_init_chroot (char *root_path);
 void svm_region_init_chroot_uid_gid (char *root_path, int uid, int gid);
+void svm_region_init_args (svm_map_region_args_t * a);
 void svm_region_exit (void);
 void svm_region_unmap (void *rp_arg);
 void svm_client_scan (char *root_path);
@@ -147,7 +149,8 @@ svm_mem_alloc_aligned_at_offset (svm_region_t * rp,
 
   pthread_mutex_lock (&rp->mutex);
   oldheap = clib_mem_set_heap (rp->data_heap);
-  rv = clib_mem_alloc_aligned_at_offset (size, align, offset);
+  rv = clib_mem_alloc_aligned_at_offset (size, align, offset,
+                                        1 /* yes, call os_out_of_memory */ );
   clib_mem_set_heap (oldheap);
   pthread_mutex_unlock (&rp->mutex);
   return (rv);