mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-10-21 12:21:43 +02:00
58 lines
2.0 KiB
Diff
58 lines
2.0 KiB
Diff
diff --git a/tools/profiler/LulElf.cpp b/tools/profiler/LulElf.cpp
|
|
index 203b15d..08a270a 100644
|
|
--- a/tools/profiler/LulElf.cpp
|
|
+++ b/tools/profiler/LulElf.cpp
|
|
@@ -612,10 +612,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;
|
|
}
|
|
|
|
diff --git a/tools/profiler/local_debug_info_symbolizer.cc b/tools/profiler/local_debug_info_symbolizer.cc
|
|
index 2232130..41dabc8 100644
|
|
--- a/tools/profiler/local_debug_info_symbolizer.cc
|
|
+++ b/tools/profiler/local_debug_info_symbolizer.cc
|
|
@@ -3,6 +3,7 @@
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
+#include <sys/types.h>
|
|
#include "PlatformMacros.h"
|
|
#include "nsAutoPtr.h"
|
|
|
|
diff --git a/tools/profiler/platform-linux-lul.h b/tools/profiler/platform-linux-lul.h
|
|
index 64714aa..563d8c0 100644
|
|
--- a/tools/profiler/platform-linux-lul.h
|
|
+++ b/tools/profiler/platform-linux-lul.h
|
|
@@ -18,7 +18,7 @@ logging_sink_for_LUL(const char* str);
|
|
|
|
// We need a definition of gettid(), but glibc doesn't provide a
|
|
// wrapper for it.
|
|
-#if defined(__GLIBC__)
|
|
+#if defined(__linux__)
|
|
#include <unistd.h>
|
|
#include <sys/syscall.h>
|
|
static inline pid_t gettid()
|
|
diff --git a/tools/profiler/platform.h b/tools/profiler/platform.h
|
|
index bb938a4..c721926 100644
|
|
--- a/tools/profiler/platform.h
|
|
+++ b/tools/profiler/platform.h
|
|
@@ -29,6 +29,8 @@
|
|
#ifndef TOOLS_PLATFORM_H_
|
|
#define TOOLS_PLATFORM_H_
|
|
|
|
+#include <sys/types.h>
|
|
+
|
|
#ifdef ANDROID
|
|
#include <android/log.h>
|
|
#else
|