mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:18:48 +00:00
98666e86fe
- Bug 1196021 - Use asyncOpen2 in PackagedAppService r=ckerschb (94301092a0) - Bug 1196021 - Pass requesting channel to PackagedAppService::GetResource r=ckerschb (bcfa9d9d4f) - rearrange Bug 1209658 part 2 (e7f9d4e75f) - Bug 1161625. Use nsIURI, not dom::URL, to create URIs on main thread in fetch code. Also, use the entry settings document's base URI, not the callee document's document URI, as the base. r=nsm (fd824cc408) - Bug 1110476 - Stripped url fragment from Request::GetUrl() by calling either nsIURI::SetRef() or workers::URL::SetHash() in Request's url getter utility methods. Stripped url fragment from Response::GetUrl() by adding the method InternalRequest::StripFragmentAndSetUrl() which calls nsIURI::SetRef(). Added a test in dom/tests/mochitest/fetch/test_request.js for Request::GetUrl(). Removed manual url stripping from dom/cache/TypeUtils.cpp. r=bkelly (a4f394434a) - Bug 1195820 - Request constructor should throw TypeError if URL has credentials or parse fails. r=bkelly (347c65872d) - Bug 1144786: Create ClassifyLocalWithTables (r=gcp,francois) (26c00bc725) - Bug 1180323 - Only look at TP table before cancelling speculative connections. r=gcp (8c762cd347) - Bug 1141352 - add a pairwise allowlist to tracking protection. r=gcp (4ec253bff6) - Bug 1098422 - Change the HTTP cache half-life experiment values. r=jduell (5e39571c88) - Bg 1139014 - Optimize memory allocations in CacheFileMetadata, r=honzab (59a8c4d7eb) - Bug 1177278 - Large OOMs in CacheFileMetadata::WriteMetadata, r=honzab (bfe491ebd1) - Bug 1171724 - Large OOMs in CacheFileMetadata, r=honzab (58a4d81058) - Bug 1122070 - TSan: data race netwerk/cache2/CacheIOThread.cpp:97 DispatchInternal, r=honzab (34240071df) - Bug 1157322 - TSan: data race netwerk/cache2/CacheIOThread.cpp:315 OnDispatchedEvent, r=honzab (66d90f16ae) - Bug 1156974 - mark CacheFileHandle::mIsDoomed as a release/acquire Atomic variable; r=michal (38eb63304d) - Bug 1082735 - Don't use InsertElementSorted in HTTP cache, r=michal (06b3ca3f41) - Bug 1159500 - crash in mozilla::net::CacheIndexIterator::GetNextHash(unsigned char (*)[20]), r=honzab (21a4bf2fdb) - fix namespace (f642fe8df0) - Bug 1132172 - Don't access CacheEntry::mFrecency on non-cache threads. r=michal (68e9cf33a6) - Bug 1139924 - Dooming an unloaded HTTP cache entry by its URL may fail. r=michal (1d259ea5f3)
203 lines
7.4 KiB
C++
203 lines
7.4 KiB
C++
/* 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/. */
|
|
|
|
#ifndef CacheFileMetadata__h__
|
|
#define CacheFileMetadata__h__
|
|
|
|
#include "CacheFileIOManager.h"
|
|
#include "CacheStorageService.h"
|
|
#include "CacheHashUtils.h"
|
|
#include "CacheObserver.h"
|
|
#include "mozilla/Endian.h"
|
|
#include "nsAutoPtr.h"
|
|
#include "nsString.h"
|
|
|
|
class nsICacheEntryMetaDataVisitor;
|
|
|
|
namespace mozilla {
|
|
namespace net {
|
|
|
|
// By multiplying with the current half-life we convert the frecency
|
|
// to time independent of half-life value. The range fits 32bits.
|
|
// When decay time changes on next run of the browser, we convert
|
|
// the frecency value to a correct internal representation again.
|
|
// It might not be 100% accurate, but for the purpose it suffice.
|
|
#define FRECENCY2INT(aFrecency) \
|
|
((uint32_t)((aFrecency) * CacheObserver::HalfLifeSeconds()))
|
|
#define INT2FRECENCY(aInt) \
|
|
((double)(aInt) / (double)CacheObserver::HalfLifeSeconds())
|
|
|
|
|
|
#pragma pack(push)
|
|
#pragma pack(1)
|
|
|
|
class CacheFileMetadataHeader {
|
|
public:
|
|
uint32_t mVersion;
|
|
uint32_t mFetchCount;
|
|
uint32_t mLastFetched;
|
|
uint32_t mLastModified;
|
|
uint32_t mFrecency;
|
|
uint32_t mExpirationTime;
|
|
uint32_t mKeySize;
|
|
|
|
void WriteToBuf(void *aBuf)
|
|
{
|
|
EnsureCorrectClassSize();
|
|
|
|
uint8_t* ptr = static_cast<uint8_t*>(aBuf);
|
|
NetworkEndian::writeUint32(ptr, mVersion); ptr += sizeof(uint32_t);
|
|
NetworkEndian::writeUint32(ptr, mFetchCount); ptr += sizeof(uint32_t);
|
|
NetworkEndian::writeUint32(ptr, mLastFetched); ptr += sizeof(uint32_t);
|
|
NetworkEndian::writeUint32(ptr, mLastModified); ptr += sizeof(uint32_t);
|
|
NetworkEndian::writeUint32(ptr, mFrecency); ptr += sizeof(uint32_t);
|
|
NetworkEndian::writeUint32(ptr, mExpirationTime); ptr += sizeof(uint32_t);
|
|
NetworkEndian::writeUint32(ptr, mKeySize);
|
|
}
|
|
|
|
void ReadFromBuf(const void *aBuf)
|
|
{
|
|
EnsureCorrectClassSize();
|
|
|
|
const uint8_t* ptr = static_cast<const uint8_t*>(aBuf);
|
|
mVersion = BigEndian::readUint32(ptr); ptr += sizeof(uint32_t);
|
|
mFetchCount = BigEndian::readUint32(ptr); ptr += sizeof(uint32_t);
|
|
mLastFetched = BigEndian::readUint32(ptr); ptr += sizeof(uint32_t);
|
|
mLastModified = BigEndian::readUint32(ptr); ptr += sizeof(uint32_t);
|
|
mFrecency = BigEndian::readUint32(ptr); ptr += sizeof(uint32_t);
|
|
mExpirationTime = BigEndian::readUint32(ptr); ptr += sizeof(uint32_t);
|
|
mKeySize = BigEndian::readUint32(ptr);
|
|
}
|
|
|
|
inline void EnsureCorrectClassSize()
|
|
{
|
|
static_assert((sizeof(mVersion) + sizeof(mFetchCount) +
|
|
sizeof(mLastFetched) + sizeof(mLastModified) + sizeof(mFrecency) +
|
|
sizeof(mExpirationTime) + sizeof(mKeySize)) ==
|
|
sizeof(CacheFileMetadataHeader),
|
|
"Unexpected sizeof(CacheFileMetadataHeader)!");
|
|
}
|
|
};
|
|
|
|
#pragma pack(pop)
|
|
|
|
|
|
#define CACHEFILEMETADATALISTENER_IID \
|
|
{ /* a9e36125-3f01-4020-9540-9dafa8d31ba7 */ \
|
|
0xa9e36125, \
|
|
0x3f01, \
|
|
0x4020, \
|
|
{0x95, 0x40, 0x9d, 0xaf, 0xa8, 0xd3, 0x1b, 0xa7} \
|
|
}
|
|
|
|
class CacheFileMetadataListener : public nsISupports
|
|
{
|
|
public:
|
|
NS_DECLARE_STATIC_IID_ACCESSOR(CACHEFILEMETADATALISTENER_IID)
|
|
|
|
NS_IMETHOD OnMetadataRead(nsresult aResult) = 0;
|
|
NS_IMETHOD OnMetadataWritten(nsresult aResult) = 0;
|
|
};
|
|
|
|
NS_DEFINE_STATIC_IID_ACCESSOR(CacheFileMetadataListener,
|
|
CACHEFILEMETADATALISTENER_IID)
|
|
|
|
|
|
class CacheFileMetadata : public CacheFileIOListener
|
|
, public CacheMemoryConsumer
|
|
{
|
|
public:
|
|
NS_DECL_THREADSAFE_ISUPPORTS
|
|
|
|
CacheFileMetadata(CacheFileHandle *aHandle,
|
|
const nsACString &aKey);
|
|
CacheFileMetadata(bool aMemoryOnly,
|
|
const nsACString &aKey);
|
|
CacheFileMetadata();
|
|
|
|
void SetHandle(CacheFileHandle *aHandle);
|
|
|
|
nsresult GetKey(nsACString &_retval);
|
|
|
|
nsresult ReadMetadata(CacheFileMetadataListener *aListener);
|
|
uint32_t CalcMetadataSize(uint32_t aElementsSize, uint32_t aHashCount);
|
|
nsresult WriteMetadata(uint32_t aOffset,
|
|
CacheFileMetadataListener *aListener);
|
|
nsresult SyncReadMetadata(nsIFile *aFile);
|
|
|
|
bool IsAnonymous() { return mAnonymous; }
|
|
bool IsInBrowser() { return mInBrowser; }
|
|
uint32_t AppId() { return mAppId; }
|
|
|
|
const char * GetElement(const char *aKey);
|
|
nsresult SetElement(const char *aKey, const char *aValue);
|
|
nsresult Visit(nsICacheEntryMetaDataVisitor *aVisitor);
|
|
|
|
CacheHash::Hash16_t GetHash(uint32_t aIndex);
|
|
nsresult SetHash(uint32_t aIndex, CacheHash::Hash16_t aHash);
|
|
|
|
nsresult SetExpirationTime(uint32_t aExpirationTime);
|
|
nsresult GetExpirationTime(uint32_t *_retval);
|
|
nsresult SetFrecency(uint32_t aFrecency);
|
|
nsresult GetFrecency(uint32_t *_retval);
|
|
nsresult GetLastModified(uint32_t *_retval);
|
|
nsresult GetLastFetched(uint32_t *_retval);
|
|
nsresult GetFetchCount(uint32_t *_retval);
|
|
// Called by upper layers to indicate the entry this metadata belongs
|
|
// with has been fetched, i.e. delivered to the consumer.
|
|
nsresult OnFetched();
|
|
|
|
int64_t Offset() { return mOffset; }
|
|
uint32_t ElementsSize() { return mElementsSize; }
|
|
void MarkDirty(bool aUpdateLastModified = true);
|
|
bool IsDirty() { return mIsDirty; }
|
|
uint32_t MemoryUsage() { return sizeof(CacheFileMetadata) + mHashArraySize + mBufSize; }
|
|
|
|
NS_IMETHOD OnFileOpened(CacheFileHandle *aHandle, nsresult aResult) override;
|
|
NS_IMETHOD OnDataWritten(CacheFileHandle *aHandle, const char *aBuf,
|
|
nsresult aResult) override;
|
|
NS_IMETHOD OnDataRead(CacheFileHandle *aHandle, char *aBuf, nsresult aResult) override;
|
|
NS_IMETHOD OnFileDoomed(CacheFileHandle *aHandle, nsresult aResult) override;
|
|
NS_IMETHOD OnEOFSet(CacheFileHandle *aHandle, nsresult aResult) override;
|
|
NS_IMETHOD OnFileRenamed(CacheFileHandle *aHandle, nsresult aResult) override;
|
|
|
|
// Memory reporting
|
|
size_t SizeOfExcludingThis(mozilla::MallocSizeOf mallocSizeOf) const;
|
|
size_t SizeOfIncludingThis(mozilla::MallocSizeOf mallocSizeOf) const;
|
|
|
|
private:
|
|
virtual ~CacheFileMetadata();
|
|
|
|
void InitEmptyMetadata();
|
|
nsresult ParseMetadata(uint32_t aMetaOffset, uint32_t aBufOffset, bool aHaveKey);
|
|
nsresult CheckElements(const char *aBuf, uint32_t aSize);
|
|
nsresult EnsureBuffer(uint32_t aSize);
|
|
nsresult ParseKey(const nsACString &aKey);
|
|
|
|
nsRefPtr<CacheFileHandle> mHandle;
|
|
nsCString mKey;
|
|
CacheHash::Hash16_t *mHashArray;
|
|
uint32_t mHashArraySize;
|
|
uint32_t mHashCount;
|
|
int64_t mOffset;
|
|
char *mBuf; // used for parsing, then points
|
|
// to elements
|
|
uint32_t mBufSize;
|
|
char *mWriteBuf;
|
|
CacheFileMetadataHeader mMetaHdr;
|
|
uint32_t mElementsSize;
|
|
bool mIsDirty : 1;
|
|
bool mAnonymous : 1;
|
|
bool mInBrowser : 1;
|
|
bool mAllocExactSize : 1;
|
|
uint32_t mAppId;
|
|
nsCOMPtr<CacheFileMetadataListener> mListener;
|
|
};
|
|
|
|
|
|
} // namespace net
|
|
} // namespace mozilla
|
|
|
|
#endif
|