⚠ Archived content — this site is no longer maintained.   Current WebKit documentation is at docs.webkit.org.

Changeset 243143 in webkit


Ignore:
Timestamp:
Mar 19, 2019, 10:05:55 AM (8 years ago)
Author:
Chris Dumez
Message:

Drop NetworkCacheStatistics code
​https://bugs.webkit.org/show_bug.cgi?id=195910

Reviewed by Antti Koivisto.

Drop NetworkCacheStatistics code. It was a temporary experiment and has not been used in a long time.

  • NetworkProcess/NetworkProcessCreationParameters.cpp:

(WebKit::NetworkProcessCreationParameters::encode const):
(WebKit::NetworkProcessCreationParameters::decode):

  • NetworkProcess/NetworkProcessCreationParameters.h:
  • NetworkProcess/cache/NetworkCache.cpp:

(WebKit::NetworkCache::Cache::Cache):
(WebKit::NetworkCache::Cache::retrieve):
(WebKit::NetworkCache::Cache::store):
(WebKit::NetworkCache::Cache::storeRedirect):
(WebKit::NetworkCache::Cache::update):
(WebKit::NetworkCache::Cache::clear):

  • NetworkProcess/cache/NetworkCache.h:
  • NetworkProcess/cache/NetworkCacheStatistics.cpp: Removed.
  • NetworkProcess/cache/NetworkCacheStatistics.h: Removed.
  • NetworkProcess/cache/NetworkCacheStorage.cpp:

(WebKit::NetworkCache::traverseRecordsFiles):

  • NetworkProcess/cache/NetworkCacheStorage.h:
  • NetworkProcess/cocoa/NetworkProcessCocoa.mm:

(WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):

  • NetworkProcess/soup/NetworkProcessSoup.cpp:

(WebKit::NetworkProcess::platformInitializeNetworkProcess):

  • Sources.txt:
  • UIProcess/Cocoa/WebProcessPoolCocoa.mm:

(WebKit::registerUserDefaultsIfNeeded):
(WebKit::WebProcessPool::platformInitializeNetworkProcess):

  • UIProcess/soup/WebProcessPoolSoup.cpp:

(WebKit::WebProcessPool::platformInitializeNetworkProcess):

  • WebKit.xcodeproj/project.pbxproj:
