API clients would fail with an ASSERT (and core dump) whenever
the API shared memory segment could not be opened.
This returns an error value to the client's connect instead.
Change-Id: Id122a3a090b24b139c382ae09f341bde61fd2540
Signed-off-by: Ole Troan <ot@cisco.com>
svm_region_init_internal (svm_map_region_args_t * a)
{
svm_region_t *rp;
svm_region_init_internal (svm_map_region_args_t * a)
{
svm_region_t *rp;
/* guard against klutz calls */
if (root_rp)
/* guard against klutz calls */
if (root_rp)
a->baseva += randomize_baseva;
rp = svm_map_region (a);
a->baseva += randomize_baseva;
rp = svm_map_region (a);
}
region_unlock (rp);
root_rp = rp;
}
region_unlock (rp);
root_rp = rp;
svm_region_init_internal (a);
}
svm_region_init_internal (a);
}
svm_region_init_chroot (const char *root_path)
{
svm_map_region_args_t _a, *a = &_a;
svm_region_init_chroot (const char *root_path)
{
svm_map_region_args_t _a, *a = &_a;
- svm_region_init_internal (a);
+ return svm_region_init_internal (a);
void *svm_region_find_or_create (svm_map_region_args_t * a);
void svm_region_init (void);
void *svm_region_find_or_create (svm_map_region_args_t * a);
void svm_region_init (void);
-void svm_region_init_chroot (const char *root_path);
+int svm_region_init_chroot (const char *root_path);
void svm_region_init_chroot_uid_gid (const 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_init_chroot_uid_gid (const char *root_path, int uid, int gid);
void svm_region_init_args (svm_map_region_args_t * a);
void svm_region_exit (void);
void *oldheap;
vl_shmem_hdr_t *shmem_hdr = 0;
api_main_t *am = &api_main;
void *oldheap;
vl_shmem_hdr_t *shmem_hdr = 0;
api_main_t *am = &api_main;
struct timespec ts, tsrem;
u32 vlib_input_queue_length;
struct timespec ts, tsrem;
u32 vlib_input_queue_length;
- svm_region_init_chroot (am->root_path);
+ {
+ rv = svm_region_init_chroot (am->root_path);
+ if (rv)
+ return rv;
+ }
if (a->root_path != NULL)
{
if (a->root_path != NULL)
{