зеркало из https://github.com/mozilla/gecko-dev.git
Back out rev ec6b18766795 (bug 705856) due to red.
This commit is contained in:
Родитель
1908ae1df4
Коммит
afafb91691
|
@ -78,7 +78,7 @@ EXTRA_JS_MODULES = \
|
||||||
Profiler.jsm \
|
Profiler.jsm \
|
||||||
$(NULL)
|
$(NULL)
|
||||||
|
|
||||||
ifneq (,$(filter Android Linux,$(OS_TARGET)))
|
ifeq ($(OS_TARGET),Android)
|
||||||
|
|
||||||
DEFINES += -DMOZ_ENABLE_PROFILER_SPS
|
DEFINES += -DMOZ_ENABLE_PROFILER_SPS
|
||||||
|
|
||||||
|
|
|
@ -86,7 +86,7 @@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Redefine the macros for platforms where SPS is supported.
|
// Redefine the macros for platforms where SPS is supported.
|
||||||
#if defined(ANDROID) || defined(XP_LINUX) || defined(XP_MACOSX) || defined(XP_WIN)
|
#if defined(ANDROID) || defined(XP_MACOSX) || defined(XP_WIN)
|
||||||
|
|
||||||
#include "sps_sampler.h"
|
#include "sps_sampler.h"
|
||||||
|
|
||||||
|
@ -106,7 +106,6 @@
|
||||||
#define SAMPLER_GET_RESPONSIVENESS() NULL
|
#define SAMPLER_GET_RESPONSIVENESS() NULL
|
||||||
#define SAMPLE_LABEL(name_space, info)
|
#define SAMPLE_LABEL(name_space, info)
|
||||||
#define SAMPLE_MARKER(info)
|
#define SAMPLE_MARKER(info)
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif // ifndef SAMPLER_H
|
#endif
|
||||||
|
|
|
@ -47,15 +47,6 @@
|
||||||
#define PATH_MAX_TOSTRING(x) #x
|
#define PATH_MAX_TOSTRING(x) #x
|
||||||
#define PATH_MAX_STRING(x) PATH_MAX_TOSTRING(x)
|
#define PATH_MAX_STRING(x) PATH_MAX_TOSTRING(x)
|
||||||
|
|
||||||
#if defined(__GLIBC__)
|
|
||||||
// glibc doesn't implement gettid(2).
|
|
||||||
#include <sys/syscall.h>
|
|
||||||
pid_t gettid()
|
|
||||||
{
|
|
||||||
return (pid_t) syscall(SYS_gettid);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef ENABLE_SPS_LEAF_DATA
|
#ifdef ENABLE_SPS_LEAF_DATA
|
||||||
/* a crapy version of getline, because it's not included in bionic */
|
/* a crapy version of getline, because it's not included in bionic */
|
||||||
static ssize_t getline(char **lineptr, size_t *n, FILE *stream)
|
static ssize_t getline(char **lineptr, size_t *n, FILE *stream)
|
||||||
|
@ -203,6 +194,7 @@ class Sampler::PlatformData : public Malloced {
|
||||||
: sampler_(sampler),
|
: sampler_(sampler),
|
||||||
signal_handler_installed_(false),
|
signal_handler_installed_(false),
|
||||||
vm_tgid_(getpid()),
|
vm_tgid_(getpid()),
|
||||||
|
// Glibc doesn't provide a wrapper for gettid(2).
|
||||||
vm_tid_(gettid()),
|
vm_tid_(gettid()),
|
||||||
signal_sender_launched_(false) {
|
signal_sender_launched_(false) {
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,9 +37,6 @@
|
||||||
* ***** END LICENSE BLOCK ***** */
|
* ***** END LICENSE BLOCK ***** */
|
||||||
|
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
#include <signal.h>
|
|
||||||
#include <pthread.h>
|
|
||||||
#include "base/atomicops.h"
|
|
||||||
#include "thread_helper.h"
|
#include "thread_helper.h"
|
||||||
#include "nscore.h"
|
#include "nscore.h"
|
||||||
#include "mozilla/TimeStamp.h"
|
#include "mozilla/TimeStamp.h"
|
||||||
|
|
Загрузка…
Ссылка в новой задаче