Skip to content

[release/6.0] Unify the FlushProcessWriteBuffers mechanism for macOS arm64 / x64 #63301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jeffschwMSFT merged 1 commit into from
Jan 6, 2022
Merged

[release/6.0] Unify the FlushProcessWriteBuffers mechanism for macOS arm64 / x64 #63301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion eng/native/configurecompiler.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ if (CLR_CMAKE_HOST_UNIX)
set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0")
add_compile_options(-arch arm64)
elseif(CLR_CMAKE_HOST_ARCH_AMD64)
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.13")
set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14")
add_compile_options(-arch x86_64)
else()
clr_unknown_arch()
Expand Down
10 changes: 4 additions & 6 deletions src/coreclr/gc/unix/gcenv.unix.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@
#include <mach/mach_port.h>
#include <mach/mach_host.h>

#if defined(HOST_ARM64)
#include <mach/task.h>
#include <mach/vm_map.h>
extern "C"
Expand All @@ -84,7 +83,6 @@ extern "C"
abort(); \
} \
} while (false)
#endif // defined(HOST_ARM64)

#endif // __APPLE__

Expand Down Expand Up @@ -372,7 +370,7 @@ bool GCToOSInterface::Initialize()
{
s_flushUsingMemBarrier = TRUE;
}
#if !(defined(TARGET_OSX) && defined(HOST_ARM64))
#ifndef TARGET_OSX
else
{
assert(g_helperPage == 0);
Expand Down Expand Up @@ -404,7 +402,7 @@ bool GCToOSInterface::Initialize()
return false;
}
}
#endif // !(defined(TARGET_OSX) && defined(HOST_ARM64))
#endif // !TARGET_OSX

InitializeCGroup();

Expand Down Expand Up @@ -544,7 +542,7 @@ void GCToOSInterface::FlushProcessWriteBuffers()
status = pthread_mutex_unlock(&g_flushProcessWriteBuffersMutex);
assert(status == 0 && "Failed to unlock the flushProcessWriteBuffersMutex lock");
}
#if defined(TARGET_OSX) && defined(HOST_ARM64)
#ifdef TARGET_OSX
else
{
mach_msg_type_number_t cThreads;
Expand All @@ -570,7 +568,7 @@ void GCToOSInterface::FlushProcessWriteBuffers()
machret = vm_deallocate(mach_task_self(), (vm_address_t)pThreads, cThreads * sizeof(thread_act_t));
CHECK_MACH("vm_deallocate()", machret);
}
#endif // defined(TARGET_OSX) && defined(HOST_ARM64)
#endif // TARGET_OSX
}

// Break into a debugger. Uses a compiler intrinsic if one is available,
Expand Down
10 changes: 4 additions & 6 deletions src/coreclr/pal/src/thread/process.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,6 @@ SET_DEFAULT_DEBUG_CHANNEL(PROCESS); // some headers have code with asserts, so d
#include <libproc.h>
#include <sys/sysctl.h>
#include <sys/posix_sem.h>
#if defined(HOST_ARM64)
#include <mach/task.h>
#include <mach/vm_map.h>
extern "C"
Expand All @@ -103,7 +102,6 @@ extern "C"
} \
} while (false)

#endif // defined(HOST_ARM64)
#endif // __APPLE__

#ifdef __NetBSD__
Expand Down Expand Up @@ -3472,7 +3470,7 @@ InitializeFlushProcessWriteBuffers()
}
}

#if defined(TARGET_OSX) && defined(HOST_ARM64)
#ifdef TARGET_OSX
return TRUE;
#else
s_helperPage = static_cast<int*>(mmap(0, GetVirtualPageSize(), PROT_READ | PROT_WRITE, MAP_ANONYMOUS | MAP_PRIVATE, -1, 0));
Expand Down Expand Up @@ -3502,7 +3500,7 @@ InitializeFlushProcessWriteBuffers()
}

return status == 0;
#endif // defined(TARGET_OSX) && defined(HOST_ARM64)
#endif // TARGET_OSX
}

#define FATAL_ASSERT(e, msg) \
Expand Down Expand Up @@ -3552,7 +3550,7 @@ FlushProcessWriteBuffers()
status = pthread_mutex_unlock(&flushProcessWriteBuffersMutex);
FATAL_ASSERT(status == 0, "Failed to unlock the flushProcessWriteBuffersMutex lock");
}
#if defined(TARGET_OSX) && defined(HOST_ARM64)
#ifdef TARGET_OSX
else
{
mach_msg_type_number_t cThreads;
Expand All @@ -3578,7 +3576,7 @@ FlushProcessWriteBuffers()
machret = vm_deallocate(mach_task_self(), (vm_address_t)pThreads, cThreads * sizeof(thread_act_t));
CHECK_MACH("vm_deallocate()", machret);
}
#endif // defined(TARGET_OSX) && defined(HOST_ARM64)
#endif // TARGET_OSX
}

/*++
Expand Down