Skip to content

Commit

Permalink
Bug 1794644 - Part 1: Remove rlbox shared lock workaround for macOS 1…
Browse files Browse the repository at this point in the history
…0.{9-11}, r=glandium

Differential Revision: https://phabricator.services.mozilla.com/D159084
  • Loading branch information
mystor committed Oct 14, 2022
1 parent 1b90c89 commit a04c002
Showing 1 changed file with 0 additions and 21 deletions.
21 changes: 0 additions & 21 deletions config/external/rlbox/rlbox_config.h
Original file line number Diff line number Diff line change
Expand Up @@ -8,27 +8,6 @@

#include "mozilla/Assertions.h"

#ifdef XP_MACOSX

// RLBox uses c++17's shared_locks by default, even for the noop_sandbox
// However c++17 shared_lock is not supported on macOS 10.9 to 10.11
// Thus we use Firefox's shared lock implementation
// This can be removed if macOS 10.9 to 10.11 support is dropped
# include "mozilla/RWLock.h"
namespace rlbox {
struct rlbox_shared_lock {
mozilla::detail::StaticRWLock rwlock;
};
} // namespace rlbox
# define RLBOX_USE_CUSTOM_SHARED_LOCK
# define RLBOX_SHARED_LOCK(name) rlbox::rlbox_shared_lock name
# define RLBOX_ACQUIRE_SHARED_GUARD(name, ...) \
mozilla::detail::StaticAutoReadLock name((__VA_ARGS__).rwlock)
# define RLBOX_ACQUIRE_UNIQUE_GUARD(name, ...) \
mozilla::detail::StaticAutoWriteLock name((__VA_ARGS__).rwlock)

#endif

// All uses of rlbox's function and callbacks invocations are on a single
// thread right now, so we disable rlbox thread checks for performance
// See (Bug 1739298) for more details
Expand Down

0 comments on commit a04c002

Please sign in to comment.