Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fb2d8c0d authored by Christopher Ferris's avatar Christopher Ferris Committed by Automerger Merge Worker
Browse files

Merge "Remove usage of ATOMIC_VAR_INIT." into main am: 13cb7060 

Original change: https://android-review.googlesource.com/c/platform/system/core/+/3169739



Change-Id: Ia009e129aca837dc0bd4e978ba6524ede24a25b3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents b098995d 13cb7060

libcutils/trace-dev.inc

+3 −3
Original line number Diff line number Diff line
@@ -49,17 +49,17 @@ 


constexpr uint32_t kSeqNoNotInit = static_cast<uint32_t>(-1);



atomic_bool              atrace_is_ready      = ATOMIC_VAR_INIT(false);

atomic_bool              atrace_is_ready      = false;

int                      atrace_marker_fd     = -1;

uint64_t                 atrace_enabled_tags  = ATRACE_TAG_NOT_READY;

static atomic_bool       atrace_is_enabled    = ATOMIC_VAR_INIT(true);

static atomic_bool       atrace_is_enabled    = true;

static pthread_mutex_t   atrace_tags_mutex    = PTHREAD_MUTEX_INITIALIZER;



/**

 * Sequence number of debug.atrace.tags.enableflags the last time the enabled

 * tags were reloaded.

 **/

static _Atomic(uint32_t) last_sequence_number = ATOMIC_VAR_INIT(kSeqNoNotInit);

static _Atomic(uint32_t) last_sequence_number = kSeqNoNotInit;



#if defined(__BIONIC__)

// All zero prop_info that has a sequence number of 0. This is easier than

libcutils/trace-host.cpp

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


#include <cutils/trace.h>



atomic_bool             atrace_is_ready      = ATOMIC_VAR_INIT(true);

atomic_bool             atrace_is_ready      = true;

int                     atrace_marker_fd     = -1;

uint64_t                atrace_enabled_tags  = 0;