Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more prlog fun.. added class to do scope based logging (enter/exit messages)

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@87802 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
pavlov%netscape.com
2001-02-23 10:57:00 +00:00
parent 8be0275595
commit f162519ea9
4 changed files with 89 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
mozilla/modules/libpr0n/src/ImageLogging.h Normal file
View File

@@ -0,0 +1,58 @@
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
*
* The contents of this file are subject to the Mozilla Public
* License Version 1.1 (the "License"); you may not use this file
* except in compliance with the License. You may obtain a copy of
* the License at http://www.mozilla.org/MPL/
*
* Software distributed under the License is distributed on an "AS
* IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or
* implied. See the License for the specific language governing
* rights and limitations under the License.
*
* The Original Code is mozilla.org code.
*
* The Initial Developer of the Original Code is Netscape
* Communications Corporation. Portions created by Netscape are
* Copyright (C) 2001 Netscape Communications Corporation.
* All Rights Reserved.
*
* Contributor(s):
* Stuart Parmenter <pavlov@netscape.com>
*/
#include "prlog.h"
#include "nsString.h"
#if defined(PR_LOGGING)
extern PRLogModuleInfo *gImgLog;
class LogScope {
public:
LogScope(void *from, const nsAReadableCString &fn) :
mFrom(from), mFunc(fn)
{
PR_LOG(gImgLog, PR_LOG_DEBUG, ("[this=%p] %s {ENTER}\n",
mFrom, mFunc.get()));
}
~LogScope() {
PR_LOG(gImgLog, PR_LOG_DEBUG, ("[this=%p] %s {EXIT}\n",
mFrom, mFunc.get()));
}
private:
void *mFrom;
nsCAutoString mFunc;
};
#define LOG_SCOPE(s) \
LogScope LOG_SCOPE_TMP_VAR(this, NS_LITERAL_CSTRING(s))
#else
#define LOG_SCOPE(s)
#define gImgLog
#endif

23
mozilla/modules/libpr0n/src/imgLoader.cpp
View File

