forked from kiss-community/repo
38 lines
1.4 KiB
Diff
38 lines
1.4 KiB
Diff
|
diff --git a/tools/profiler/core/platform-linux-android.cpp b/tools/profiler/core/platform-linux-android.cpp
|
||
|
|
index 19d0a5c56d..b64b543066 100644
|
||
|
|
--- a/tools/profiler/core/platform-linux-android.cpp
|
||
|
|
+++ b/tools/profiler/core/platform-linux-android.cpp
|
||
|
|
@@ -506,8 +506,10 @@ static void PlatformInit(PSLockRef aLock) {}
|
||
|
|
ucontext_t sSyncUContext;
|
||
|
|
|
||
|
|
void Registers::SyncPopulate() {
|
||
|
|
- if (!getcontext(&sSyncUContext)) {
|
||
|
|
- PopulateRegsFromContext(*this, &sSyncUContext);
|
||
|
|
- }
|
||
|
|
+ #if defined(__GLIBC__)
|
||
|
|
+ if (!getcontext(&sSyncUContext)) {
|
||
|
|
+ PopulateRegsFromContext(*this, &sSyncUContext);
|
||
|
|
+ }
|
||
|
|
+ #endif
|
||
|
|
}
|
||
|
|
#endif
|
||
|
|
diff --git a/tools/profiler/lul/LulElf.cpp b/tools/profiler/lul/LulElf.cpp
|
||
|
|
index 9998d04d0d..348a7086fc 100644
|
||
|
|
--- a/tools/profiler/lul/LulElf.cpp
|
||
|
|
+++ b/tools/profiler/lul/LulElf.cpp
|
||
|
|
@@ -469,10 +469,10 @@ string FormatIdentifier(unsigned char identifier[16]) {
|
||
|
|
// Return the non-directory portion of FILENAME: the portion after the
|
||
|
|
// last slash, or the whole filename if there are no slashes.
|
||
|
|
string BaseFileName(const string& filename) {
|
||
|
|
- // Lots of copies! basename's behavior is less than ideal.
|
||
|
|
- char* c_filename = strdup(filename.c_str());
|
||
|
|
- string base = basename(c_filename);
|
||
|
|
- free(c_filename);
|
||
|
|
+ // basename's behavior is less than ideal so avoid it
|
||
|
|
+ const char *c_filename = filename.c_str();
|
||
|
|
+ const char *p = strrchr(c_filename, '/');
|
||
|
|
+ string base = p ? p+1 : c_filename;
|
||
|
|
return base;
|
||
|
|
}
|
||
|
|
|