Skip to content

Commit f663a34

Browse files
committed
Use bare pointer instead of unique_ptr, simpler and faster (slightly)
1 parent 314740d commit f663a34

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

src/native/common/include/runtime-base/timing-internal.hh

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ namespace xamarin::android {
6565
time_point start;
6666
time_point end;
6767
TimingEventKind kind;
68-
std::unique_ptr<std::string> more_info{};
68+
std::string *more_info = nullptr;
6969
};
7070

7171
class FastTiming;
@@ -220,7 +220,7 @@ namespace xamarin::android {
220220
message.append ("] "sv);
221221

222222
append_event_kind_description (event.kind, message);
223-
if (event.more_info && !event.more_info->empty ()) {
223+
if (event.more_info != nullptr && !event.more_info->empty ()) {
224224
message.append (event.more_info->c_str (), event.more_info->length ());
225225
}
226226

@@ -255,7 +255,7 @@ namespace xamarin::android {
255255
return;
256256
}
257257

258-
if (skip_log_if_more_info_missing && (!event.more_info || event.more_info->empty ())) {
258+
if (skip_log_if_more_info_missing && (event.more_info == nullptr || event.more_info->empty ())) {
259259
return;
260260
}
261261

@@ -301,9 +301,7 @@ namespace xamarin::android {
301301
ev.start = get_time ();
302302
ev.kind = kind;
303303
ev.before_managed = MonodroidState::is_startup_in_progress ();
304-
if (ev.more_info) {
305-
ev.more_info.reset ();
306-
}
304+
ev.more_info = nullptr;
307305
log_warn (LOG_DEFAULT, "#grendel 5.011");
308306
}
309307

@@ -340,7 +338,7 @@ namespace xamarin::android {
340338
return;
341339
}
342340

343-
events[*index].more_info = std::make_unique<std::string> (str.get (), str.length ());
341+
events[*index].more_info = new std::string (str.get (), str.length ());
344342
log (events[*index], false /* skip_log_if_more_info_missing */);
345343
}
346344

@@ -353,7 +351,7 @@ namespace xamarin::android {
353351
return;
354352
}
355353

356-
events[*index].more_info = std::make_unique<std::string> (str);
354+
events[*index].more_info = new std::string (str);
357355
log (events[*index], false /* skip_log_if_more_info_missing */);
358356
}
359357

@@ -366,7 +364,7 @@ namespace xamarin::android {
366364
return;
367365
}
368366

369-
events[*index].more_info = std::make_unique<std::string> (str);
367+
events[*index].more_info = new std::string (str);
370368
log (events[*index], false /* skip_log_if_more_info_missing */);
371369
}
372370

src/native/common/runtime-base/timing-internal.cc

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
#include <chrono>
22

3-
//#include <xamarin-app.hh>
43
#include <runtime-base/android-system.hh>
54
#include <runtime-base/startup-aware-lock.hh>
65
#include <runtime-base/strings.hh>

0 commit comments

Comments
 (0)