#endif
#include "mono-mmap.h"
-#include "mono-mmap-internal.h"
+#include "mono-mmap-internals.h"
#include "mono-proclib.h"
+#include <mono/utils/mono-threads.h>
+
+
+#define BEGIN_CRITICAL_SECTION do { \
+ MonoThreadInfo *__info = mono_thread_info_current_unchecked (); \
+ if (__info) __info->inside_critical_region = TRUE; \
+
+#define END_CRITICAL_SECTION \
+ if (__info) __info->inside_critical_region = FALSE; \
+} while (0) \
#ifndef MAP_ANONYMOUS
#define MAP_ANONYMOUS MAP_ANON
malloc_shared_area (int pid)
{
int size = mono_pagesize ();
- SAreaHeader *sarea = g_malloc0 (size);
+ SAreaHeader *sarea = (SAreaHeader *) g_malloc0 (size);
sarea->size = size;
sarea->pid = pid;
sarea->stats_start = sizeof (SAreaHeader);
mflags |= MAP_ANONYMOUS;
mflags |= MAP_PRIVATE;
+ BEGIN_CRITICAL_SECTION;
ptr = mmap (addr, length, prot, mflags, -1, 0);
if (ptr == MAP_FAILED) {
int fd = open ("/dev/zero", O_RDONLY);
ptr = mmap (addr, length, prot, mflags, fd, 0);
close (fd);
}
- if (ptr == MAP_FAILED)
- return NULL;
}
+ END_CRITICAL_SECTION;
+
+ if (ptr == MAP_FAILED)
+ return NULL;
return ptr;
}
int
mono_vfree (void *addr, size_t length)
{
- return munmap (addr, length);
+ int res;
+ BEGIN_CRITICAL_SECTION;
+ res = munmap (addr, length);
+ END_CRITICAL_SECTION;
+ return res;
}
/**
if (flags & MONO_MMAP_32BIT)
mflags |= MAP_32BIT;
+ BEGIN_CRITICAL_SECTION;
ptr = mmap (0, length, prot, mflags, fd, offset);
+ END_CRITICAL_SECTION;
if (ptr == MAP_FAILED)
return NULL;
*ret_handle = (void*)length;
int
mono_file_unmap (void *addr, void *handle)
{
- return munmap (addr, (size_t)handle);
+ int res;
+
+ BEGIN_CRITICAL_SECTION;
+ res = munmap (addr, (size_t)handle);
+ END_CRITICAL_SECTION;
+
+ return res;
}
/**
shm_unlink (buf);
close (fd);
}
+ BEGIN_CRITICAL_SECTION;
res = mmap (NULL, size, PROT_READ|PROT_WRITE, MAP_SHARED, fd, 0);
+ END_CRITICAL_SECTION;
+
if (res == MAP_FAILED) {
shm_unlink (buf);
close (fd);
}
/* we don't need the file descriptor anymore */
close (fd);
- header = res;
+ header = (SAreaHeader *) res;
header->size = size;
header->pid = pid;
header->stats_start = sizeof (SAreaHeader);
fd = shm_open (buf, O_RDONLY, S_IRUSR|S_IRGRP);
if (fd == -1)
return NULL;
+ BEGIN_CRITICAL_SECTION;
res = mmap (NULL, size, PROT_READ, MAP_SHARED, fd, 0);
+ END_CRITICAL_SECTION;
+
if (res == MAP_FAILED) {
close (fd);
return NULL;
mono_shared_area_unload (void *area)
{
/* FIXME: currently we load only a page */
+ BEGIN_CRITICAL_SECTION;
munmap (area, mono_pagesize ());
+ END_CRITICAL_SECTION;
}
int
mono_valloc_aligned (size_t size, size_t alignment, int flags)
{
/* Allocate twice the memory to be able to put the block on an aligned address */
- char *mem = mono_valloc (NULL, size + alignment, flags);
+ char *mem = (char *) mono_valloc (NULL, size + alignment, flags);
char *aligned;
if (!mem)
gint64 count;
int pagesize = mono_pagesize ();
int npages = (size + pagesize - 1) / pagesize;
- char *faulted = g_malloc0 (sizeof (char*) * npages);
+ char *faulted = (char *) g_malloc0 (sizeof (char*) * npages);
- if (mincore (addr, size, faulted) != 0) {
+ /*
+ * We cast `faulted` to void* because Linux wants an unsigned
+ * char* while BSD wants a char*.
+ */
+#ifdef __linux__
+ if (mincore (addr, size, (unsigned char *)faulted) != 0) {
+#else
+ if (mincore (addr, size, (char *)faulted) != 0) {
+#endif
count = -1;
} else {
count = 0;