зеркало из https://github.com/mozilla/pjs.git
Added some more timing traces to WinFE. Approved by blythe.
This commit is contained in:
Родитель
1118993d8f
Коммит
d86a5e14c2
|
@ -34,6 +34,7 @@
|
||||||
extern "C" {
|
extern "C" {
|
||||||
#include "httpurl.h"
|
#include "httpurl.h"
|
||||||
}
|
}
|
||||||
|
#include "timing.h"
|
||||||
|
|
||||||
#ifdef DEBUG_WHITEBOX
|
#ifdef DEBUG_WHITEBOX
|
||||||
#include "qa.h"
|
#include "qa.h"
|
||||||
|
@ -79,6 +80,7 @@ void CFE_Alert(MWContext *pContext, const char *pMessage) {
|
||||||
}
|
}
|
||||||
|
|
||||||
void CFE_AllConnectionsComplete(MWContext *pContext) {
|
void CFE_AllConnectionsComplete(MWContext *pContext) {
|
||||||
|
TIMING_STOPCLOCK_OBJECT("fe:doc-load", pContext, pContext, "ok");
|
||||||
|
|
||||||
if(ABSTRACTCX(pContext)->IsDestroyed()) {
|
if(ABSTRACTCX(pContext)->IsDestroyed()) {
|
||||||
// Don't allow this to happen if the context has been destroyed...
|
// Don't allow this to happen if the context has been destroyed...
|
||||||
|
@ -1174,6 +1176,7 @@ void CFE_GetUrlExitRoutine(URL_Struct *pUrl, int iStatus, MWContext *pContext)
|
||||||
|
|
||||||
// Report any error.
|
// Report any error.
|
||||||
if(iStatus < 0 && pUrl->error_msg != NULL) {
|
if(iStatus < 0 && pUrl->error_msg != NULL) {
|
||||||
|
TIMING_STOPCLOCK_OBJECT("fe:doc-xfer", pUrl, pContext, "error");
|
||||||
FE_Alert(pContext, pUrl->error_msg);
|
FE_Alert(pContext, pUrl->error_msg);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1181,9 +1184,12 @@ void CFE_GetUrlExitRoutine(URL_Struct *pUrl, int iStatus, MWContext *pContext)
|
||||||
// out from under us while we were displaying the modal dialog box (and in
|
// out from under us while we were displaying the modal dialog box (and in
|
||||||
// a sub-dispatch message loop)
|
// a sub-dispatch message loop)
|
||||||
if (!XP_IsContextInList(pContext)) {
|
if (!XP_IsContextInList(pContext)) {
|
||||||
|
TIMING_STOPCLOCK_OBJECT("fe:doc-xfer", pUrl, pContext, "destroyed");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TIMING_STOPCLOCK_OBJECT("fe:doc-xfer", pUrl, pContext, "ok");
|
||||||
|
|
||||||
#ifdef EDITOR
|
#ifdef EDITOR
|
||||||
// Do stuff specific to the editor
|
// Do stuff specific to the editor
|
||||||
FE_EditorGetUrlExitRoutine(pUrl, iStatus, pContext);
|
FE_EditorGetUrlExitRoutine(pUrl, iStatus, pContext);
|
||||||
|
|
|
@ -44,6 +44,7 @@
|
||||||
#include "edt.h"
|
#include "edt.h"
|
||||||
#endif /* EDITOR */
|
#endif /* EDITOR */
|
||||||
#include "mozilla.h"
|
#include "mozilla.h"
|
||||||
|
#include "timing.h"
|
||||||
|
|
||||||
CAbstractCX::CAbstractCX() {
|
CAbstractCX::CAbstractCX() {
|
||||||
// Purpose: Constructor for the abstract base class.
|
// Purpose: Constructor for the abstract base class.
|
||||||
|
@ -673,8 +674,14 @@ int CAbstractCX::GetUrl(URL_Struct *pUrl, FO_Present_Types iFormatOut, BOOL bRea
|
||||||
StartAnimation();
|
StartAnimation();
|
||||||
if ( m_cxType == IconCX)
|
if ( m_cxType == IconCX)
|
||||||
iRetval = NET_GetURL(pUrl, iFormatOut, GetContext(), Icon_GetUrlExitRoutine);
|
iRetval = NET_GetURL(pUrl, iFormatOut, GetContext(), Icon_GetUrlExitRoutine);
|
||||||
else
|
else {
|
||||||
|
TIMING_MESSAGE(("begin-document,%08x,%08x,%s",
|
||||||
|
GetContext(), pUrl, pUrl->address));
|
||||||
|
|
||||||
|
TIMING_STARTCLOCK_OBJECT("fe:doc-xfer", pUrl);
|
||||||
|
TIMING_STARTCLOCK_OBJECT("fe:doc-load", GetContext());
|
||||||
iRetval = NET_GetURL(pUrl, iFormatOut, GetContext(), CFE_GetUrlExitRoutine);
|
iRetval = NET_GetURL(pUrl, iFormatOut, GetContext(), CFE_GetUrlExitRoutine);
|
||||||
|
}
|
||||||
FE_UpdateStopState(GetContext());
|
FE_UpdateStopState(GetContext());
|
||||||
|
|
||||||
winfeInProcessNet = iOldInProcessNet;
|
winfeInProcessNet = iOldInProcessNet;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче