From ceb65f21b5ac23ce218efee82f40f641ebe44361 Mon Sep 17 00:00:00 2001 From: LIU Hao Date: Mon, 7 Nov 2022 13:00:12 +0800 Subject: [PATCH] gcc/jit: Use C++11 mutex instead of pthread's This allows JIT to be built with a different thread model from `posix` where pthread isn't available gcc/jit/ChangeLog: * jit-playback.cc: Use `std::mutex` instead of `pthread_mutex_t` (playback::context::acquire_mutex): Likewise (playback::context::release_mutex): Likewise * jit-recording.cc: Remove the unused `INCLUDE_PTHREAD_H` * libgccjit.cc: Use `std::mutex` instead of `pthread_mutex_t` --- gcc/jit/jit-playback.cc | 9 +++++---- gcc/jit/jit-recording.cc | 1 - gcc/jit/libgccjit.cc | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gcc/jit/jit-playback.cc b/gcc/jit/jit-playback.cc index d227d36283a..17ff98c149b 100644 --- a/gcc/jit/jit-playback.cc +++ b/gcc/jit/jit-playback.cc @@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see . */ #include "config.h" -#define INCLUDE_PTHREAD_H #include "system.h" #include "coretypes.h" #include "target.h" @@ -51,6 +50,8 @@ along with GCC; see the file COPYING3. If not see #include "jit-w32.h" #endif +#include + /* Compare with gcc/c-family/c-common.h: DECL_C_BIT_FIELD, SET_DECL_C_BIT_FIELD. These are redefined here to avoid depending from the C frontend. */ @@ -2662,7 +2663,7 @@ playback::compile_to_file::copy_file (const char *src_path, /* This mutex guards gcc::jit::recording::context::compile, so that only one thread can be accessing the bulk of GCC's state at once. */ -static pthread_mutex_t jit_mutex = PTHREAD_MUTEX_INITIALIZER; +static std::mutex jit_mutex; /* Acquire jit_mutex and set "this" as the active playback ctxt. */ @@ -2673,7 +2674,7 @@ playback::context::acquire_mutex () /* Acquire the big GCC mutex. */ JIT_LOG_SCOPE (get_logger ()); - pthread_mutex_lock (&jit_mutex); + jit_mutex.lock (); gcc_assert (active_playback_ctxt == NULL); active_playback_ctxt = this; } @@ -2687,7 +2688,7 @@ playback::context::release_mutex () JIT_LOG_SCOPE (get_logger ()); gcc_assert (active_playback_ctxt == this); active_playback_ctxt = NULL; - pthread_mutex_unlock (&jit_mutex); + jit_mutex.unlock (); } /* Callback used by gcc::jit::playback::context::make_fake_args when diff --git a/gcc/jit/jit-recording.cc b/gcc/jit/jit-recording.cc index f78daed2d71..6ae5a667e90 100644 --- a/gcc/jit/jit-recording.cc +++ b/gcc/jit/jit-recording.cc @@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see . */ #include "config.h" -#define INCLUDE_PTHREAD_H #include "system.h" #include "coretypes.h" #include "tm.h" diff --git a/gcc/jit/libgccjit.cc b/gcc/jit/libgccjit.cc index ca862662777..a5105fbc1f9 100644 --- a/gcc/jit/libgccjit.cc +++ b/gcc/jit/libgccjit.cc @@ -19,7 +19,6 @@ along with GCC; see the file COPYING3. If not see . */ #include "config.h" -#define INCLUDE_PTHREAD_H #include "system.h" #include "coretypes.h" #include "timevar.h" @@ -30,6 +29,8 @@ along with GCC; see the file COPYING3. If not see #include "jit-recording.h" #include "jit-result.h" +#include + /* The opaque types used by the public API are actually subclasses of the gcc::jit::recording classes. */ @@ -4060,7 +4061,7 @@ gcc_jit_context_new_rvalue_from_vector (gcc_jit_context *ctxt, Ideally this would be within parse_basever, but the mutex is only needed by libgccjit. */ -static pthread_mutex_t version_mutex = PTHREAD_MUTEX_INITIALIZER; +static std::mutex version_mutex; struct jit_version_info { @@ -4068,9 +4069,8 @@ struct jit_version_info guarded by version_mutex. */ jit_version_info () { - pthread_mutex_lock (&version_mutex); + std::lock_guard g (version_mutex); parse_basever (&major, &minor, &patchlevel); - pthread_mutex_unlock (&version_mutex); } int major; -- 2.38.1