Skip to content

Commit e556f07

Browse files
vitalybukawzssyqa
andauthored
[NFC][asan] Cleanup AsanThreadIdAndName ctor/init (#111923)
Co-authored-by: YunQiang Su <[email protected]>
1 parent 36639af commit e556f07

File tree

2 files changed

+11
-17
lines changed

2 files changed

+11
-17
lines changed

compiler-rt/lib/asan/asan_descriptions.cpp

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,24 +20,20 @@
2020
namespace __asan {
2121

2222
AsanThreadIdAndName::AsanThreadIdAndName(AsanThreadContext *t) {
23-
Init(t->tid, t->name);
24-
}
25-
26-
AsanThreadIdAndName::AsanThreadIdAndName(u32 tid) {
27-
if (tid == kInvalidTid) {
28-
Init(tid, "");
29-
} else {
30-
asanThreadRegistry().CheckLocked();
31-
AsanThreadContext *t = GetThreadContextByTidLocked(tid);
32-
Init(tid, t->name);
23+
if (!t) {
24+
internal_snprintf(name, sizeof(name), "T-1");
25+
return;
3326
}
27+
int len = internal_snprintf(name, sizeof(name), "T%d", t->tid);
28+
CHECK(((unsigned int)len) < sizeof(name));
29+
if (internal_strlen(t->name))
30+
internal_snprintf(&name[len], sizeof(name) - len, " (%s)", t->name);
3431
}
3532

36-
void AsanThreadIdAndName::Init(u32 tid, const char *tname) {
37-
int len = internal_snprintf(name, sizeof(name), "T%d", tid);
38-
CHECK(((unsigned int)len) < sizeof(name));
39-
if (tname[0] != '\0')
40-
internal_snprintf(&name[len], sizeof(name) - len, " (%s)", tname);
33+
AsanThreadIdAndName::AsanThreadIdAndName(u32 tid)
34+
: AsanThreadIdAndName(
35+
tid == kInvalidTid ? nullptr : GetThreadContextByTidLocked(tid)) {
36+
asanThreadRegistry().CheckLocked();
4137
}
4238

4339
void DescribeThread(AsanThreadContext *context) {

compiler-rt/lib/asan/asan_descriptions.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,6 @@ class AsanThreadIdAndName {
3535
const char *c_str() const { return &name[0]; }
3636

3737
private:
38-
void Init(u32 tid, const char *tname);
39-
4038
char name[128];
4139
};
4240

0 commit comments

Comments
 (0)