@@ -58,8 +58,6 @@ using namespace v8;
58
58
59
59
namespace dd {
60
60
61
- using ContextPtr = std::shared_ptr<Global<Value>>;
62
-
63
61
// Maximum number of rounds in the GetV8ToEpochOffset
64
62
static constexpr int MAX_EPOCH_OFFSET_ATTEMPTS = 20 ;
65
63
@@ -613,11 +611,9 @@ void WallProfiler::Dispose(Isolate* isolate, bool removeFromMap) {
613
611
node::RemoveEnvironmentCleanupHook (
614
612
isolate, &WallProfiler::CleanupHook, isolate);
615
613
616
- for (auto it = liveContextPtrs_.begin (); it != liveContextPtrs_.end ();) {
617
- auto ptr = *it;
614
+ for (auto ptr : liveContextPtrs_) {
618
615
ptr->UnregisterFromGC ();
619
616
delete ptr;
620
- ++it;
621
617
}
622
618
liveContextPtrs_.clear ();
623
619
deadContextPtrs_.clear ();
@@ -1086,11 +1082,9 @@ void WallProfiler::SetContext(Isolate* isolate, Local<Value> value) {
1086
1082
}
1087
1083
1088
1084
// Clean up dead context pointers
1089
- for (auto it = deadContextPtrs_.begin (); it != deadContextPtrs_.end ();) {
1090
- auto ptr = *it;
1085
+ for (auto ptr : deadContextPtrs_) {
1091
1086
liveContextPtrs_.erase (ptr);
1092
1087
delete ptr;
1093
- ++it;
1094
1088
}
1095
1089
deadContextPtrs_.clear ();
1096
1090
@@ -1113,11 +1107,11 @@ void WallProfiler::SetContext(Isolate* isolate, Local<Value> value) {
1113
1107
contextPtr = new PersistentContextPtr (&deadContextPtrs_);
1114
1108
1115
1109
auto external = External::New (isolate, contextPtr);
1116
- setInProgress .store (true , std::memory_order_relaxed);
1110
+ setInProgress_ .store (true , std::memory_order_relaxed);
1117
1111
std::atomic_signal_fence (std::memory_order_release);
1118
1112
auto maybeSetResult = cpedObj->SetPrivate (v8Ctx, localSymbol, external);
1119
1113
std::atomic_signal_fence (std::memory_order_release);
1120
- setInProgress .store (false , std::memory_order_relaxed);
1114
+ setInProgress_ .store (false , std::memory_order_relaxed);
1121
1115
if (maybeSetResult.IsNothing ()) {
1122
1116
delete contextPtr;
1123
1117
return ;
@@ -1136,7 +1130,7 @@ void WallProfiler::SetContext(Isolate* isolate, Local<Value> value) {
1136
1130
}
1137
1131
1138
1132
ContextPtr WallProfiler::GetContextPtrSignalSafe (Isolate* isolate) {
1139
- auto isSetInProgress = setInProgress .load (std::memory_order_relaxed);
1133
+ auto isSetInProgress = setInProgress_ .load (std::memory_order_relaxed);
1140
1134
std::atomic_signal_fence (std::memory_order_acquire);
1141
1135
if (isSetInProgress) {
1142
1136
// New sample context is being set. Safe behavior is to not try attempt
@@ -1148,7 +1142,7 @@ ContextPtr WallProfiler::GetContextPtrSignalSafe(Isolate* isolate) {
1148
1142
auto curGcCount = gcCount.load (std::memory_order_relaxed);
1149
1143
std::atomic_signal_fence (std::memory_order_acquire);
1150
1144
if (curGcCount > 0 ) {
1151
- return gcContext ;
1145
+ return gcContext_ ;
1152
1146
}
1153
1147
}
1154
1148
@@ -1253,7 +1247,7 @@ void WallProfiler::OnGCStart(v8::Isolate* isolate) {
1253
1247
gcAsyncId = GetAsyncIdNoGC (isolate);
1254
1248
}
1255
1249
if (useCPED_) {
1256
- gcContext = GetContextPtrSignalSafe (isolate);
1250
+ gcContext_ = GetContextPtrSignalSafe (isolate);
1257
1251
}
1258
1252
}
1259
1253
gcCount.store (curCount + 1 , std::memory_order_relaxed);
@@ -1268,7 +1262,7 @@ void WallProfiler::OnGCEnd() {
1268
1262
if (newCount == 0 ) {
1269
1263
gcAsyncId = -1 ;
1270
1264
if (useCPED_) {
1271
- gcContext .reset ();
1265
+ gcContext_ .reset ();
1272
1266
}
1273
1267
}
1274
1268
}
0 commit comments