Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Back out 7f6c38239328 (bug 810151) on suspicion of causing Windows xpcshell failures on a CLOSED TREE

Browse Source
This commit is contained in:
Matt Brubeck 2013-03-06 18:51:12 -08:00
parent 07db62cb46
commit b7dca43e54
2 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
modules/libjar/nsZipArchive.cpp
View File

@ -30,7 +30,6 @@
#define ZIP_ARENABLOCKSIZE (1*1024) #define ZIP_ARENABLOCKSIZE (1*1024)
#ifdef XP_UNIX #ifdef XP_UNIX
#include <sys/mman.h>
#include <sys/types.h> #include <sys/types.h>
#include <sys/stat.h> #include <sys/stat.h>
#include <limits.h> #include <limits.h>
@ -157,9 +156,6 @@ nsresult gZlibInit(z_stream *zs)
nsZipHandle::nsZipHandle() nsZipHandle::nsZipHandle()
: mFileData(nullptr) : mFileData(nullptr)
, mLen(0) , mLen(0)
#if defined(XP_WIN)
, mFd(nullptr)
#endif
, mMap(nullptr) , mMap(nullptr)
, mRefCnt(0) , mRefCnt(0)
{ {
@ -172,11 +168,7 @@ NS_IMPL_THREADSAFE_RELEASE(nsZipHandle)
nsresult nsZipHandle::Init(nsIFile *file, nsZipHandle **ret) nsresult nsZipHandle::Init(nsIFile *file, nsZipHandle **ret)
{ {
mozilla::AutoFDClose fd; mozilla::AutoFDClose fd;
int32_t flags = PR_RDONLY; nsresult rv = file->OpenNSPRFileDesc(PR_RDONLY, 0000, &fd.rwget());
#if defined(XP_WIN)
flags |= nsIFile::OS_READAHEAD;
#endif
nsresult rv = file->OpenNSPRFileDesc(flags, 0000, &fd.rwget());
if (NS_FAILED(rv)) if (NS_FAILED(rv))
return rv; return rv;
@ -202,9 +194,6 @@ nsresult nsZipHandle::Init(nsIFile *file, nsZipHandle **ret)
return NS_ERROR_OUT_OF_MEMORY; return NS_ERROR_OUT_OF_MEMORY;
} }
#if defined(XP_WIN)
handle->mFd = fd.forget();
#endif
handle->mMap = map; handle->mMap = map;
handle->mFile.Init(file); handle->mFile.Init(file);
handle->mLen = (uint32_t) size; handle->mLen = (uint32_t) size;
@ -242,11 +231,6 @@ int64_t nsZipHandle::SizeOfMapping()
nsZipHandle::~nsZipHandle() nsZipHandle::~nsZipHandle()
{ {
#if defined(XP_WIN)
if (mFd) {
PR_Close(mFd);
}
#endif
if (mMap) { if (mMap) {
PR_MemUnmap((void *)mFileData, mLen); PR_MemUnmap((void *)mFileData, mLen);
PR_CloseFileMap(mMap); PR_CloseFileMap(mMap);
@ -585,15 +569,6 @@ MOZ_WIN_MEM_TRY_BEGIN
uint32_t centralOffset = 4; uint32_t centralOffset = 4;
if (mFd->mLen > ZIPCENTRAL_SIZE && xtolong(startp + centralOffset) == CENTRALSIG) { if (mFd->mLen > ZIPCENTRAL_SIZE && xtolong(startp + centralOffset) == CENTRALSIG) {
// Success means optimized jar layout from bug 559961 is in effect // Success means optimized jar layout from bug 559961 is in effect
uint32_t readaheadLength = xtolong(startp);
if (readaheadLength) {
#if defined(XP_UNIX)
madvise(const_cast<uint8_t*>(startp), readaheadLength, MADV_WILLNEED);
#elif defined(XP_WIN)
HANDLE hFile = (HANDLE) PR_FileDesc2NativeHandle(mFd->mFd);
mozilla::ReadAhead(hFile, 0, readaheadLength);
#endif
}
} else { } else {
for (buf = endp - ZIPEND_SIZE; buf > startp; buf--) for (buf = endp - ZIPEND_SIZE; buf > startp; buf--)
{ {

3
modules/libjar/nsZipArchive.h
View File

@ -392,9 +392,6 @@ private:
nsZipHandle(); nsZipHandle();
~nsZipHandle(); ~nsZipHandle();
#if defined(XP_WIN)
PRFileDesc * mFd; /* nspr file descriptor */
#endif
PRFileMap * mMap; /* nspr datastructure for mmap */ PRFileMap * mMap; /* nspr datastructure for mmap */
nsAutoPtr<nsZipItemPtr<uint8_t> > mBuf; nsAutoPtr<nsZipItemPtr<uint8_t> > mBuf;
nsrefcnt mRefCnt; /* ref count */ nsrefcnt mRefCnt; /* ref count */