Location:
trunk/Source/WebKit
Files:
2 deleted
13 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit/ChangeLog

    r243142 r243143  
     12019-03-19  Chris Dumez  <cdumez@apple.com>
     2
     3        Drop NetworkCacheStatistics code
     4        https://bugs.webkit.org/show_bug.cgi?id=195910
     5
     6        Reviewed by Antti Koivisto.
     7
     8        Drop NetworkCacheStatistics code. It was a temporary experiment and has not been used in a long time.
     9
     10        * NetworkProcess/NetworkProcessCreationParameters.cpp:
     11        (WebKit::NetworkProcessCreationParameters::encode const):
     12        (WebKit::NetworkProcessCreationParameters::decode):
     13        * NetworkProcess/NetworkProcessCreationParameters.h:
     14        * NetworkProcess/cache/NetworkCache.cpp:
     15        (WebKit::NetworkCache::Cache::Cache):
     16        (WebKit::NetworkCache::Cache::retrieve):
     17        (WebKit::NetworkCache::Cache::store):
     18        (WebKit::NetworkCache::Cache::storeRedirect):
     19        (WebKit::NetworkCache::Cache::update):
     20        (WebKit::NetworkCache::Cache::clear):
     21        * NetworkProcess/cache/NetworkCache.h:
     22        * NetworkProcess/cache/NetworkCacheStatistics.cpp: Removed.
     23        * NetworkProcess/cache/NetworkCacheStatistics.h: Removed.
     24        * NetworkProcess/cache/NetworkCacheStorage.cpp:
     25        (WebKit::NetworkCache::traverseRecordsFiles):
     26        * NetworkProcess/cache/NetworkCacheStorage.h:
     27        * NetworkProcess/cocoa/NetworkProcessCocoa.mm:
     28        (WebKit::NetworkProcess::platformInitializeNetworkProcessCocoa):
     29        * NetworkProcess/soup/NetworkProcessSoup.cpp:
     30        (WebKit::NetworkProcess::platformInitializeNetworkProcess):
     31        * Sources.txt:
     32        * UIProcess/Cocoa/WebProcessPoolCocoa.mm:
     33        (WebKit::registerUserDefaultsIfNeeded):
     34        (WebKit::WebProcessPool::platformInitializeNetworkProcess):
     35        * UIProcess/soup/WebProcessPoolSoup.cpp:
     36        (WebKit::WebProcessPool::platformInitializeNetworkProcess):
     37        * WebKit.xcodeproj/project.pbxproj:
     38
    1392019-03-19  Chris Dumez  <cdumez@apple.com>
    240

  • trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.cpp

    r243110 r243143  
    4646    encoder << diskCacheDirectory;
    4747    encoder << diskCacheDirectoryExtensionHandle;
    48     encoder << shouldEnableNetworkCacheEfficacyLogging;
    4948#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
    5049    encoder << shouldEnableNetworkCacheSpeculativeRevalidation;
    … …  
    114113    result.diskCacheDirectoryExtensionHandle = WTFMove(*diskCacheDirectoryExtensionHandle);
    115114
    116     if (!decoder.decode(result.shouldEnableNetworkCacheEfficacyLogging))
    117         return false;
    118115#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
    119116    if (!decoder.decode(result.shouldEnableNetworkCacheSpeculativeRevalidation))

  • trunk/Source/WebKit/NetworkProcess/NetworkProcessCreationParameters.h

    r243110 r243143  
    5757    String diskCacheDirectory;
    5858    SandboxExtension::Handle diskCacheDirectoryExtensionHandle;
    59     bool shouldEnableNetworkCacheEfficacyLogging { false };
    6059#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
    6160    bool shouldEnableNetworkCacheSpeculativeRevalidation { false };

  • trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.cpp

    r242713 r243143  
    2929#include "Logging.h"
    3030#include "NetworkCacheSpeculativeLoadManager.h"
    31 #include "NetworkCacheStatistics.h"
    3231#include "NetworkCacheStorage.h"
    3332#include "NetworkProcess.h"
    … …  
    10099#endif
    101100
    102     if (options.contains(Option::EfficacyLogging))
    103         m_statistics = Statistics::open(*this, m_storage->basePath());
    104 
    105101    if (options.contains(Option::RegisterNotify)) {
    106102#if PLATFORM(COCOA)
    … …  
    280276    LOG(NetworkCache, "(NetworkProcess) retrieving %s priority %d", request.url().string().ascii().data(), static_cast<int>(request.priority()));
    281277
    282     if (m_statistics)
    283         m_statistics->recordRetrievalRequest(frameID.first);
    284 
    285278    Key storageKey = makeCacheKey(request);
    286279    auto priority = static_cast<unsigned>(request.priority());
    … …  
    298291    auto retrieveDecision = makeRetrieveDecision(request);
    299292    if (retrieveDecision != RetrieveDecision::Yes) {
    300         if (m_statistics)
    301             m_statistics->recordNotUsingCacheForRequest(frameID.first, storageKey, request, retrieveDecision);
    302 
    303293        completeRetrieve(WTFMove(completionHandler), nullptr, info);
    304294        return;
    … …  
    318308#endif
    319309
    320     m_storage->retrieve(storageKey, priority, [this, protectedThis = makeRef(*this), request, completionHandler = WTFMove(completionHandler), info = WTFMove(info), storageKey, frameID, networkProcess = makeRef(networkProcess())](auto record, auto timings) mutable {
     310    m_storage->retrieve(storageKey, priority, [request, completionHandler = WTFMove(completionHandler), info = WTFMove(info), storageKey, networkProcess = makeRef(networkProcess())](auto record, auto timings) mutable {
    321311        info.storageTimings = timings;
    322312
    323313        if (!record) {
    324314            LOG(NetworkCache, "(NetworkProcess) not found in storage");
    325 
    326             if (m_statistics)
    327                 m_statistics->recordRetrievalFailure(frameID.first, storageKey, request);
    328315
    329316            completeRetrieve(WTFMove(completionHandler), nullptr, info);
    … …  
    352339        completeRetrieve(WTFMove(completionHandler), WTFMove(entry), info);
    353340
    354         if (m_statistics)
    355             m_statistics->recordRetrievedCachedEntry(frameID.first, storageKey, request, useDecision);
    356341        return useDecision != UseDecision::NoDueToDecodeFailure;
    357342    });
    … …  
    390375            remove(key);
    391376        }
    392 
    393         if (m_statistics)
    394             m_statistics->recordNotCachingResponse(key, storeDecision);
    395377
    396378        return nullptr;
    … …  
    423405    if (storeDecision != StoreDecision::Yes) {
    424406        LOG(NetworkCache, "(NetworkProcess) didn't store redirect, storeDecision=%d", static_cast<int>(storeDecision));
    425         auto key = makeCacheKey(request);
    426         if (m_statistics)
    427             m_statistics->recordNotCachingResponse(key, storeDecision);
    428 
    429407        return nullptr;
    430408    }
    … …  
    459437
    460438    m_storage->store(updateRecord, { });
    461 
    462     if (m_statistics)
    463         m_statistics->recordRevalidationSuccess(frameID.first, existingEntry.key(), originalRequest);
    464439
    465440    return updateEntry;
    … …  
    584559    LOG(NetworkCache, "(NetworkProcess) clearing cache");
    585560
    586     if (m_statistics)
    587         m_statistics->clear();
    588 
    589561    String anyType;
    590562    m_storage->clear(anyType, modifiedSince, WTFMove(completionHandler));

  • trunk/Source/WebKit/NetworkProcess/cache/NetworkCache.h

    r239759 r243143  
    4949class Cache;
    5050class SpeculativeLoadManager;
    51 class Statistics;
    5251
    5352struct MappedBody {
    … …  
    6665};
    6766
    68 // FIXME: This enum is used in the Statistics code in a way that prevents removing or reordering anything.
    6967enum class StoreDecision {
    7068    Yes,
    7169    NoDueToProtocol,
    7270    NoDueToHTTPMethod,
    73     NoDueToAttachmentResponse, // Unused.
    7471    NoDueToNoStoreResponse,
    7572    NoDueToHTTPStatusCode,
    … …  
    9390public:
    9491    enum class Option {
    95         EfficacyLogging = 1 << 0,
    9692        // In testing mode we try to eliminate sources of randomness. Cache does not shrink and there are no read timeouts.
    97         TestingMode = 1 << 1,
    98         RegisterNotify = 1 << 2,
     93        TestingMode = 1 << 0,
     94        RegisterNotify = 1 << 1,
    9995#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
    100         SpeculativeRevalidation = 1 << 3,
     96        SpeculativeRevalidation = 1 << 2,
    10197#endif
    10298    };
    … …  
    170166    std::unique_ptr<SpeculativeLoadManager> m_speculativeLoadManager;
    171167#endif
    172     std::unique_ptr<Statistics> m_statistics;
    173168
    174169    unsigned m_traverseCount { 0 };

  • trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.cpp

    r241244 r243143  
    177177}
    178178
    179 void traverseRecordsFiles(const String& recordsPath, const String& expectedType, const RecordFileTraverseFunction& function)
     179using RecordFileTraverseFunction = Function<void (const String& fileName, const String& hashString, const String& type, bool isBlob, const String& recordDirectoryPath)>;
     180static void traverseRecordsFiles(const String& recordsPath, const String& expectedType, const RecordFileTraverseFunction& function)
    180181{
    181182    traverseDirectory(recordsPath, [&](const String& partitionName, DirectoryEntryType entryType) {

  • trunk/Source/WebKit/NetworkProcess/cache/NetworkCacheStorage.h

    r239759 r243143  
    210210};
    211211
    212 // FIXME: Remove, used by NetworkCacheStatistics only.
    213 using RecordFileTraverseFunction = Function<void (const String& fileName, const String& hashString, const String& type, bool isBlob, const String& recordDirectoryPath)>;
    214 void traverseRecordsFiles(const String& recordsPath, const String& type, const RecordFileTraverseFunction&);
    215 
    216212}
    217213}

  • trunk/Source/WebKit/NetworkProcess/cocoa/NetworkProcessCocoa.mm

    r240350 r243143  
    113113    SandboxExtension::consumePermanently(parameters.diskCacheDirectoryExtensionHandle);
    114114    OptionSet<NetworkCache::Cache::Option> cacheOptions { NetworkCache::Cache::Option::RegisterNotify };
    115     if (parameters.shouldEnableNetworkCacheEfficacyLogging)
    116         cacheOptions.add(NetworkCache::Cache::Option::EfficacyLogging);
    117115    if (parameters.shouldUseTestingNetworkSession)
    118116        cacheOptions.add(NetworkCache::Cache::Option::TestingMode);

  • trunk/Source/WebKit/NetworkProcess/soup/NetworkProcessSoup.cpp

    r241587 r243143  
    113113
    114114    OptionSet<NetworkCache::Cache::Option> cacheOptions { NetworkCache::Cache::Option::RegisterNotify };
    115     if (parameters.shouldEnableNetworkCacheEfficacyLogging)
    116         cacheOptions.add(NetworkCache::Cache::Option::EfficacyLogging);
    117115#if ENABLE(NETWORK_CACHE_SPECULATIVE_REVALIDATION)
    118116    if (parameters.shouldEnableNetworkCacheSpeculativeRevalidation)

  • trunk/Source/WebKit/Sources.txt

    r243110 r243143  
    7979NetworkProcess/cache/NetworkCacheSpeculativeLoad.cpp
    8080NetworkProcess/cache/NetworkCacheSpeculativeLoadManager.cpp
    81 NetworkProcess/cache/NetworkCacheStatistics.cpp
    8281NetworkProcess/cache/NetworkCacheStorage.cpp
    8382NetworkProcess/cache/NetworkCacheSubresourcesEntry.cpp

  • trunk/Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm

    r243110 r243143  
    7979#endif
    8080
    81 static NSString * const WebKitNetworkCacheEfficacyLoggingEnabledDefaultsKey = @"WebKitNetworkCacheEfficacyLoggingEnabled";
    82 
    8381static NSString * const WebKitSuppressMemoryPressureHandlerDefaultsKey = @"WebKitSuppressMemoryPressureHandler";
    8482
    … …  
    106104    [registrationDictionary setObject:@YES forKey:WebKitJSCJITEnabledDefaultsKey];
    107105    [registrationDictionary setObject:@YES forKey:WebKitJSCFTLJITEnabledDefaultsKey];
    108 
    109     [registrationDictionary setObject:@NO forKey:WebKitNetworkCacheEfficacyLoggingEnabledDefaultsKey];
    110106
    111107    [[NSUserDefaults standardUserDefaults] registerDefaults:registrationDictionary];
    … …  
    290286
    291287    parameters.networkATSContext = adoptCF(_CFNetworkCopyATSContext());
    292 
    293     parameters.shouldEnableNetworkCacheEfficacyLogging = [defaults boolForKey:WebKitNetworkCacheEfficacyLoggingEnabledDefaultsKey];
    294288
    295289#if PLATFORM(IOS_FAMILY)

  • trunk/Source/WebKit/UIProcess/soup/WebProcessPoolSoup.cpp

    r241013 r243143  
    4545    parameters.ignoreTLSErrors = m_ignoreTLSErrors;
    4646    parameters.languages = userPreferredLanguages();
    47     parameters.shouldEnableNetworkCacheEfficacyLogging = false;
    4847    parameters.proxySettings = m_networkProxySettings;
    4948}

  • trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

    r243113 r243143  
    12051205                832ED18C1E2FE157006BA64A /* PerActivityStateCPUUsageSampler.h in Headers */ = {isa = PBXBuildFile; fileRef = 832ED18A1E2FE13B006BA64A /* PerActivityStateCPUUsageSampler.h */; };
    12061206                834B250F1A831A8D00CFB150 /* NetworkCacheFileSystem.h in Headers */ = {isa = PBXBuildFile; fileRef = 834B250E1A831A8D00CFB150 /* NetworkCacheFileSystem.h */; };
    1207                 834B25121A842C8700CFB150 /* NetworkCacheStatistics.h in Headers */ = {isa = PBXBuildFile; fileRef = 834B25101A842C8700CFB150 /* NetworkCacheStatistics.h */; };
    12081207                836034A01ACB34D600626549 /* WebSQLiteDatabaseTracker.h in Headers */ = {isa = PBXBuildFile; fileRef = 8360349E1ACB34D600626549 /* WebSQLiteDatabaseTracker.h */; };
    12091208                8372DB251A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 8372DB241A674C8F00C697C5 /* WKPageDiagnosticLoggingClient.h */; settings = {ATTRIBUTES = (Private, ); }; };
    … …  
    37243723                83397C6722124BD100B62388 /* WebProcessCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebProcessCache.h; sourceTree = "<group>"; };
    37253724                834B250E1A831A8D00CFB150 /* NetworkCacheFileSystem.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheFileSystem.h; sourceTree = "<group>"; };
    3726                 834B25101A842C8700CFB150 /* NetworkCacheStatistics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkCacheStatistics.h; sourceTree = "<group>"; };
    37273725                8360349D1ACB34D600626549 /* WebSQLiteDatabaseTracker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebSQLiteDatabaseTracker.cpp; sourceTree = "<group>"; };
    37283726                8360349E1ACB34D600626549 /* WebSQLiteDatabaseTracker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebSQLiteDatabaseTracker.h; sourceTree = "<group>"; };
    … …  
    37423740                83A0ED321F747CC6003299EB /* PreconnectTask.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreconnectTask.h; sourceTree = "<group>"; };
    37433741                83A0ED331F747CC7003299EB /* PreconnectTask.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PreconnectTask.cpp; sourceTree = "<group>"; };
    3744                 83BDCCB81AC5FDB6003F6441 /* NetworkCacheStatistics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkCacheStatistics.cpp; sourceTree = "<group>"; };
    37453742                83D454D61BE9D3C4006C93BD /* NetworkLoadClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkLoadClient.h; sourceTree = "<group>"; };
    37463743                83EE57591DB7D60600C74C50 /* WebValidationMessageClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebValidationMessageClient.cpp; sourceTree = "<group>"; };
    … …  
    88768873                                832AE2511BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoadManager.cpp */,
    88778874                                832AE2501BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoadManager.h */,
    8878                                 83BDCCB81AC5FDB6003F6441 /* NetworkCacheStatistics.cpp */,
    8879                                 834B25101A842C8700CFB150 /* NetworkCacheStatistics.h */,
    88808875                                E4436EC31A0CFDB200EAD204 /* NetworkCacheStorage.cpp */,
    88818876                                E4436EC21A0CFDB200EAD204 /* NetworkCacheStorage.h */,
    … …  
    92589253                                831EEBBD1BD85C4300BB64C3 /* NetworkCacheSpeculativeLoad.h in Headers */,
    92599254                                832AE2521BE2E8CD00FAAE10 /* NetworkCacheSpeculativeLoadManager.h in Headers */,
    9260                                 834B25121A842C8700CFB150 /* NetworkCacheStatistics.h in Headers */,
    92619255                                E4436ECF1A0D040B00EAD204 /* NetworkCacheStorage.h in Headers */,
    92629256                                8310428B1BD6B66F00A715E4 /* NetworkCacheSubresourcesEntry.h in Headers */,
Note: See TracChangeset for help on using the changeset viewer.