a->size = rp->virtual_size;
munmap (rp, MMAP_PAGESIZE);
- rp = (void *) mmap ((void *) a->baseva, a->size,
+ rp = (void *) mmap (uword_to_pointer (a->baseva, void *), a->size,
PROT_READ | PROT_WRITE,
MAP_SHARED | MAP_FIXED, svm_fd, 0);
if ((uword) rp == (uword) MAP_FAILED)
{
clib_warning ("rp->mutex LOCKED by pid %d, tag %d, cleared...",
rp->mutex_owner_pid, rp->mutex_owner_tag);
- memset (&rp->mutex, 0, sizeof (rp->mutex));
+ clib_memset (&rp->mutex, 0, sizeof (rp->mutex));
}
else
for (i = 0; i < vec_len (svm_names); i++)
{
- memset (&a, 0, sizeof (a));
+ clib_memset (&a, 0, sizeof (a));
a.root_path = chroot_path;
a.name = (char *) svm_names[i];
fformat (stdout, "Checking %s region...\n", a.name);
a->root_path = chroot_path;
a->name = SVM_GLOBAL_REGION_NAME;
- a->baseva = SVM_GLOBAL_REGION_BASEVA;
+ a->baseva = svm_get_global_region_base_va ();
a->size = SVM_GLOBAL_REGION_SIZE;
a->flags = SVM_FLAGS_NODATA;
a->size = root_rp->virtual_size;
munmap (root_rp, MMAP_PAGESIZE);
- root_rp = (void *) mmap ((void *) a->baseva, a->size,
+ root_rp = (void *) mmap (uword_to_pointer (a->baseva, void *), a->size,
PROT_READ | PROT_WRITE,
MAP_SHARED | MAP_FIXED, svm_fd, 0);
if ((uword) root_rp == (uword) MAP_FAILED)
{
clib_warning ("root_rp->mutex LOCKED by pid %d, tag %d, cleared...",
root_rp->mutex_owner_pid, root_rp->mutex_owner_tag);
- memset (&root_rp->mutex, 0, sizeof (root_rp->mutex));
+ clib_memset (&root_rp->mutex, 0, sizeof (root_rp->mutex));
goto out;
}
else
char *chroot_path = 0;
u8 *chroot_u8;
+ clib_mem_init_thread_safe (0, 128 << 20);
+
unformat_init_command_line (&input, argv);
while (unformat_check_input (&input) != UNFORMAT_END_OF_INPUT)