mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-06-19 23:09:52 +00:00
56aad8a83e
- Bug 1149987 - Part 2: Make ErrorResult unassignable; r=bzbarsky (32661559b) - Bug 1149987 - Part 3: Give ErrorResult a move constructor and a move assignment operator; (27f4c6125) - Bug 1149987 - Part 4: Do not attempt to delete ErrorResult::mMessage when deserializing the object from IPDL; r=bzbarsky (0f9dcc603) - Bug 1110485 P0 Add an ErrorResult constructor that takes nsresult. (72a779666) - Bug 1110485 P1 Refactor Cache IPC requests to use a separate actor. (a7e4c1959) - Bug 1127914 - Part 1 - Duplicate keyed histograms for double submission. (78673277f) - Bug 1127914 - Part 2 - Duplicate normal histograms for double submission. (55c302057) - Bug 1127914 - Part 3 - Submit duplicate histogram data for 'non-classic' telemetry sessions. r=vladan (bb3e49c43) - Bug 1120362 - Part 1 - Enable snapshotting and clearing subsession histograms. (14378a6e5) - Bug 1120362 - Part 2 - Enable snapshotting and clearing keyed subsession histograms. r=vladan (c0e0bfb3e) - partial apply of Bug 1119281 - Fix missing telemetry client id (ae0dc0194) - Bug 1122047 - Part 1 - Sketch out Telemetry environment module. (0419391b0) - Bug 1122047 - Part 2 - Make TelemetryPing shutdown properly on delayed initialization (0102cef09) - Bug 1122061 - Give TelemetryPing a common API for sending pings. (999cb825d) - Bug 1122061 - Move TelemetrySession tests out of test_telemetryPing.js. (2d5b61de1) - Bug 1120362 - Part 3 - Reset subsession histograms on telemetry payload collections. r=vladan (0d3f04df1) - Bug 1120362 - Part 4 - Start new telemetry subsessions on local midnight. r=vladan (93eb9ca21) - Bug 1120363 - Break up Telemetry sessions on environment changes. (a7c8d70c7) - Bug 1122052 - Remove duplicated data from TelemetrySession. (bb905d602) - Bug 1122050 - Remove persona and experiment data from TelemetrySession. (40ca59a9e) - Bug 1134268 - Part 1 - Fix and order Telemetry shutdown for TelemetryPing and TelemetrySession. r=yoric (30d0f0656) - Bug 1134268 - Part 2 - Fixup TelemetryEnvironment shutdown if the module wasnt initialized. r=vladan (ec2875fea) - Bug 1135076 - Missing histograms in childPayloads. r=vladan (9f317cf9d) - Bug 1134279 - Make TelemetryPing and TelemetrySession code use the "FHR enabled" & "Telemetry enabled" prefs properly. r=vladan (4050d7f24) - Bug 1128768: Part 1 - Modify IPC to allow retrieval of topmost routing id on the stack; (cd2e8a2f0) - Bug 1129249 - Add a "restyle" feature to profiler and split the style label in Cleopatra based on the restyleSource, r=dholbert,mstange (b37df94d1) - Bug 1150684: Remove XPCOM.h from IOInterposer.h (5b7e1cef3) - Bug 1093934 - Create a XPCOM library that can be used to support standalone WebRTC. (9ec8a819f) - Merge branch 'master' of https://github.com/rmottola/Arctic-Fox (d0f05eea4) - Bug 1128768: Part 2,3,4 - Refactor hang annotation code; (f5086aba9) (with xpcom/threads/ fixes for my tele-removed tree) - Bug 1128768: Part 5 - Update plugin code to retrieve SWF file for hang annotations; (774a47aec) - Bug 1110485 P2 Remove 'P' prefix from non-protocol IPC types in Cache API. r=baku (ea29a10cf) - Bug 1110485 P3 Move Fetch IPC PHeaderEntry type to Cache. Rename HeadesEntry. (9eba0aca0) - Bug 1110485 P4 Keep Cache Actors alive during async operations. (eb75f2316) - Bug 1110485 P5 Replace useless DBSchema class type with namespace. (159b902db) - Bug 1110485 P6 Remove useless cache::FileUtils type (1bdf00fc3) - Bug 1110485 P7 Rename DeleteCache() to DeleteCacheId() better distinguish it from CacheDelete(). (5199f9d6f) - Bug 1110485 P8 Correctly set the Feature on the stream control child actor. (c8673cb13) - Bug 1150691 Fix Cache API race with storage invalidation. (2723dff50) - Bug 1151892 Refactor Cache Manager Context usage to be more sane and fix shutdown assert. r=ehsan (ea96381cf) - Bug 1136331 - OdinMonkey: allow stdlib calls in heap expressions (2fc5e2bfd) - Bug 1141439 - Exit with an error code instead of falling through the REMOTE_NOT_FOUND code path when the X-remote returns an explicit command line handler error. (afcf9b1aa) - Bug 1135825: Add missing MOZ_OVERRIDE annotation in RTCIdentityProviderRegistrar.h (e8beec4e8) - (Bug 1135138 is not merged due to broken build)
226 lines
6.0 KiB
C++
226 lines
6.0 KiB
C++
/* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* vim: set ts=8 sts=2 et sw=2 tw=80: */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* 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 "MainThreadIOLogger.h"
|
|
|
|
#include "GoannaProfiler.h"
|
|
#include "IOInterposerPrivate.h"
|
|
#include "mozilla/IOInterposer.h"
|
|
#include "mozilla/StaticPtr.h"
|
|
#include "mozilla/TimeStamp.h"
|
|
#include "nsAutoPtr.h"
|
|
#include "nsNativeCharsetUtils.h"
|
|
|
|
/**
|
|
* This code uses NSPR stuff and STL containers because it must be detached
|
|
* from leak checking code; this observer runs until the process terminates.
|
|
*/
|
|
|
|
#include <prenv.h>
|
|
#include <prprf.h>
|
|
#include <prthread.h>
|
|
#include <vector>
|
|
|
|
namespace {
|
|
|
|
struct ObservationWithStack
|
|
{
|
|
ObservationWithStack(mozilla::IOInterposeObserver::Observation& aObs,
|
|
ProfilerBacktrace* aStack)
|
|
: mObservation(aObs)
|
|
, mStack(aStack)
|
|
{
|
|
const char16_t* filename = aObs.Filename();
|
|
if (filename) {
|
|
mFilename = filename;
|
|
}
|
|
}
|
|
|
|
mozilla::IOInterposeObserver::Observation mObservation;
|
|
ProfilerBacktrace* mStack;
|
|
nsString mFilename;
|
|
};
|
|
|
|
class MainThreadIOLoggerImpl final : public mozilla::IOInterposeObserver
|
|
{
|
|
public:
|
|
MainThreadIOLoggerImpl();
|
|
~MainThreadIOLoggerImpl();
|
|
|
|
bool Init();
|
|
|
|
void Observe(Observation& aObservation);
|
|
|
|
private:
|
|
static void sIOThreadFunc(void* aArg);
|
|
void IOThreadFunc();
|
|
|
|
TimeStamp mLogStartTime;
|
|
const char* mFileName;
|
|
PRThread* mIOThread;
|
|
IOInterposer::Monitor mMonitor;
|
|
bool mShutdownRequired;
|
|
std::vector<ObservationWithStack> mObservations;
|
|
};
|
|
|
|
static StaticAutoPtr<MainThreadIOLoggerImpl> sImpl;
|
|
|
|
MainThreadIOLoggerImpl::MainThreadIOLoggerImpl()
|
|
: mFileName(nullptr)
|
|
, mIOThread(nullptr)
|
|
, mShutdownRequired(false)
|
|
{
|
|
}
|
|
|
|
MainThreadIOLoggerImpl::~MainThreadIOLoggerImpl()
|
|
{
|
|
if (!mIOThread) {
|
|
return;
|
|
}
|
|
{
|
|
// Scope for lock
|
|
IOInterposer::MonitorAutoLock lock(mMonitor);
|
|
mShutdownRequired = true;
|
|
lock.Notify();
|
|
}
|
|
PR_JoinThread(mIOThread);
|
|
mIOThread = nullptr;
|
|
}
|
|
|
|
bool
|
|
MainThreadIOLoggerImpl::Init()
|
|
{
|
|
if (mFileName) {
|
|
// Already initialized
|
|
return true;
|
|
}
|
|
mFileName = PR_GetEnv("MOZ_MAIN_THREAD_IO_LOG");
|
|
if (!mFileName) {
|
|
// Can't start
|
|
return false;
|
|
}
|
|
mIOThread = PR_CreateThread(PR_USER_THREAD, &sIOThreadFunc, this,
|
|
PR_PRIORITY_LOW, PR_GLOBAL_THREAD,
|
|
PR_JOINABLE_THREAD, 0);
|
|
if (!mIOThread) {
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
/* static */ void
|
|
MainThreadIOLoggerImpl::sIOThreadFunc(void* aArg)
|
|
{
|
|
PR_SetCurrentThreadName("MainThreadIOLogger");
|
|
MainThreadIOLoggerImpl* obj = static_cast<MainThreadIOLoggerImpl*>(aArg);
|
|
obj->IOThreadFunc();
|
|
}
|
|
|
|
void
|
|
MainThreadIOLoggerImpl::IOThreadFunc()
|
|
{
|
|
PRFileDesc* fd = PR_Open(mFileName, PR_WRONLY | PR_CREATE_FILE | PR_TRUNCATE,
|
|
PR_IRUSR | PR_IWUSR | PR_IRGRP);
|
|
if (!fd) {
|
|
IOInterposer::MonitorAutoLock lock(mMonitor);
|
|
mShutdownRequired = true;
|
|
std::vector<ObservationWithStack>().swap(mObservations);
|
|
return;
|
|
}
|
|
mLogStartTime = TimeStamp::Now();
|
|
{
|
|
// Scope for lock
|
|
IOInterposer::MonitorAutoLock lock(mMonitor);
|
|
while (true) {
|
|
while (!mShutdownRequired && mObservations.empty()) {
|
|
lock.Wait();
|
|
}
|
|
if (mShutdownRequired) {
|
|
break;
|
|
}
|
|
// Pull events off the shared array onto a local one
|
|
std::vector<ObservationWithStack> observationsToWrite;
|
|
observationsToWrite.swap(mObservations);
|
|
|
|
// Release the lock so that we're not holding anybody up during I/O
|
|
IOInterposer::MonitorAutoUnlock unlock(mMonitor);
|
|
|
|
// Now write the events.
|
|
for (auto i = observationsToWrite.begin(), e = observationsToWrite.end();
|
|
i != e; ++i) {
|
|
if (i->mObservation.ObservedOperation() == OpNextStage) {
|
|
PR_fprintf(fd, "%f,NEXT-STAGE\n",
|
|
(TimeStamp::Now() - mLogStartTime).ToMilliseconds());
|
|
continue;
|
|
}
|
|
double durationMs = i->mObservation.Duration().ToMilliseconds();
|
|
nsAutoCString nativeFilename;
|
|
nativeFilename.AssignLiteral("(not available)");
|
|
if (!i->mFilename.IsEmpty()) {
|
|
if (NS_FAILED(NS_CopyUnicodeToNative(i->mFilename, nativeFilename))) {
|
|
nativeFilename.AssignLiteral("(conversion failed)");
|
|
}
|
|
}
|
|
/**
|
|
* Format:
|
|
* Start Timestamp (Milliseconds), Operation, Duration (Milliseconds), Event Source, Filename
|
|
*/
|
|
if (PR_fprintf(fd, "%f,%s,%f,%s,%s\n",
|
|
(i->mObservation.Start() - mLogStartTime).ToMilliseconds(),
|
|
i->mObservation.ObservedOperationString(), durationMs,
|
|
i->mObservation.Reference(), nativeFilename.get()) > 0) {
|
|
ProfilerBacktrace* stack = i->mStack;
|
|
if (stack) {
|
|
// TODO: Write out the callstack
|
|
// (This will be added in a later bug)
|
|
profiler_free_backtrace(stack);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
PR_Close(fd);
|
|
}
|
|
|
|
void
|
|
MainThreadIOLoggerImpl::Observe(Observation& aObservation)
|
|
{
|
|
if (!mFileName || !IsMainThread()) {
|
|
return;
|
|
}
|
|
IOInterposer::MonitorAutoLock lock(mMonitor);
|
|
if (mShutdownRequired) {
|
|
// The writer thread isn't running. Don't enqueue any more data.
|
|
return;
|
|
}
|
|
// Passing nullptr as aStack parameter for now
|
|
mObservations.push_back(ObservationWithStack(aObservation, nullptr));
|
|
lock.Notify();
|
|
}
|
|
|
|
} // anonymous namespace
|
|
|
|
namespace mozilla {
|
|
|
|
namespace MainThreadIOLogger {
|
|
|
|
bool
|
|
Init()
|
|
{
|
|
nsAutoPtr<MainThreadIOLoggerImpl> impl(new MainThreadIOLoggerImpl());
|
|
if (!impl->Init()) {
|
|
return false;
|
|
}
|
|
sImpl = impl.forget();
|
|
IOInterposer::Register(IOInterposeObserver::OpAllWithStaging, sImpl);
|
|
return true;
|
|
}
|
|
|
|
} // namespace MainThreadIOLogger
|
|
|
|
} // namespace mozilla
|
|
|