Diff
Modified: trunk/Source/WebKit2/CMakeLists.txt (184448 => 184449)
--- trunk/Source/WebKit2/CMakeLists.txt 2015-05-18 06:26:10 UTC (rev 184448)
+++ trunk/Source/WebKit2/CMakeLists.txt 2015-05-18 06:31:25 UTC (rev 184449)
@@ -165,6 +165,7 @@
NetworkProcess/cache/NetworkCache.cpp
NetworkProcess/cache/NetworkCacheBlobStorage.cpp
NetworkProcess/cache/NetworkCacheCoders.cpp
+ NetworkProcess/cache/NetworkCacheData.cpp
NetworkProcess/cache/NetworkCacheDecoder.cpp
NetworkProcess/cache/NetworkCacheEncoder.cpp
NetworkProcess/cache/NetworkCacheEntry.cpp
Modified: trunk/Source/WebKit2/ChangeLog (184448 => 184449)
--- trunk/Source/WebKit2/ChangeLog 2015-05-18 06:26:10 UTC (rev 184448)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-18 06:31:25 UTC (rev 184449)
@@ -1,3 +1,42 @@
+2015-05-17 Carlos Garcia Campos <[email protected]>
+
+ Network Cache: Make Data::adoptMap take the ownership of the file descriptor
+ https://bugs.webkit.org/show_bug.cgi?id=144950
+
+ Reviewed by Antti Koivisto.
+
+ It will be required to implement ShareableResource for soup
+ network backend. Also move the common code of Data to a common
+ file and add mapToFile(). The mapFile version that receives a file
+ descriptor has been renamed to adoptAndMapFile().
+
+ * CMakeLists.txt: Add new file to compilation.
+ * NetworkProcess/cache/NetworkCacheBlobStorage.cpp:
+ (WebKit::NetworkCache::BlobStorage::add): Use mapToFile().
+ * NetworkProcess/cache/NetworkCacheData.cpp: Added.
+ (WebKit::NetworkCache::Data::mapToFile): Write the data to the
+ given file and map it.
+ (WebKit::NetworkCache::mapFile):
+ (WebKit::NetworkCache::adoptAndMapFile):
+ (WebKit::NetworkCache::computeSHA1):
+ (WebKit::NetworkCache::bytesEqual):
+ * NetworkProcess/cache/NetworkCacheData.h:
+ * NetworkProcess/cache/NetworkCacheDataCocoa.mm:
+ (WebKit::NetworkCache::Data::adoptMap): Close the file descriptor.
+ * NetworkProcess/cache/NetworkCacheDataSoup.cpp:
+ (WebKit::NetworkCache::Data::Data): Use a constructor that
+ receives a file descriptor instead of the one receiving
+ Backing. If the file descriptor is not -1 then the Data is a map.
+ (WebKit::NetworkCache::MapWrapper::~MapWrapper): Also close the
+ file descriptor.
+ (WebKit::NetworkCache::Data::adoptMap): Pass the file descriptor
+ to the MapWrapper and create the Data passing the file descriptor.
+ * UIProcess/API/APIUserContentExtensionStore.cpp:
+ (API::openAndMapContentExtension): Use mapFile that receives a
+ file path.
+ (API::compiledToFile): Use adoptAndMapFile() and don't close the
+ descriptor.
+
2015-05-16 Andy Estes <[email protected]>
[iOS] WKPDFView should not follow _javascript_: links
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheBlobStorage.cpp (184448 => 184449)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheBlobStorage.cpp 2015-05-18 06:26:10 UTC (rev 184448)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheBlobStorage.cpp 2015-05-18 06:31:25 UTC (rev 184449)
@@ -101,37 +101,13 @@
unlink(blobPath.data());
}
- int fd = open(blobPath.data(), O_CREAT | O_EXCL | O_RDWR , S_IRUSR | S_IWUSR);
- if (fd < 0)
+ auto mappedData = data.mapToFile(blobPath.data());
+ if (mappedData.isNull())
return { };
- size_t size = data.size();
- if (ftruncate(fd, size) < 0) {
- close(fd);
- return { };
- }
-
- void* map = mmap(nullptr, size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
- close(fd);
-
- if (map == MAP_FAILED)
- return { };
-
- uint8_t* mapData = static_cast<uint8_t*>(map);
- data.apply([&mapData](const uint8_t* bytes, size_t bytesSize) {
- memcpy(mapData, bytes, bytesSize);
- mapData += bytesSize;
- return true;
- });
-
- // Drop the write permission.
- mprotect(map, size, PROT_READ);
-
- auto mappedData = Data::adoptMap(map, size);
-
link(blobPath.data(), linkPath.data());
- m_approximateSize += size;
+ m_approximateSize += mappedData.size();
return { mappedData, hash };
}
Copied: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.cpp (from rev 184448, trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataCocoa.mm) (0 => 184449)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.cpp (rev 0)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.cpp 2015-05-18 06:31:25 UTC (rev 184449)
@@ -0,0 +1,125 @@
+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "config.h"
+#include "NetworkCacheData.h"
+
+#if ENABLE(NETWORK_CACHE)
+
+#include <fcntl.h>
+#include <sys/mman.h>
+#include <sys/stat.h>
+
+namespace WebKit {
+namespace NetworkCache {
+
+Data Data::mapToFile(const char* path) const
+{
+ int fd = open(path, O_CREAT | O_EXCL | O_RDWR , S_IRUSR | S_IWUSR);
+ if (fd < 0)
+ return { };
+
+ if (ftruncate(fd, m_size) < 0) {
+ close(fd);
+ return { };
+ }
+
+ void* map = mmap(nullptr, m_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
+ if (map == MAP_FAILED) {
+ close(fd);
+ return { };
+ }
+
+ uint8_t* mapData = static_cast<uint8_t*>(map);
+ apply([&mapData](const uint8_t* bytes, size_t bytesSize) {
+ memcpy(mapData, bytes, bytesSize);
+ mapData += bytesSize;
+ return true;
+ });
+
+ // Drop the write permission.
+ mprotect(map, m_size, PROT_READ);
+
+ return Data::adoptMap(map, m_size, fd);
+}
+
+Data mapFile(const char* path)
+{
+ int fd = open(path, O_RDONLY, 0);
+ if (fd < 0)
+ return { };
+ struct stat stat;
+ if (fstat(fd, &stat) < 0) {
+ close(fd);
+ return { };
+ }
+ size_t size = stat.st_size;
+ if (!size) {
+ close(fd);
+ return Data::empty();
+ }
+
+ return adoptAndMapFile(fd, 0, size);
+}
+
+Data adoptAndMapFile(int fd, size_t offset, size_t size)
+{
+ if (!size)
+ return Data::empty();
+
+ void* map = mmap(nullptr, size, PROT_READ, MAP_PRIVATE, fd, offset);
+ if (map == MAP_FAILED) {
+ close(fd);
+ return { };
+ }
+
+ return Data::adoptMap(map, size, fd);
+}
+
+SHA1::Digest computeSHA1(const Data& data)
+{
+ SHA1 sha1;
+ data.apply([&sha1](const uint8_t* data, size_t size) {
+ sha1.addBytes(data, size);
+ return true;
+ });
+ SHA1::Digest digest;
+ sha1.computeHash(digest);
+ return digest;
+}
+
+bool bytesEqual(const Data& a, const Data& b)
+{
+ if (a.isNull() || b.isNull())
+ return false;
+ if (a.size() != b.size())
+ return false;
+ return !memcmp(a.data(), b.data(), a.size());
+}
+
+} // namespace NetworkCache
+} // namespace WebKit
+
+#endif // #if ENABLE(NETWORK_CACHE)
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.h (184448 => 184449)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.h 2015-05-18 06:26:10 UTC (rev 184448)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheData.h 2015-05-18 06:31:25 UTC (rev 184449)
@@ -104,14 +104,14 @@
Data(const uint8_t*, size_t);
static Data empty();
- static Data adoptMap(void* map, size_t);
+ static Data adoptMap(void* map, size_t, int fd);
+#if PLATFORM(COCOA)
enum class Backing { Buffer, Map };
-#if PLATFORM(COCOA)
Data(DispatchPtr<dispatch_data_t>, Backing = Backing::Buffer);
#endif
#if USE(SOUP)
- Data(GRefPtr<SoupBuffer>&&, Backing = Backing::Buffer);
+ Data(GRefPtr<SoupBuffer>&&, int fd = -1);
#endif
bool isNull() const;
bool isEmpty() const { return !m_size; }
@@ -124,6 +124,8 @@
bool apply(const std::function<bool (const uint8_t*, size_t)>&&) const;
+ Data mapToFile(const char* path) const;
+
#if PLATFORM(COCOA)
dispatch_data_t dispatchData() const { return m_dispatchData.get(); }
#endif
@@ -137,6 +139,7 @@
#endif
#if USE(SOUP)
mutable GRefPtr<SoupBuffer> m_buffer;
+ int m_fileDescriptor { -1 };
#endif
mutable const uint8_t* m_data { nullptr };
size_t m_size { 0 };
@@ -145,7 +148,7 @@
Data concatenate(const Data&, const Data&);
bool bytesEqual(const Data&, const Data&);
-Data mapFile(int fd, size_t offset, size_t);
+Data adoptAndMapFile(int fd, size_t offset, size_t);
Data mapFile(const char* path);
SHA1::Digest computeSHA1(const Data&);
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataCocoa.mm (184448 => 184449)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataCocoa.mm 2015-05-18 06:26:10 UTC (rev 184448)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataCocoa.mm 2015-05-18 06:31:25 UTC (rev 184449)
@@ -93,65 +93,19 @@
return { adoptDispatch(dispatch_data_create_concat(a.dispatchData(), b.dispatchData())) };
}
-Data Data::adoptMap(void* map, size_t size)
+Data Data::adoptMap(void* map, size_t size, int fd)
{
ASSERT(map && map != MAP_FAILED);
+ close(fd);
auto bodyMap = adoptDispatch(dispatch_data_create(map, size, dispatch_get_main_queue(), [map, size] {
munmap(map, size);
}));
return { bodyMap, Data::Backing::Map };
}
-Data mapFile(int fd, size_t offset, size_t size)
-{
- if (!size)
- return Data::empty();
- void* map = mmap(nullptr, size, PROT_READ, MAP_PRIVATE, fd, offset);
- if (map == MAP_FAILED)
- return { };
- return Data::adoptMap(map, size);
-}
-Data mapFile(const char* path)
-{
- int fd = open(path, O_RDONLY, 0);
- if (fd < 0)
- return { };
- struct stat stat;
- if (fstat(fd, &stat) < 0) {
- close(fd);
- return { };
- }
- size_t size = stat.st_size;
- auto data = "" 0, size);
- close(fd);
-
- return data;
}
-
-SHA1::Digest computeSHA1(const Data& data)
-{
- SHA1 sha1;
- data.apply([&sha1](const uint8_t* data, size_t size) {
- sha1.addBytes(data, size);
- return true;
- });
- SHA1::Digest digest;
- sha1.computeHash(digest);
- return digest;
}
-bool bytesEqual(const Data& a, const Data& b)
-{
- if (a.isNull() || b.isNull())
- return false;
- if (a.size() != b.size())
- return false;
- return !memcmp(a.data(), b.data(), a.size());
-}
-
-}
-}
-
#endif
Modified: trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataSoup.cpp (184448 => 184449)
--- trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataSoup.cpp 2015-05-18 06:26:10 UTC (rev 184448)
+++ trunk/Source/WebKit2/NetworkProcess/cache/NetworkCacheDataSoup.cpp 2015-05-18 06:31:25 UTC (rev 184449)
@@ -45,10 +45,11 @@
m_buffer = adoptGRef(soup_buffer_new_with_owner(copiedData, size, copiedData, fastFree));
}
-Data::Data(GRefPtr<SoupBuffer>&& buffer, Backing backing)
+Data::Data(GRefPtr<SoupBuffer>&& buffer, int fd)
: m_buffer(buffer)
+ , m_fileDescriptor(fd)
, m_size(buffer ? buffer->length : 0)
- , m_isMap(m_size && backing == Backing::Map)
+ , m_isMap(m_size && fd != -1)
{
}
@@ -104,10 +105,12 @@
~MapWrapper()
{
munmap(map, size);
+ close(fileDescriptor);
}
void* map;
size_t size;
+ int fileDescriptor;
};
static void deleteMapWrapper(MapWrapper* wrapper)
@@ -115,64 +118,17 @@
delete wrapper;
}
-Data mapFile(int fd, size_t offset, size_t size)
+Data Data::adoptMap(void* map, size_t size, int fd)
{
- if (!size)
- return Data::empty();
-
- void* map = mmap(nullptr, size, PROT_READ, MAP_PRIVATE, fd, offset);
- if (map == MAP_FAILED)
- return { };
- return Data::adoptMap(map, size);
-}
-
-Data Data::adoptMap(void* map, size_t size)
-{
ASSERT(map);
ASSERT(map != MAP_FAILED);
- MapWrapper* wrapper = new MapWrapper { map, size };
+ MapWrapper* wrapper = new MapWrapper { map, size, fd };
GRefPtr<SoupBuffer> buffer = adoptGRef(soup_buffer_new_with_owner(map, size, wrapper, reinterpret_cast<GDestroyNotify>(deleteMapWrapper)));
- return { WTF::move(buffer), Data::Backing::Map };
+ return { WTF::move(buffer), fd };
}
-Data mapFile(const char* path)
-{
- int fd = open(path, O_RDONLY, 0);
- if (fd < 0)
- return { };
- struct stat stat;
- if (fstat(fd, &stat) < 0) {
- close(fd);
- return { };
- }
- size_t size = stat.st_size;
- auto data = "" 0, size);
- close(fd);
- return data;
-}
-SHA1::Digest computeSHA1(const Data& data)
-{
- SHA1 sha1;
- data.apply([&sha1](const uint8_t* data, size_t size) {
- sha1.addBytes(data, size);
- return true;
- });
- SHA1::Digest digest;
- sha1.computeHash(digest);
- return digest;
-}
-
-bool bytesEqual(const Data& a, const Data& b)
-{
- if (a.isNull() || b.isNull())
- return false;
- if (a.size() != b.size())
- return false;
- return !memcmp(a.data(), b.data(), a.size());
-}
-
} // namespace NetworkCache
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp (184448 => 184449)
--- trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp 2015-05-18 06:26:10 UTC (rev 184448)
+++ trunk/Source/WebKit2/UIProcess/API/APIUserContentExtensionStore.cpp 2015-05-18 06:31:25 UTC (rev 184449)
@@ -134,19 +134,7 @@
static bool openAndMapContentExtension(const String& path, ContentExtensionMetaData& metaData, Data& fileData)
{
- auto fd = WebCore::openFile(path, WebCore::OpenForRead);
- if (fd == WebCore::invalidPlatformFileHandle)
- return false;
-
- long long fileSize = 0;
- if (!WebCore::getFileSize(fd, fileSize)) {
- WebCore::closeFile(fd);
- return false;
- }
-
- fileData = mapFile(fd, 0, static_cast<size_t>(fileSize));
- WebCore::closeFile(fd);
-
+ fileData = mapFile(WebCore::fileSystemRepresentation(path).data());
if (fileData.isNull())
return false;
@@ -270,9 +258,7 @@
if (compilationClient.hadErrorWhileWritingToFile())
return UserContentExtensionStore::Error::CompileFailed;
- mappedData = mapFile(temporaryFileHandle, 0, metaData.fileSize());
- WebCore::closeFile(temporaryFileHandle);
-
+ mappedData = adoptAndMapFile(temporaryFileHandle, 0, metaData.fileSize());
if (mappedData.isNull())
return UserContentExtensionStore::Error::CompileFailed;
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (184448 => 184449)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-05-18 06:26:10 UTC (rev 184448)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-05-18 06:31:25 UTC (rev 184449)
@@ -1790,6 +1790,7 @@
E4436ECE1A0D040B00EAD204 /* NetworkCacheKey.h in Headers */ = {isa = PBXBuildFile; fileRef = E4436EC11A0CFDB200EAD204 /* NetworkCacheKey.h */; };
E4436ECF1A0D040B00EAD204 /* NetworkCacheStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = E4436EC21A0CFDB200EAD204 /* NetworkCacheStorage.h */; };
E4436ED01A0D040B00EAD204 /* NetworkCacheStorage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E4436EC31A0CFDB200EAD204 /* NetworkCacheStorage.cpp */; };
+ E47D1E981B0649FB002676A8 /* NetworkCacheData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E47D1E961B062B66002676A8 /* NetworkCacheData.cpp */; };
E489D28A1A0A2DB80078C06A /* NetworkCacheCoder.h in Headers */ = {isa = PBXBuildFile; fileRef = E489D2831A0A2DB80078C06A /* NetworkCacheCoder.h */; };
E489D28B1A0A2DB80078C06A /* NetworkCacheCoders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = E489D2841A0A2DB80078C06A /* NetworkCacheCoders.cpp */; };
E489D28C1A0A2DB80078C06A /* NetworkCacheCoders.h in Headers */ = {isa = PBXBuildFile; fileRef = E489D2851A0A2DB80078C06A /* NetworkCacheCoders.h */; };
@@ -4056,6 +4057,7 @@
E4436EC11A0CFDB200EAD204 /* NetworkCacheKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheKey.h; sourceTree = "<group>"; };
E4436EC21A0CFDB200EAD204 /* NetworkCacheStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheStorage.h; sourceTree = "<group>"; };
E4436EC31A0CFDB200EAD204 /* NetworkCacheStorage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCacheStorage.cpp; sourceTree = "<group>"; };
+ E47D1E961B062B66002676A8 /* NetworkCacheData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCacheData.cpp; sourceTree = "<group>"; };
E489D2831A0A2DB80078C06A /* NetworkCacheCoder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheCoder.h; sourceTree = "<group>"; };
E489D2841A0A2DB80078C06A /* NetworkCacheCoders.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCacheCoders.cpp; sourceTree = "<group>"; };
E489D2851A0A2DB80078C06A /* NetworkCacheCoders.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheCoders.h; sourceTree = "<group>"; };
@@ -7524,6 +7526,7 @@
E489D2831A0A2DB80078C06A /* NetworkCacheCoder.h */,
E489D2841A0A2DB80078C06A /* NetworkCacheCoders.cpp */,
E489D2851A0A2DB80078C06A /* NetworkCacheCoders.h */,
+ E47D1E961B062B66002676A8 /* NetworkCacheData.cpp */,
E42E06111AA75ABD00B11699 /* NetworkCacheData.h */,
E42E06131AA75B7000B11699 /* NetworkCacheDataCocoa.mm */,
E489D2861A0A2DB80078C06A /* NetworkCacheDecoder.cpp */,
@@ -10173,6 +10176,7 @@
2DC6D9C418C44A610043BAD4 /* WKWebViewContentProviderRegistry.mm in Sources */,
1AD60F5D18E20F4C0020C034 /* WKWindowFeatures.mm in Sources */,
BCBECDE716B6416800047A1A /* XPCServiceEntryPoint.mm in Sources */,
+ E47D1E981B0649FB002676A8 /* NetworkCacheData.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