@@ -46,13 +46,7 @@
#include "nsAutoLock.h"
#endif
#include "prlog.h"
#if defined(PR_LOGGING)
extern PRLogModuleInfo *gImgLog;
#else
#define gImgLog
#endif
#include "ImageLogging.h"
static NS_DEFINE_CID(kImageRequestCID, NS_IMGREQUEST_CID);
static NS_DEFINE_CID(kImageRequestProxyCID, NS_IMGREQUESTPROXY_CID);
@@ -79,10 +73,16 @@ imgLoader::~imgLoader()
PR_DestroyLock(mLock);
#endif
}
#include "nsString.h"
#include "nsAReadableString.h"
PRLogModuleInfo *testLog = PR_NewLogModule("test123");
/* imgIRequest loadImage (in nsIURI uri, in imgIDecoderObserver aObserver, in nsISupports cx); */
NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, imgIDecoderObserver *aObserver, nsISupports *cx, imgIRequest **_retval)
{
LOG_SCOPE("imgLoader::LoadImage");
NS_ASSERTION(aURI, "imgLoader::LoadImage -- NULL URI pointer");
#if defined(PR_LOGGING)
@@ -100,9 +100,7 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, imgIDecoderObserver *aObserver,
#ifdef LOADER_THREADSAFE
nsAutoLock lock(mLock); // lock when we are adding things to the cache
#endif
PR_LOG(gImgLog, PR_LOG_DEBUG,
("[this=%p] imgLoader::LoadImage |cache miss| {ENTER}\n", this));
LOG_SCOPE("imgLoader::LoadImage |cache miss|");
nsCOMPtr<nsIIOService> ioserv(do_GetService("@mozilla.org/network/io-service;1"));
if (!ioserv) return NS_ERROR_FAILURE;
@@ -131,8 +129,6 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, imgIDecoderObserver *aObserver,
// XXX are we calling this too early?
newChannel->AsyncOpen(NS_STATIC_CAST(nsIStreamListener *, request), cx);
PR_LOG(gImgLog, PR_LOG_DEBUG,
("[this=%p] imgLoader::LoadImage |cache miss| {EXIT}\n", this));
} else {
PR_LOG(gImgLog, PR_LOG_DEBUG,
("[this=%p] imgLoader::LoadImage |cache hit| [request=%p]\n",
@@ -151,9 +147,6 @@ NS_IMETHODIMP imgLoader::LoadImage(nsIURI *aURI, imgIDecoderObserver *aObserver,
*_retval = proxyRequest;
NS_ADDREF(*_retval);
PR_LOG(gImgLog, PR_LOG_DEBUG,
("[this=%p] imgLoader::LoadImage {EXIT}\n", this));
return NS_OK;
}

75
mozilla/modules/libpr0n/src/imgRequest.cpp
View File

@@ -37,14 +37,13 @@
#include "ImageCache.h"
#include "prlog.h"
#include "ImageLogging.h"
#if defined(PR_LOGGING)
PRLogModuleInfo *gImgLog = PR_NewLogModule("imgRequest");
#else
#define gImgLog
#endif
NS_IMPL_ISUPPORTS5(imgRequest, imgIRequest,
imgIDecoderObserver, gfxIImageContainerObserver,
nsIStreamListener, nsIStreamObserver)
@@ -129,8 +128,7 @@ nsresult imgRequest::RemoveObserver(imgIDecoderObserver *observer, nsresult stat
/* void cancel (in nsresult status); */
NS_IMETHODIMP imgRequest::Cancel(nsresult status)
{
PR_LOG(gImgLog, PR_LOG_DEBUG,
("[this=%p] imgRequest::Cancel\n", this));
LOG_SCOPE("imgRequest::Cancel");
if (mChannel) {
mChannel->GetOriginalURI(getter_AddRefs(mURI));
@@ -146,11 +144,10 @@ NS_IMETHODIMP imgRequest::Cancel(nsresult status)
ImageCache::Remove(mURI);
nsresult rv = NS_OK;
if (mChannel && mProcessing)
rv = mChannel->Cancel(status);
return mChannel->Cancel(status);
return rv;
return NS_OK;
}
/* readonly attribute gfxIImageContainer image; */
@@ -197,8 +194,7 @@ NS_IMETHODIMP imgRequest::GetURI(nsIURI **aURI)
/* [noscript] void frameChanged (in gfxIImageContainer container, in nsISupports cx, in gfxIImageFrame newframe, in nsRect dirtyRect); */
NS_IMETHODIMP imgRequest::FrameChanged(gfxIImageContainer *container, nsISupports *cx, gfxIImageFrame *newframe, nsRect * dirtyRect)
{
PR_LOG(gImgLog, PR_LOG_DEBUG,
("[this=%p] imgRequest::FrameChanged {ENTER}\n", this));
LOG_SCOPE("imgRequest::FrameChanged");
PRInt32 i = -1;
PRInt32 count = mObservers.Count();
@@ -208,9 +204,6 @@ NS_IMETHODIMP imgRequest::FrameChanged(gfxIImageContainer *container, nsISupport
if (ob) ob->FrameChanged(container, cx, newframe, dirtyRect);
}
PR_LOG(gImgLog, PR_LOG_DEBUG,
("[this=%p] imgRequest::FrameChanged {EXIT}\n", this));
return NS_OK;
}
@@ -219,8 +212,7 @@ NS_IMETHODIMP imgRequest::FrameChanged(gfxIImageContainer *container, nsISupport
/* void onStartDecode (in imgIRequest request, in nsISupports cx); */
NS_IMETHODIMP imgRequest::OnStartDecode(imgIRequest *request, nsISupports *cx)
{
PR_LOG(gImgLog, PR_LOG_DEBUG,
("[this=%p] imgRequest::OnStartDecode {ENTER}\n", this));
LOG_SCOPE("imgRequest::OnStartDecode");
mState |= onStartDecode;
@@ -232,17 +224,13 @@ NS_IMETHODIMP imgRequest::OnStartDecode(imgIRequest *request, nsISupports *cx)
if (ob) ob->OnStartDecode(request, cx);
}
PR_LOG(gImgLog, PR_LOG_DEBUG,
("[this=%p] imgRequest::OnStartDecode {EXIT}\n", this));
return NS_OK;
}
/* void onStartContainer (in imgIRequest request, in nsISupports cx, in gfxIImageContainer image); */
NS_IMETHODIMP imgRequest::OnStartContainer(imgIRequest *request, nsISupports *cx, gfxIImageContainer *image)
{
PR_LOG(gImgLog, PR_LOG_DEBUG,
("[this=%p] imgRequest::OnStartContainer {ENTER}\n", this));
LOG_SCOPE("imgRequest::OnStartContainer");
mState |= onStartContainer;
@@ -256,17 +244,13 @@ NS_IMETHODIMP imgRequest::OnStartContainer(imgIRequest *request, nsISupports *cx
if (ob) ob->OnStartContainer(request, cx, image);
}
PR_LOG(gImgLog, PR_LOG_DEBUG,
("[this=%p] imgRequest::OnStartContainer {EXIT}\n", this));
return NS_OK;
}
/* void onStartFrame (in imgIRequest request, in nsISupports cx, in gfxIImageFrame frame); */
NS_IMETHODIMP imgRequest::OnStartFrame(imgIRequest *request, nsISupports *cx, gfxIImageFrame *frame)
{
PR_LOG(gImgLog, PR_LOG_DEBUG,
("[this=%p] imgRequest::OnStartFrame {ENTER}\n", this));
LOG_SCOPE("imgRequest::OnStartFrame");
PRInt32 i = -1;
PRInt32 count = mObservers.Count();
@@ -276,17 +260,13 @@ NS_IMETHODIMP imgRequest::OnStartFrame(imgIRequest *request, nsISupports *cx, gf
if (ob) ob->OnStartFrame(request, cx, frame);
}
PR_LOG(gImgLog, PR_LOG_DEBUG,
("[this=%p] imgRequest::OnStartFrame {EXIT}\n", this));
return NS_OK;
}
/* [noscript] void onDataAvailable (in imgIRequest request, in nsISupports cx, in gfxIImageFrame frame, [const] in nsRect rect); */
NS_IMETHODIMP imgRequest::OnDataAvailable(imgIRequest *request, nsISupports *cx, gfxIImageFrame *frame, const nsRect * rect)
{
PR_LOG(gImgLog, PR_LOG_DEBUG,
("[this=%p] imgRequest::OnDataAvailable {ENTER}\n", this));
LOG_SCOPE("imgRequest::OnDataAvailable");
PRInt32 i = -1;
PRInt32 count = mObservers.Count();
@@ -296,17 +276,13 @@ NS_IMETHODIMP imgRequest::OnDataAvailable(imgIRequest *request, nsISupports *cx,
if (ob) ob->OnDataAvailable(request, cx, frame, rect);
}
PR_LOG(gImgLog, PR_LOG_DEBUG,
("[this=%p] imgRequest::OnDataAvailable {EXIT}\n", this));
return NS_OK;
}
/* void onStopFrame (in imgIRequest request, in nsISupports cx, in gfxIImageFrame frame); */
NS_IMETHODIMP imgRequest::OnStopFrame(imgIRequest *request, nsISupports *cx, gfxIImageFrame *frame)
{
PR_LOG(gImgLog, PR_LOG_DEBUG,
("[this=%p] imgRequest::OnStopFrame {ENTER}\n", this));
LOG_SCOPE("imgRequest::OnStopFrame");
PRInt32 i = -1;
PRInt32 count = mObservers.Count();
@@ -316,17 +292,13 @@ NS_IMETHODIMP imgRequest::OnStopFrame(imgIRequest *request, nsISupports *cx, gfx
if (ob) ob->OnStopFrame(request, cx, frame);
}
PR_LOG(gImgLog, PR_LOG_DEBUG,
("[this=%p] imgRequest::OnStopFrame {EXIT}\n", this));
return NS_OK;
}
/* void onStopContainer (in imgIRequest request, in nsISupports cx, in gfxIImageContainer image); */
NS_IMETHODIMP imgRequest::OnStopContainer(imgIRequest *request, nsISupports *cx, gfxIImageContainer *image)
{
PR_LOG(gImgLog, PR_LOG_DEBUG,
("[this=%p] imgRequest::OnStopContainer {ENTER}\n", this));
LOG_SCOPE("imgRequest::OnStopContainer");
mState |= onStopContainer;
@@ -338,17 +310,13 @@ NS_IMETHODIMP imgRequest::OnStopContainer(imgIRequest *request, nsISupports *cx,
if (ob) ob->OnStopContainer(request, cx, image);
}
PR_LOG(gImgLog, PR_LOG_DEBUG,
("[this=%p] imgRequest::OnStopContainer {EXIT}\n", this));
return NS_OK;
}
/* void onStopDecode (in imgIRequest request, in nsISupports cx, in nsresult status, in wstring statusArg); */
NS_IMETHODIMP imgRequest::OnStopDecode(imgIRequest *request, nsISupports *cx, nsresult status, const PRUnichar *statusArg)
{
PR_LOG(gImgLog, PR_LOG_DEBUG,
("[this=%p] imgRequest::OnStopDecode {ENTER}\n", this));
LOG_SCOPE("imgRequest::OnStopDecode");
mState |= onStopDecode;
@@ -363,9 +331,6 @@ NS_IMETHODIMP imgRequest::OnStopDecode(imgIRequest *request, nsISupports *cx, ns
if (ob) ob->OnStopDecode(request, cx, status, statusArg);
}
PR_LOG(gImgLog, PR_LOG_DEBUG,
("[this=%p] imgRequest::OnStopDecode {EXIT}\n", this));
return NS_OK;
}
@@ -379,13 +344,10 @@ NS_IMETHODIMP imgRequest::OnStopDecode(imgIRequest *request, nsISupports *cx, ns
/* void onStartRequest (in nsIRequest request, in nsISupports ctxt); */
NS_IMETHODIMP imgRequest::OnStartRequest(nsIRequest *aRequest, nsISupports *ctxt)
{
PR_LOG(gImgLog, PR_LOG_DEBUG,
("[this=%p] imgRequest::OnStartRequest\n", this));
LOG_SCOPE("imgRequest::OnStartRequest");
NS_ASSERTION(!mDecoder, "imgRequest::OnStartRequest -- we already have a decoder");
nsCOMPtr<nsIChannel> chan(do_QueryInterface(aRequest));
if (mChannel && (mChannel != chan)) {
@@ -403,8 +365,9 @@ NS_IMETHODIMP imgRequest::OnStartRequest(nsIRequest *aRequest, nsISupports *ctxt
nsresult rv = mChannel->GetContentType(getter_Copies(contentType));
if (NS_FAILED(rv)) {
PR_LOG(gImgLog, PR_LOG_ALWAYS,
(" `-> Error getting content type\n"));
PR_LOG(gImgLog, PR_LOG_ERROR,
("[this=%p] imgRequest::OnStartRequest -- Content type unavailable from the channel\n",
this));
this->Cancel(NS_BINDING_ABORTED);
@@ -423,6 +386,9 @@ NS_IMETHODIMP imgRequest::OnStartRequest(nsIRequest *aRequest, nsISupports *ctxt
mDecoder = do_CreateInstance(conid);
if (!mDecoder) {
PR_LOG(gImgLog, PR_LOG_WARNING,
("[this=%p] imgRequest::OnStartRequest -- Decoder not available\n", this));
// no image decoder for this mimetype :(
this->Cancel(NS_BINDING_ABORTED);
@@ -432,6 +398,7 @@ NS_IMETHODIMP imgRequest::OnStartRequest(nsIRequest *aRequest, nsISupports *ctxt
}
mDecoder->Init(NS_STATIC_CAST(imgIRequest*, this));
return NS_OK;
}

14
mozilla/modules/libpr0n/src/imgRequestProxy.cpp
View File

@@ -40,13 +40,7 @@
#include "nspr.h"
#include "prlog.h"
#if defined(PR_LOGGING)
extern PRLogModuleInfo *gImgLog;
#else
#define gImgLog
#endif
#include "ImageLogging.h"
NS_IMPL_ISUPPORTS3(imgRequestProxy, imgIRequest, imgIDecoderObserver, gfxIImageContainerObserver)
@@ -96,15 +90,11 @@ NS_IMETHODIMP imgRequestProxy::Cancel(nsresult status)
if (mCanceled)
return NS_ERROR_FAILURE;
PR_LOG(gImgLog, PR_LOG_DEBUG,
("[this=%p] imgRequestProxy::Cancel {ENTER}\n", this));
LOG_SCOPE("imgRequestProxy::Cancel");
mCanceled = PR_TRUE;
nsresult rv = NS_REINTERPRET_CAST(imgRequest*, mOwner.get())->RemoveObserver(this, status);
PR_LOG(gImgLog, PR_LOG_DEBUG,
("[this=%p] imgRequestProxy::Cancel {EXIT}\n", this));
return rv;
}