facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-08 15:57:43 +03:00
Code Issues Projects Releases Wiki Activity

inodes: remove ifdef around cache flushing functions

Browse Source 
Summary:
Both unices and Windows needs to invalidate the cache in the same place, let's
avoid ifdef and consolidate the function name to clean things up a bit.

Reviewed By: chadaustin

Differential Revision: D22741709

fbshipit-source-id: 04060c0080eff9840abd22747ea48404fa50fd86
This commit is contained in:
Xavier Deguillard 2020-07-27 20:46:39 -07:00 committed by Facebook GitHub Bot
parent 3ad78a8fea
commit 48507f7215
2 changed files with 42 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
eden/fs/inodes/TreeInode.cpp
View File

@ -1284,13 +1284,15 @@ int TreeInode::tryRemoveChild(
deletedInode.reset();
#ifdef _WIN32
cleanupPrjfsCache(name);
// TODO(xavierd): remove the ifdef once we know if we are called from
// ProjectedFS
invalidateChannelEntryCache(name);
#else
// We have successfully removed the entry.
// Flush the kernel cache for this entry if requested.
if (flushKernelCache) {
invalidateFuseInodeCache();
invalidateFuseEntryCache(name);
invalidateChannelEntryCache(name);
}
#endif
@ -2706,11 +2708,7 @@ unique_ptr<CheckoutAction> TreeInode::processCheckoutEntry(
// after this inode processes all of its checkout actions. But we
// do want to invalidate the kernel's dcache and inode caches.
wasDirectoryListModified = true;
#ifndef _WIN32
invalidateFuseEntryCache(name);
#else
cleanupPrjfsCache(name);
#endif // !_WIN32
invalidateChannelEntryCache(name);
}
// Nothing else to do when there is no local inode.
@ -2821,19 +2819,14 @@ unique_ptr<CheckoutAction> TreeInode::processCheckoutEntry(
<< ")";
getOverlay()->recursivelyRemoveOverlayData(oldEntryInodeNumber);
}
#endif
// TODO: contents have changed: we probably should propagate
// this information up to our caller so it can mark us
// materialized if necessary.
// We removed or replaced an entry - invalidate it.
auto* fuseChannel = getMount()->getFuseChannel();
if (fuseChannel) {
fuseChannel->invalidateEntry(getNodeId(), name);
}
#else
cleanupPrjfsCache(name);
#endif // !_WIN32
invalidateChannelEntryCache(name);
return nullptr;
}
@ -2888,12 +2881,9 @@ Future<InvalidationRequired> TreeInode::checkoutUpdateEntry(
}
}
// Tell FUSE to invalidate its cache for this entry.
#ifndef _WIN32
invalidateFuseEntryCache(name);
#else
cleanupPrjfsCache(name);
#endif
// Tell the OS to invalidate its cache for this entry.
invalidateChannelEntryCache(name);
// We don't save our own overlay data right now:
// we'll wait to do that until the checkout operation finishes touching all
// of our children in checkout().
@ -2986,6 +2976,21 @@ Future<InvalidationRequired> TreeInode::checkoutUpdateEntry(
});
}
void TreeInode::invalidateChannelEntryCache(PathComponentPiece name) {
#ifndef _WIN32
if (auto* fuseChannel = getMount()->getFuseChannel()) {
fuseChannel->invalidateEntry(getNodeId(), name);
}
#else
if (auto* fsChannel = getMount()->getFsChannel()) {
const auto path = getPath();
if (path.has_value()) {
fsChannel->removeCachedFile(path.value() + name);
}
}
#endif
}
#ifndef _WIN32
void TreeInode::invalidateFuseInodeCache() {
if (auto* fuseChannel = getMount()->getFuseChannel()) {
@ -3004,28 +3009,12 @@ void TreeInode::invalidateFuseInodeCacheIfRequired() {
invalidateFuseInodeCache();
}
void TreeInode::invalidateFuseEntryCache(PathComponentPiece name) {
if (auto* fuseChannel = getMount()->getFuseChannel()) {
fuseChannel->invalidateEntry(getNodeId(), name);
}
}
void TreeInode::invalidateFuseEntryCacheIfRequired(PathComponentPiece name) {
if (RequestData::isFuseRequest()) {
// no need to flush the cache if we are inside a FUSE request handler
return;
}
invalidateFuseEntryCache(name);
}
#else
void TreeInode::cleanupPrjfsCache(PathComponentPiece name) {
if (auto* fsChannel = getMount()->getFsChannel()) {
const auto path = getPath();
if (path.has_value()) {
fsChannel->removeCachedFile(path.value() + name);
}
}
invalidateChannelEntryCache(name);
}
#endif

36
eden/fs/inodes/TreeInode.h
View File

@ -654,20 +654,6 @@ class TreeInode final : public InodeBaseMetadata<DirContents> {
*/
void invalidateFuseInodeCacheIfRequired();
/**
* Send a request to the kernel to invalidate the dcache entry for the given
* child entry name. The dcache caches name lookups to child inodes.
*
* This should be called when an entry is added, removed, or changed.
* Invalidating upon removal is required because the kernel maintains a
* negative cache on lookup failures.
*
* This is safe to call while holding the contents_ lock, but it is not
* required. Calling it without the contents_ lock held is preferable when
* possible.
*/
void invalidateFuseEntryCache(PathComponentPiece name);
/**
* Invalidate the kernel FUSE cache for this entry name only if we are not
* being called from inside a FUSE request handler.
@ -676,14 +662,24 @@ class TreeInode final : public InodeBaseMetadata<DirContents> {
* need to tell the kernel about the change--it will automatically know.
*/
void invalidateFuseEntryCacheIfRequired(PathComponentPiece name);
#else
/**
* On Windows, Eden manages ProjectedFS cache. This function is to remove a
* file or folder from the cache.
*/
void cleanupPrjfsCache(PathComponentPiece name);
#endif
/**
* Send a request to the kernel to invalidate its cache for the given child
* entry name. On unices this corresponds to the dcache entry which caches
* name lookups to child inodes. On Windows, this removes the on-disk
* placeholder.
*
* This should be called when an entry is added, removed, or changed.
* Invalidating upon removal is required because the kernel maintains a
* negative cache on lookup failures on Unices.
*
* This is safe to call while holding the contents_ lock, but it is not
* required. Calling it without the contents_ lock held is preferable when
* possible.
*/
void invalidateChannelEntryCache(PathComponentPiece name);
/**
* Attempt to remove an empty directory during a checkout operation.
*