2014-06-30 19:39:45 +04:00
|
|
|
/* -*- 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
|
2012-05-21 15:12:37 +04:00
|
|
|
* 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/. */
|
2013-03-04 05:56:03 +04:00
|
|
|
|
2018-02-02 17:25:10 +03:00
|
|
|
#include "mozilla/FileUtils.h"
|
|
|
|
|
2013-03-27 19:19:09 +04:00
|
|
|
#include <errno.h>
|
|
|
|
#include <stdio.h>
|
2019-04-13 21:46:18 +03:00
|
|
|
#include <inttypes.h>
|
2013-03-27 19:19:09 +04:00
|
|
|
|
2013-03-04 05:56:03 +04:00
|
|
|
#include "nscore.h"
|
|
|
|
#include "private/pprio.h"
|
2018-02-02 17:25:10 +03:00
|
|
|
#include "prmem.h"
|
2013-03-27 19:19:09 +04:00
|
|
|
#include "mozilla/Assertions.h"
|
2019-04-13 21:46:18 +03:00
|
|
|
#include "mozilla/MemUtils.h"
|
2013-03-04 05:56:03 +04:00
|
|
|
|
|
|
|
#if defined(XP_MACOSX)
|
|
|
|
# include <fcntl.h>
|
|
|
|
# include <unistd.h>
|
|
|
|
# include <mach/machine.h>
|
|
|
|
# include <mach-o/fat.h>
|
|
|
|
# include <mach-o/loader.h>
|
|
|
|
# include <sys/mman.h>
|
|
|
|
# include <sys/stat.h>
|
|
|
|
# include <limits.h>
|
|
|
|
#elif defined(XP_UNIX)
|
2010-09-17 00:21:12 +04:00
|
|
|
# include <fcntl.h>
|
|
|
|
# include <unistd.h>
|
2013-03-04 05:56:03 +04:00
|
|
|
# if defined(LINUX)
|
|
|
|
# include <elf.h>
|
|
|
|
# endif
|
2010-09-17 00:21:12 +04:00
|
|
|
# include <sys/types.h>
|
|
|
|
# include <sys/stat.h>
|
|
|
|
#elif defined(XP_WIN)
|
2019-04-13 21:46:18 +03:00
|
|
|
# include <nsWindowsHelpers.h>
|
2019-05-29 13:13:28 +03:00
|
|
|
# include <mozilla/NativeNt.h>
|
2019-04-13 21:46:18 +03:00
|
|
|
# include <mozilla/ScopeExit.h>
|
2010-09-17 00:21:12 +04:00
|
|
|
#endif
|
|
|
|
|
2013-03-04 05:56:03 +04:00
|
|
|
// Functions that are not to be used in standalone glue must be implemented
|
|
|
|
// within this #if block
|
2017-02-27 19:41:52 +03:00
|
|
|
#if defined(MOZILLA_INTERNAL_API)
|
|
|
|
|
|
|
|
# include "nsString.h"
|
2010-09-17 00:21:12 +04:00
|
|
|
|
2014-06-27 05:35:39 +04:00
|
|
|
bool mozilla::fallocate(PRFileDesc* aFD, int64_t aLength) {
|
2010-09-17 00:21:12 +04:00
|
|
|
# if defined(HAVE_POSIX_FALLOCATE)
|
|
|
|
return posix_fallocate(PR_FileDesc2NativeHandle(aFD), 0, aLength) == 0;
|
|
|
|
# elif defined(XP_WIN)
|
2012-08-22 19:56:38 +04:00
|
|
|
int64_t oldpos = PR_Seek64(aFD, 0, PR_SEEK_CUR);
|
2014-06-27 05:35:39 +04:00
|
|
|
if (oldpos == -1) {
|
2010-11-24 18:42:30 +03:00
|
|
|
return false;
|
2014-06-27 05:35:39 +04:00
|
|
|
}
|
2010-11-24 18:42:30 +03:00
|
|
|
|
2014-06-27 05:35:39 +04:00
|
|
|
if (PR_Seek64(aFD, aLength, PR_SEEK_SET) != aLength) {
|
2010-11-24 18:42:30 +03:00
|
|
|
return false;
|
2014-06-27 05:35:39 +04:00
|
|
|
}
|
2010-11-24 18:42:30 +03:00
|
|
|
|
|
|
|
bool retval = (0 != SetEndOfFile((HANDLE)PR_FileDesc2NativeHandle(aFD)));
|
|
|
|
|
|
|
|
PR_Seek64(aFD, oldpos, PR_SEEK_SET);
|
|
|
|
return retval;
|
2010-09-17 00:21:12 +04:00
|
|
|
# elif defined(XP_MACOSX)
|
|
|
|
int fd = PR_FileDesc2NativeHandle(aFD);
|
|
|
|
fstore_t store = {F_ALLOCATECONTIG, F_PEOFPOSMODE, 0, aLength};
|
|
|
|
// Try to get a continous chunk of disk space
|
|
|
|
int ret = fcntl(fd, F_PREALLOCATE, &store);
|
2014-06-27 05:35:39 +04:00
|
|
|
if (ret == -1) {
|
2010-09-17 00:21:12 +04:00
|
|
|
// OK, perhaps we are too fragmented, allocate non-continuous
|
|
|
|
store.fst_flags = F_ALLOCATEALL;
|
|
|
|
ret = fcntl(fd, F_PREALLOCATE, &store);
|
2014-06-27 05:35:39 +04:00
|
|
|
if (ret == -1) {
|
2010-09-17 00:21:12 +04:00
|
|
|
return false;
|
2014-06-27 05:35:39 +04:00
|
|
|
}
|
2010-09-17 00:21:12 +04:00
|
|
|
}
|
2014-06-27 05:35:39 +04:00
|
|
|
return ftruncate(fd, aLength) == 0;
|
2010-09-17 00:21:12 +04:00
|
|
|
# elif defined(XP_UNIX)
|
|
|
|
// The following is copied from fcntlSizeHint in sqlite
|
|
|
|
/* If the OS does not have posix_fallocate(), fake it. First use
|
|
|
|
** ftruncate() to set the file size, then write a single byte to
|
|
|
|
** the last byte in each block within the extended region. This
|
|
|
|
** is the same technique used by glibc to implement posix_fallocate()
|
|
|
|
** on systems that do not have a real fallocate() system call.
|
|
|
|
*/
|
2012-08-22 19:56:38 +04:00
|
|
|
int64_t oldpos = PR_Seek64(aFD, 0, PR_SEEK_CUR);
|
2014-06-27 05:35:39 +04:00
|
|
|
if (oldpos == -1) {
|
2010-11-24 18:42:30 +03:00
|
|
|
return false;
|
2014-06-27 05:35:39 +04:00
|
|
|
}
|
2010-11-24 18:42:30 +03:00
|
|
|
|
2010-09-17 00:21:12 +04:00
|
|
|
struct stat buf;
|
|
|
|
int fd = PR_FileDesc2NativeHandle(aFD);
|
2014-06-27 05:35:39 +04:00
|
|
|
if (fstat(fd, &buf)) {
|
2010-09-17 00:21:12 +04:00
|
|
|
return false;
|
2014-06-27 05:35:39 +04:00
|
|
|
}
|
2010-09-17 00:21:12 +04:00
|
|
|
|
2014-06-27 05:35:39 +04:00
|
|
|
if (buf.st_size >= aLength) {
|
2010-09-17 00:21:12 +04:00
|
|
|
return false;
|
2014-06-27 05:35:39 +04:00
|
|
|
}
|
2010-09-17 00:21:12 +04:00
|
|
|
|
|
|
|
const int nBlk = buf.st_blksize;
|
|
|
|
|
2014-06-27 05:35:39 +04:00
|
|
|
if (!nBlk) {
|
2010-09-17 00:21:12 +04:00
|
|
|
return false;
|
2014-06-27 05:35:39 +04:00
|
|
|
}
|
2010-09-17 00:21:12 +04:00
|
|
|
|
2014-06-27 05:35:39 +04:00
|
|
|
if (ftruncate(fd, aLength)) {
|
2010-09-17 00:21:12 +04:00
|
|
|
return false;
|
2014-06-27 05:35:39 +04:00
|
|
|
}
|
2010-11-24 18:42:30 +03:00
|
|
|
|
2010-09-17 00:21:12 +04:00
|
|
|
int nWrite; // Return value from write()
|
2012-08-22 19:56:38 +04:00
|
|
|
int64_t iWrite = ((buf.st_size + 2 * nBlk - 1) / nBlk) * nBlk -
|
|
|
|
1; // Next offset to write to
|
2012-09-17 15:27:24 +04:00
|
|
|
while (iWrite < aLength) {
|
2010-09-17 00:21:12 +04:00
|
|
|
nWrite = 0;
|
2014-06-27 05:35:39 +04:00
|
|
|
if (PR_Seek64(aFD, iWrite, PR_SEEK_SET) == iWrite) {
|
2010-09-17 00:21:12 +04:00
|
|
|
nWrite = PR_Write(aFD, "", 1);
|
2014-06-27 05:35:39 +04:00
|
|
|
}
|
|
|
|
if (nWrite != 1) {
|
|
|
|
break;
|
|
|
|
}
|
2010-09-17 00:21:12 +04:00
|
|
|
iWrite += nBlk;
|
2012-09-17 15:27:24 +04:00
|
|
|
}
|
2010-11-24 18:42:30 +03:00
|
|
|
|
|
|
|
PR_Seek64(aFD, oldpos, PR_SEEK_SET);
|
2010-09-17 00:21:12 +04:00
|
|
|
return nWrite == 1;
|
|
|
|
# endif
|
|
|
|
return false;
|
|
|
|
}
|
2013-03-04 05:56:03 +04:00
|
|
|
|
|
|
|
void mozilla::ReadAheadLib(nsIFile* aFile) {
|
|
|
|
# if defined(XP_WIN)
|
|
|
|
nsAutoString path;
|
|
|
|
if (!aFile || NS_FAILED(aFile->GetPath(path))) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
ReadAheadLib(path.get());
|
|
|
|
# elif defined(LINUX) && !defined(ANDROID) || defined(XP_MACOSX)
|
|
|
|
nsAutoCString nativePath;
|
|
|
|
if (!aFile || NS_FAILED(aFile->GetNativePath(nativePath))) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
ReadAheadLib(nativePath.get());
|
|
|
|
# endif
|
|
|
|
}
|
|
|
|
|
|
|
|
void mozilla::ReadAheadFile(nsIFile* aFile, const size_t aOffset,
|
|
|
|
const size_t aCount, mozilla::filedesc_t* aOutFd) {
|
|
|
|
# if defined(XP_WIN)
|
|
|
|
nsAutoString path;
|
|
|
|
if (!aFile || NS_FAILED(aFile->GetPath(path))) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
ReadAheadFile(path.get(), aOffset, aCount, aOutFd);
|
|
|
|
# elif defined(LINUX) && !defined(ANDROID) || defined(XP_MACOSX)
|
|
|
|
nsAutoCString nativePath;
|
|
|
|
if (!aFile || NS_FAILED(aFile->GetNativePath(nativePath))) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
ReadAheadFile(nativePath.get(), aOffset, aCount, aOutFd);
|
|
|
|
# endif
|
|
|
|
}
|
|
|
|
|
2018-02-02 17:25:10 +03:00
|
|
|
mozilla::PathString mozilla::GetLibraryName(mozilla::pathstr_t aDirectory,
|
|
|
|
const char* aLib) {
|
|
|
|
# ifdef XP_WIN
|
|
|
|
nsAutoString fullName;
|
|
|
|
if (aDirectory) {
|
|
|
|
fullName.Assign(aDirectory);
|
|
|
|
fullName.Append('\\');
|
|
|
|
}
|
2018-07-06 10:44:43 +03:00
|
|
|
AppendUTF8toUTF16(MakeStringSpan(aLib), fullName);
|
2018-02-02 17:25:10 +03:00
|
|
|
if (!strstr(aLib, ".dll")) {
|
|
|
|
fullName.AppendLiteral(".dll");
|
|
|
|
}
|
Bug 1489944 - Fixed some std::move warnings - r=froydnj
> dom/media/gmp/CDMStorageIdProvider.cpp(63,10): warning:
> local variable 'storageId' will be copied despite being returned by name [-Wreturn-std-move]
nsAutoCString -> nsCString, will add std::move().
> layout/painting/DisplayItemClip.cpp(581,10): warning:
> local variable 'str' will be copied despite being returned by name [-Wreturn-std-move]
nsAutoCString -> nsCString, will add std::move().
> layout/painting/DisplayItemClipChain.cpp(88,10): warning:
> local variable 'str' will be copied despite being returned by name [-Wreturn-std-move]
nsAutoCString -> nsCString, will add std::move().
> layout/painting/nsDisplayList.cpp(179,10): warning:
> local variable 'str' will be copied despite being returned by name [-Wreturn-std-move]
nsAutoCString -> nsCString, will add std::move().
> gfx/thebes/gfxWindowsPlatform.cpp(454,10): warning:
> moving a local object in a return statement prevents copy elision [-Wpessimizing-move]
Will remove std::move().
> gfx/thebes/gfxFontEntry.cpp(245,20): warning:
> local variable 'name' will be copied despite being returned by name [-Wreturn-std-move]
nsAutoCString -> nsCString, will add std::move().
> netwerk/cookie/nsCookieService.cpp(4460,10): warning:
> local variable 'path' will be copied despite being returned by name [-Wreturn-std-move]
GetPathFromURI() result is stored in an nsAutoCString, so it might as well return that type.
> toolkit/components/extensions/WebExtensionPolicy.cpp(462,12): warning:
> local variable 'result' will be copied despite being returned by name [-Wreturn-std-move]
> toolkit/components/extensions/WebExtensionPolicy.cpp(475,10): warning:
> local variable 'result' will be copied despite being returned by name [-Wreturn-std-move]
`result` may be empty or may be arbitrarily long, so I'll use nsCString inside the function.
> toolkit/xre/CmdLineAndEnvUtils.h(349,10): warning:
> moving a local object in a return statement prevents copy elision [-Wpessimizing-move]
Returning an UniquePtr, will remove std::move().
Also will `return s` instead of `return nullptr` when `(!s)`, to avoid extra construction which could also prevent elision (not entirely sure, but it's at least not worse!); and it's clearer that the two `return`s return the same already-constructed on-stack object.
> tools/profiler/core/shared-libraries-win32.cc(111,10): warning:
> local variable 'version' will be copied despite being returned by name [-Wreturn-std-move]
nsPrintfCString -> nsCString, will add std::move().
> xpcom/glue/FileUtils.cpp(179,10): warning:
> local variable 'fullName' will be copied despite being returned by name [-Wreturn-std-move]
> xpcom/glue/FileUtils.cpp(209,10): warning:
> local variable 'path' will be copied despite being returned by name [-Wreturn-std-move]
nsAuto{,C}String -> ns{,C}String, will add std::move().
This allowed removals of 'AllowCompilerWarnings' from layout/painting,
netwerk/cookie, and toolkit/components/extensions.
Differential Revision: https://phabricator.services.mozilla.com/D5425
--HG--
extra : moz-landing-system : lando
2018-09-10 18:51:48 +03:00
|
|
|
return std::move(fullName);
|
2018-02-02 17:25:10 +03:00
|
|
|
# else
|
|
|
|
char* temp = PR_GetLibraryName(aDirectory, aLib);
|
|
|
|
if (!temp) {
|
|
|
|
return EmptyCString();
|
|
|
|
}
|
|
|
|
nsAutoCString libname(temp);
|
|
|
|
PR_FreeLibraryName(temp);
|
Bug 1489944 - Fixed some std::move warnings - r=froydnj
> dom/media/gmp/CDMStorageIdProvider.cpp(63,10): warning:
> local variable 'storageId' will be copied despite being returned by name [-Wreturn-std-move]
nsAutoCString -> nsCString, will add std::move().
> layout/painting/DisplayItemClip.cpp(581,10): warning:
> local variable 'str' will be copied despite being returned by name [-Wreturn-std-move]
nsAutoCString -> nsCString, will add std::move().
> layout/painting/DisplayItemClipChain.cpp(88,10): warning:
> local variable 'str' will be copied despite being returned by name [-Wreturn-std-move]
nsAutoCString -> nsCString, will add std::move().
> layout/painting/nsDisplayList.cpp(179,10): warning:
> local variable 'str' will be copied despite being returned by name [-Wreturn-std-move]
nsAutoCString -> nsCString, will add std::move().
> gfx/thebes/gfxWindowsPlatform.cpp(454,10): warning:
> moving a local object in a return statement prevents copy elision [-Wpessimizing-move]
Will remove std::move().
> gfx/thebes/gfxFontEntry.cpp(245,20): warning:
> local variable 'name' will be copied despite being returned by name [-Wreturn-std-move]
nsAutoCString -> nsCString, will add std::move().
> netwerk/cookie/nsCookieService.cpp(4460,10): warning:
> local variable 'path' will be copied despite being returned by name [-Wreturn-std-move]
GetPathFromURI() result is stored in an nsAutoCString, so it might as well return that type.
> toolkit/components/extensions/WebExtensionPolicy.cpp(462,12): warning:
> local variable 'result' will be copied despite being returned by name [-Wreturn-std-move]
> toolkit/components/extensions/WebExtensionPolicy.cpp(475,10): warning:
> local variable 'result' will be copied despite being returned by name [-Wreturn-std-move]
`result` may be empty or may be arbitrarily long, so I'll use nsCString inside the function.
> toolkit/xre/CmdLineAndEnvUtils.h(349,10): warning:
> moving a local object in a return statement prevents copy elision [-Wpessimizing-move]
Returning an UniquePtr, will remove std::move().
Also will `return s` instead of `return nullptr` when `(!s)`, to avoid extra construction which could also prevent elision (not entirely sure, but it's at least not worse!); and it's clearer that the two `return`s return the same already-constructed on-stack object.
> tools/profiler/core/shared-libraries-win32.cc(111,10): warning:
> local variable 'version' will be copied despite being returned by name [-Wreturn-std-move]
nsPrintfCString -> nsCString, will add std::move().
> xpcom/glue/FileUtils.cpp(179,10): warning:
> local variable 'fullName' will be copied despite being returned by name [-Wreturn-std-move]
> xpcom/glue/FileUtils.cpp(209,10): warning:
> local variable 'path' will be copied despite being returned by name [-Wreturn-std-move]
nsAuto{,C}String -> ns{,C}String, will add std::move().
This allowed removals of 'AllowCompilerWarnings' from layout/painting,
netwerk/cookie, and toolkit/components/extensions.
Differential Revision: https://phabricator.services.mozilla.com/D5425
--HG--
extra : moz-landing-system : lando
2018-09-10 18:51:48 +03:00
|
|
|
return std::move(libname);
|
2018-02-02 17:25:10 +03:00
|
|
|
# endif
|
|
|
|
}
|
|
|
|
|
|
|
|
mozilla::PathString mozilla::GetLibraryFilePathname(mozilla::pathstr_t aName,
|
|
|
|
PRFuncPtr aAddr) {
|
|
|
|
# ifdef XP_WIN
|
|
|
|
HMODULE handle = GetModuleHandleW(char16ptr_t(aName));
|
|
|
|
if (!handle) {
|
|
|
|
return EmptyString();
|
|
|
|
}
|
|
|
|
|
|
|
|
nsAutoString path;
|
|
|
|
path.SetLength(MAX_PATH);
|
|
|
|
DWORD len = GetModuleFileNameW(handle, char16ptr_t(path.BeginWriting()),
|
|
|
|
path.Length());
|
|
|
|
if (!len) {
|
|
|
|
return EmptyString();
|
|
|
|
}
|
|
|
|
|
|
|
|
path.SetLength(len);
|
Bug 1489944 - Fixed some std::move warnings - r=froydnj
> dom/media/gmp/CDMStorageIdProvider.cpp(63,10): warning:
> local variable 'storageId' will be copied despite being returned by name [-Wreturn-std-move]
nsAutoCString -> nsCString, will add std::move().
> layout/painting/DisplayItemClip.cpp(581,10): warning:
> local variable 'str' will be copied despite being returned by name [-Wreturn-std-move]
nsAutoCString -> nsCString, will add std::move().
> layout/painting/DisplayItemClipChain.cpp(88,10): warning:
> local variable 'str' will be copied despite being returned by name [-Wreturn-std-move]
nsAutoCString -> nsCString, will add std::move().
> layout/painting/nsDisplayList.cpp(179,10): warning:
> local variable 'str' will be copied despite being returned by name [-Wreturn-std-move]
nsAutoCString -> nsCString, will add std::move().
> gfx/thebes/gfxWindowsPlatform.cpp(454,10): warning:
> moving a local object in a return statement prevents copy elision [-Wpessimizing-move]
Will remove std::move().
> gfx/thebes/gfxFontEntry.cpp(245,20): warning:
> local variable 'name' will be copied despite being returned by name [-Wreturn-std-move]
nsAutoCString -> nsCString, will add std::move().
> netwerk/cookie/nsCookieService.cpp(4460,10): warning:
> local variable 'path' will be copied despite being returned by name [-Wreturn-std-move]
GetPathFromURI() result is stored in an nsAutoCString, so it might as well return that type.
> toolkit/components/extensions/WebExtensionPolicy.cpp(462,12): warning:
> local variable 'result' will be copied despite being returned by name [-Wreturn-std-move]
> toolkit/components/extensions/WebExtensionPolicy.cpp(475,10): warning:
> local variable 'result' will be copied despite being returned by name [-Wreturn-std-move]
`result` may be empty or may be arbitrarily long, so I'll use nsCString inside the function.
> toolkit/xre/CmdLineAndEnvUtils.h(349,10): warning:
> moving a local object in a return statement prevents copy elision [-Wpessimizing-move]
Returning an UniquePtr, will remove std::move().
Also will `return s` instead of `return nullptr` when `(!s)`, to avoid extra construction which could also prevent elision (not entirely sure, but it's at least not worse!); and it's clearer that the two `return`s return the same already-constructed on-stack object.
> tools/profiler/core/shared-libraries-win32.cc(111,10): warning:
> local variable 'version' will be copied despite being returned by name [-Wreturn-std-move]
nsPrintfCString -> nsCString, will add std::move().
> xpcom/glue/FileUtils.cpp(179,10): warning:
> local variable 'fullName' will be copied despite being returned by name [-Wreturn-std-move]
> xpcom/glue/FileUtils.cpp(209,10): warning:
> local variable 'path' will be copied despite being returned by name [-Wreturn-std-move]
nsAuto{,C}String -> ns{,C}String, will add std::move().
This allowed removals of 'AllowCompilerWarnings' from layout/painting,
netwerk/cookie, and toolkit/components/extensions.
Differential Revision: https://phabricator.services.mozilla.com/D5425
--HG--
extra : moz-landing-system : lando
2018-09-10 18:51:48 +03:00
|
|
|
return std::move(path);
|
2018-02-02 17:25:10 +03:00
|
|
|
# else
|
|
|
|
char* temp = PR_GetLibraryFilePathname(aName, aAddr);
|
|
|
|
if (!temp) {
|
|
|
|
return EmptyCString();
|
|
|
|
}
|
|
|
|
nsAutoCString path(temp);
|
|
|
|
PR_Free(temp); // PR_GetLibraryFilePathname() uses PR_Malloc().
|
Bug 1489944 - Fixed some std::move warnings - r=froydnj
> dom/media/gmp/CDMStorageIdProvider.cpp(63,10): warning:
> local variable 'storageId' will be copied despite being returned by name [-Wreturn-std-move]
nsAutoCString -> nsCString, will add std::move().
> layout/painting/DisplayItemClip.cpp(581,10): warning:
> local variable 'str' will be copied despite being returned by name [-Wreturn-std-move]
nsAutoCString -> nsCString, will add std::move().
> layout/painting/DisplayItemClipChain.cpp(88,10): warning:
> local variable 'str' will be copied despite being returned by name [-Wreturn-std-move]
nsAutoCString -> nsCString, will add std::move().
> layout/painting/nsDisplayList.cpp(179,10): warning:
> local variable 'str' will be copied despite being returned by name [-Wreturn-std-move]
nsAutoCString -> nsCString, will add std::move().
> gfx/thebes/gfxWindowsPlatform.cpp(454,10): warning:
> moving a local object in a return statement prevents copy elision [-Wpessimizing-move]
Will remove std::move().
> gfx/thebes/gfxFontEntry.cpp(245,20): warning:
> local variable 'name' will be copied despite being returned by name [-Wreturn-std-move]
nsAutoCString -> nsCString, will add std::move().
> netwerk/cookie/nsCookieService.cpp(4460,10): warning:
> local variable 'path' will be copied despite being returned by name [-Wreturn-std-move]
GetPathFromURI() result is stored in an nsAutoCString, so it might as well return that type.
> toolkit/components/extensions/WebExtensionPolicy.cpp(462,12): warning:
> local variable 'result' will be copied despite being returned by name [-Wreturn-std-move]
> toolkit/components/extensions/WebExtensionPolicy.cpp(475,10): warning:
> local variable 'result' will be copied despite being returned by name [-Wreturn-std-move]
`result` may be empty or may be arbitrarily long, so I'll use nsCString inside the function.
> toolkit/xre/CmdLineAndEnvUtils.h(349,10): warning:
> moving a local object in a return statement prevents copy elision [-Wpessimizing-move]
Returning an UniquePtr, will remove std::move().
Also will `return s` instead of `return nullptr` when `(!s)`, to avoid extra construction which could also prevent elision (not entirely sure, but it's at least not worse!); and it's clearer that the two `return`s return the same already-constructed on-stack object.
> tools/profiler/core/shared-libraries-win32.cc(111,10): warning:
> local variable 'version' will be copied despite being returned by name [-Wreturn-std-move]
nsPrintfCString -> nsCString, will add std::move().
> xpcom/glue/FileUtils.cpp(179,10): warning:
> local variable 'fullName' will be copied despite being returned by name [-Wreturn-std-move]
> xpcom/glue/FileUtils.cpp(209,10): warning:
> local variable 'path' will be copied despite being returned by name [-Wreturn-std-move]
nsAuto{,C}String -> ns{,C}String, will add std::move().
This allowed removals of 'AllowCompilerWarnings' from layout/painting,
netwerk/cookie, and toolkit/components/extensions.
Differential Revision: https://phabricator.services.mozilla.com/D5425
--HG--
extra : moz-landing-system : lando
2018-09-10 18:51:48 +03:00
|
|
|
return std::move(path);
|
2018-02-02 17:25:10 +03:00
|
|
|
# endif
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif // defined(MOZILLA_INTERNAL_API)
|
2013-03-04 05:56:03 +04:00
|
|
|
|
|
|
|
#if defined(LINUX) && !defined(ANDROID)
|
|
|
|
|
|
|
|
static const unsigned int bufsize = 4096;
|
|
|
|
|
2013-10-16 19:14:05 +04:00
|
|
|
# ifdef __LP64__
|
2013-03-04 05:56:03 +04:00
|
|
|
typedef Elf64_Ehdr Elf_Ehdr;
|
|
|
|
typedef Elf64_Phdr Elf_Phdr;
|
|
|
|
static const unsigned char ELFCLASS = ELFCLASS64;
|
|
|
|
typedef Elf64_Off Elf_Off;
|
|
|
|
# else
|
|
|
|
typedef Elf32_Ehdr Elf_Ehdr;
|
|
|
|
typedef Elf32_Phdr Elf_Phdr;
|
|
|
|
static const unsigned char ELFCLASS = ELFCLASS32;
|
|
|
|
typedef Elf32_Off Elf_Off;
|
|
|
|
# endif
|
|
|
|
|
|
|
|
#elif defined(XP_MACOSX)
|
|
|
|
|
|
|
|
# if defined(__i386__)
|
|
|
|
static const uint32_t CPU_TYPE = CPU_TYPE_X86;
|
|
|
|
# elif defined(__x86_64__)
|
|
|
|
static const uint32_t CPU_TYPE = CPU_TYPE_X86_64;
|
|
|
|
# elif defined(__ppc__)
|
|
|
|
static const uint32_t CPU_TYPE = CPU_TYPE_POWERPC;
|
|
|
|
# elif defined(__ppc64__)
|
|
|
|
static const uint32_t CPU_TYPE = CPU_TYPE_POWERPC64;
|
|
|
|
# else
|
|
|
|
# error Unsupported CPU type
|
|
|
|
# endif
|
2019-01-18 12:16:18 +03:00
|
|
|
|
2013-10-10 01:15:53 +04:00
|
|
|
# ifdef __LP64__
|
2013-03-04 05:56:03 +04:00
|
|
|
# undef LC_SEGMENT
|
|
|
|
# define LC_SEGMENT LC_SEGMENT_64
|
|
|
|
# undef MH_MAGIC
|
|
|
|
# define MH_MAGIC MH_MAGIC_64
|
|
|
|
# define cpu_mach_header mach_header_64
|
|
|
|
# define segment_command segment_command_64
|
|
|
|
# else
|
|
|
|
# define cpu_mach_header mach_header
|
|
|
|
# endif
|
|
|
|
|
|
|
|
class ScopedMMap {
|
|
|
|
public:
|
2014-07-30 04:43:56 +04:00
|
|
|
explicit ScopedMMap(const char* aFilePath) : buf(nullptr) {
|
2013-03-04 05:56:03 +04:00
|
|
|
fd = open(aFilePath, O_RDONLY);
|
|
|
|
if (fd < 0) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
struct stat st;
|
|
|
|
if (fstat(fd, &st) < 0) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
size = st.st_size;
|
2014-06-27 05:35:39 +04:00
|
|
|
buf = (char*)mmap(nullptr, size, PROT_READ, MAP_PRIVATE, fd, 0);
|
2013-03-04 05:56:03 +04:00
|
|
|
}
|
|
|
|
~ScopedMMap() {
|
|
|
|
if (buf) {
|
|
|
|
munmap(buf, size);
|
|
|
|
}
|
|
|
|
if (fd >= 0) {
|
|
|
|
close(fd);
|
|
|
|
}
|
|
|
|
}
|
2014-06-27 05:35:39 +04:00
|
|
|
operator char*() { return buf; }
|
2013-03-04 05:56:03 +04:00
|
|
|
int getFd() { return fd; }
|
2018-11-30 13:46:48 +03:00
|
|
|
|
2013-03-04 05:56:03 +04:00
|
|
|
private:
|
|
|
|
int fd;
|
2014-06-27 05:35:39 +04:00
|
|
|
char* buf;
|
2013-03-04 05:56:03 +04:00
|
|
|
size_t size;
|
|
|
|
};
|
|
|
|
#endif
|
|
|
|
|
|
|
|
void mozilla::ReadAhead(mozilla::filedesc_t aFd, const size_t aOffset,
|
|
|
|
const size_t aCount) {
|
|
|
|
#if defined(XP_WIN)
|
|
|
|
|
|
|
|
LARGE_INTEGER fpOriginal;
|
|
|
|
LARGE_INTEGER fpOffset;
|
|
|
|
# if defined(HAVE_LONG_LONG)
|
|
|
|
fpOffset.QuadPart = 0;
|
|
|
|
# else
|
|
|
|
fpOffset.u.LowPart = 0;
|
|
|
|
fpOffset.u.HighPart = 0;
|
|
|
|
# endif
|
|
|
|
|
|
|
|
// Get the current file pointer so that we can restore it. This isn't
|
|
|
|
// really necessary other than to provide the same semantics regarding the
|
|
|
|
// file pointer that other platforms do
|
|
|
|
if (!SetFilePointerEx(aFd, fpOffset, &fpOriginal, FILE_CURRENT)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (aOffset) {
|
|
|
|
# if defined(HAVE_LONG_LONG)
|
|
|
|
fpOffset.QuadPart = static_cast<LONGLONG>(aOffset);
|
|
|
|
# else
|
|
|
|
fpOffset.u.LowPart = aOffset;
|
|
|
|
fpOffset.u.HighPart = 0;
|
|
|
|
# endif
|
|
|
|
|
|
|
|
if (!SetFilePointerEx(aFd, fpOffset, nullptr, FILE_BEGIN)) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
char buf[64 * 1024];
|
|
|
|
size_t totalBytesRead = 0;
|
|
|
|
DWORD dwBytesRead;
|
|
|
|
// Do dummy reads to trigger kernel-side readhead via
|
|
|
|
// FILE_FLAG_SEQUENTIAL_SCAN. Abort when underfilling because during testing
|
|
|
|
// the buffers are read fully A buffer that's not keeping up would imply that
|
|
|
|
// readahead isn't working right
|
|
|
|
while (totalBytesRead < aCount &&
|
|
|
|
ReadFile(aFd, buf, sizeof(buf), &dwBytesRead, nullptr) &&
|
|
|
|
dwBytesRead == sizeof(buf)) {
|
|
|
|
totalBytesRead += dwBytesRead;
|
|
|
|
}
|
|
|
|
|
|
|
|
// Restore the file pointer
|
|
|
|
SetFilePointerEx(aFd, fpOriginal, nullptr, FILE_BEGIN);
|
|
|
|
|
|
|
|
#elif defined(LINUX) && !defined(ANDROID)
|
|
|
|
|
|
|
|
readahead(aFd, aOffset, aCount);
|
|
|
|
|
|
|
|
#elif defined(XP_MACOSX)
|
|
|
|
|
|
|
|
struct radvisory ra;
|
|
|
|
ra.ra_offset = aOffset;
|
|
|
|
ra.ra_count = aCount;
|
|
|
|
// The F_RDADVISE fcntl is equivalent to Linux' readahead() system call.
|
|
|
|
fcntl(aFd, F_RDADVISE, &ra);
|
|
|
|
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
void mozilla::ReadAheadLib(mozilla::pathstr_t aFilePath) {
|
|
|
|
if (!aFilePath) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
#if defined(XP_WIN)
|
2019-05-01 05:08:28 +03:00
|
|
|
if (!CanPrefetchMemory()) {
|
|
|
|
ReadAheadFile(aFilePath);
|
|
|
|
return;
|
|
|
|
}
|
2019-04-13 21:46:18 +03:00
|
|
|
nsAutoHandle fd(CreateFileW(aFilePath, GENERIC_READ, FILE_SHARE_READ, nullptr,
|
|
|
|
OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN,
|
|
|
|
nullptr));
|
|
|
|
if (!fd) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
nsAutoHandle mapping(
|
|
|
|
CreateFileMapping(fd, nullptr, SEC_IMAGE | PAGE_READONLY, 0, 0, nullptr));
|
|
|
|
if (!mapping) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2019-05-29 13:13:28 +03:00
|
|
|
PVOID data = MapViewOfFile(mapping, FILE_MAP_READ, 0, 0, 0);
|
|
|
|
if (!data) {
|
|
|
|
return;
|
|
|
|
}
|
2019-04-13 21:46:18 +03:00
|
|
|
auto guard = MakeScopeExit([=]() { UnmapViewOfFile(data); });
|
2019-05-29 13:13:28 +03:00
|
|
|
mozilla::nt::PEHeaders headers(data);
|
|
|
|
Maybe<Span<const uint8_t>> bounds = headers.GetBounds();
|
|
|
|
if (!bounds) {
|
|
|
|
return;
|
2019-04-13 21:46:18 +03:00
|
|
|
}
|
|
|
|
|
2019-05-29 13:13:28 +03:00
|
|
|
PrefetchMemory((uint8_t*)data, bounds->Length());
|
|
|
|
|
2013-03-04 05:56:03 +04:00
|
|
|
#elif defined(LINUX) && !defined(ANDROID)
|
|
|
|
int fd = open(aFilePath, O_RDONLY);
|
|
|
|
if (fd < 0) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2014-06-27 05:35:39 +04:00
|
|
|
union {
|
2013-03-04 05:56:03 +04:00
|
|
|
char buf[bufsize];
|
|
|
|
Elf_Ehdr ehdr;
|
|
|
|
} elf;
|
|
|
|
// Read ELF header (ehdr) and program header table (phdr).
|
|
|
|
// We check that the ELF magic is found, that the ELF class matches
|
|
|
|
// our own, and that the program header table as defined in the ELF
|
|
|
|
// headers fits in the buffer we read.
|
|
|
|
if ((read(fd, elf.buf, bufsize) <= 0) || (memcmp(elf.buf, ELFMAG, 4)) ||
|
|
|
|
(elf.ehdr.e_ident[EI_CLASS] != ELFCLASS) ||
|
2015-04-28 19:10:37 +03:00
|
|
|
// Upcast e_phentsize so the multiplication is done in the same precision
|
|
|
|
// as the subsequent addition, to satisfy static analyzers and avoid
|
|
|
|
// issues with abnormally large program header tables.
|
|
|
|
(elf.ehdr.e_phoff +
|
|
|
|
(static_cast<Elf_Off>(elf.ehdr.e_phentsize) * elf.ehdr.e_phnum) >=
|
|
|
|
bufsize)) {
|
2013-03-04 05:56:03 +04:00
|
|
|
close(fd);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
// The program header table contains segment definitions. One such
|
|
|
|
// segment type is PT_LOAD, which describes how the dynamic loader
|
|
|
|
// is going to map the file in memory. We use that information to
|
|
|
|
// find the biggest offset from the library that will be mapped in
|
|
|
|
// memory.
|
2014-06-27 05:35:39 +04:00
|
|
|
Elf_Phdr* phdr = (Elf_Phdr*)&elf.buf[elf.ehdr.e_phoff];
|
2013-03-04 05:56:03 +04:00
|
|
|
Elf_Off end = 0;
|
|
|
|
for (int phnum = elf.ehdr.e_phnum; phnum; phdr++, phnum--) {
|
|
|
|
if ((phdr->p_type == PT_LOAD) && (end < phdr->p_offset + phdr->p_filesz)) {
|
|
|
|
end = phdr->p_offset + phdr->p_filesz;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// Let the kernel read ahead what the dynamic loader is going to
|
|
|
|
// map in memory soon after.
|
|
|
|
if (end > 0) {
|
|
|
|
ReadAhead(fd, 0, end);
|
|
|
|
}
|
|
|
|
close(fd);
|
|
|
|
#elif defined(XP_MACOSX)
|
|
|
|
ScopedMMap buf(aFilePath);
|
2014-06-27 05:35:39 +04:00
|
|
|
char* base = buf;
|
2013-03-04 05:56:03 +04:00
|
|
|
if (!base) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// An OSX binary might either be a fat (universal) binary or a
|
|
|
|
// Mach-O binary. A fat binary actually embeds several Mach-O
|
|
|
|
// binaries. If we have a fat binary, find the offset where the
|
|
|
|
// Mach-O binary for our CPU type can be found.
|
2014-06-27 05:35:39 +04:00
|
|
|
struct fat_header* fh = (struct fat_header*)base;
|
2013-03-04 05:56:03 +04:00
|
|
|
|
|
|
|
if (OSSwapBigToHostInt32(fh->magic) == FAT_MAGIC) {
|
|
|
|
uint32_t nfat_arch = OSSwapBigToHostInt32(fh->nfat_arch);
|
2014-06-27 05:35:39 +04:00
|
|
|
struct fat_arch* arch = (struct fat_arch*)&buf[sizeof(struct fat_header)];
|
2013-03-04 05:56:03 +04:00
|
|
|
for (; nfat_arch; arch++, nfat_arch--) {
|
|
|
|
if (OSSwapBigToHostInt32(arch->cputype) == CPU_TYPE) {
|
|
|
|
base += OSSwapBigToHostInt32(arch->offset);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (base == buf) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
// Check Mach-O magic in the Mach header
|
2014-06-27 05:35:39 +04:00
|
|
|
struct cpu_mach_header* mh = (struct cpu_mach_header*)base;
|
2013-03-04 05:56:03 +04:00
|
|
|
if (mh->magic != MH_MAGIC) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
// The Mach header is followed by a sequence of load commands.
|
|
|
|
// Each command has a header containing the command type and the
|
|
|
|
// command size. LD_SEGMENT commands describes how the dynamic
|
|
|
|
// loader is going to map the file in memory. We use that
|
|
|
|
// information to find the biggest offset from the library that
|
|
|
|
// will be mapped in memory.
|
2014-06-27 05:35:39 +04:00
|
|
|
char* cmd = &base[sizeof(struct cpu_mach_header)];
|
2013-08-08 09:52:41 +04:00
|
|
|
uint32_t end = 0;
|
2013-03-04 05:56:03 +04:00
|
|
|
for (uint32_t ncmds = mh->ncmds; ncmds; ncmds--) {
|
2014-06-27 05:35:39 +04:00
|
|
|
struct segment_command* sh = (struct segment_command*)cmd;
|
2013-03-04 05:56:03 +04:00
|
|
|
if (sh->cmd != LC_SEGMENT) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (end < sh->fileoff + sh->filesize) {
|
|
|
|
end = sh->fileoff + sh->filesize;
|
|
|
|
}
|
|
|
|
cmd += sh->cmdsize;
|
|
|
|
}
|
|
|
|
// Let the kernel read ahead what the dynamic loader is going to
|
|
|
|
// map in memory soon after.
|
|
|
|
if (end > 0) {
|
|
|
|
ReadAhead(buf.getFd(), base - buf, end);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
void mozilla::ReadAheadFile(mozilla::pathstr_t aFilePath, const size_t aOffset,
|
|
|
|
const size_t aCount, mozilla::filedesc_t* aOutFd) {
|
2013-05-07 10:06:14 +04:00
|
|
|
#if defined(XP_WIN)
|
2013-03-04 05:56:03 +04:00
|
|
|
if (!aFilePath) {
|
2013-05-07 10:06:14 +04:00
|
|
|
if (aOutFd) {
|
|
|
|
*aOutFd = INVALID_HANDLE_VALUE;
|
|
|
|
}
|
2013-03-04 05:56:03 +04:00
|
|
|
return;
|
|
|
|
}
|
2013-10-11 00:41:39 +04:00
|
|
|
HANDLE fd = CreateFileW(aFilePath, GENERIC_READ, FILE_SHARE_READ, nullptr,
|
|
|
|
OPEN_EXISTING, FILE_FLAG_SEQUENTIAL_SCAN, nullptr);
|
2013-05-07 10:06:14 +04:00
|
|
|
if (aOutFd) {
|
|
|
|
*aOutFd = fd;
|
|
|
|
}
|
2013-03-04 05:56:03 +04:00
|
|
|
if (fd == INVALID_HANDLE_VALUE) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
ReadAhead(fd, aOffset, aCount);
|
2013-05-07 10:06:14 +04:00
|
|
|
if (!aOutFd) {
|
2013-03-04 05:56:03 +04:00
|
|
|
CloseHandle(fd);
|
|
|
|
}
|
|
|
|
#elif defined(LINUX) && !defined(ANDROID) || defined(XP_MACOSX)
|
2013-05-07 10:06:14 +04:00
|
|
|
if (!aFilePath) {
|
|
|
|
if (aOutFd) {
|
|
|
|
*aOutFd = -1;
|
|
|
|
}
|
|
|
|
return;
|
|
|
|
}
|
2013-03-04 05:56:03 +04:00
|
|
|
int fd = open(aFilePath, O_RDONLY);
|
2013-05-07 10:06:14 +04:00
|
|
|
if (aOutFd) {
|
|
|
|
*aOutFd = fd;
|
|
|
|
}
|
2013-03-04 05:56:03 +04:00
|
|
|
if (fd < 0) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
size_t count;
|
|
|
|
if (aCount == SIZE_MAX) {
|
|
|
|
struct stat st;
|
|
|
|
if (fstat(fd, &st) < 0) {
|
2013-05-07 10:06:14 +04:00
|
|
|
if (!aOutFd) {
|
|
|
|
close(fd);
|
|
|
|
}
|
2013-03-04 05:56:03 +04:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
count = st.st_size;
|
|
|
|
} else {
|
|
|
|
count = aCount;
|
|
|
|
}
|
|
|
|
ReadAhead(fd, aOffset, count);
|
2013-05-07 10:06:14 +04:00
|
|
|
if (!aOutFd) {
|
2013-03-04 05:56:03 +04:00
|
|
|
close(fd);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|