[PATCH v2 1/2] fsmonitor: stop inline'ing mark_fsmonitor_valid / _invalid
From: Alex Vandiver <alexmv@dropbox.com>
These were inline'd when they were first introduced, presumably as an optimization for cases when they were called in tight loops. This complicates using these functions, as untracked_cache_invalidate_path is defined in dir.h.
Leave the inline'ing up to the compiler's decision, for ease of use.
Signed-off-by: Alex Vandiver <alexmv@dropbox.com>
Signed-off-by: Nipunn Koorapati <nipunn@dropbox.com>
---
fsmonitor.c | 19 +++++++++++++++++++
fsmonitor.h | 19 ++-----------------
2 files changed, 21 insertions(+), 17 deletions(-)
Show changes to 2 files +21 −17
fsmonitor.c, fsmonitor.h
diff --git a/fsmonitor.c b/fsmonitor.c
index ca031c3abb..e120b3c5a9 100644
--- a/fsmonitor.c
+++ b/fsmonitor.c
@@ -287,6 +287,25 @@ void refresh_fsmonitor(struct index_state *istate)
istate->fsmonitor_last_update = strbuf_detach(&last_update_token, NULL);
}
+void mark_fsmonitor_valid(struct index_state *istate, struct cache_entry *ce)
+{
+ if (core_fsmonitor && !(ce->ce_flags & CE_FSMONITOR_VALID)) {
+ istate->cache_changed = 1;
+ ce->ce_flags |= CE_FSMONITOR_VALID;
+ trace_printf_key(&trace_fsmonitor, "mark_fsmonitor_clean '%s'", ce->name);
+ }
+}
+
+void mark_fsmonitor_invalid(struct index_state *istate, struct cache_entry *ce)
+{
+ if (core_fsmonitor) {
+ ce->ce_flags &= ~CE_FSMONITOR_VALID;
+ untracked_cache_invalidate_path(istate, ce->name, 1);
+ trace_printf_key(&trace_fsmonitor, "mark_fsmonitor_invalid '%s'", ce->name);
+ }
+}
+
+
void add_fsmonitor(struct index_state *istate)
{
unsigned int i;
diff --git a/fsmonitor.h b/fsmonitor.h
index 739318ab6d..313a35fdc8 100644
--- a/fsmonitor.h
+++ b/fsmonitor.h
@@ -2,7 +2,6 @@
#define FSMONITOR_H
#include "cache.h"
-#include "dir.h"
extern struct trace_key trace_fsmonitor;
@@ -49,14 +48,7 @@ void refresh_fsmonitor(struct index_state *istate);
* called any time the cache entry has been updated to reflect the
* current state of the file on disk.
*/
-static inline void mark_fsmonitor_valid(struct index_state *istate, struct cache_entry *ce)
-{
- if (core_fsmonitor && !(ce->ce_flags & CE_FSMONITOR_VALID)) {
- istate->cache_changed = 1;
- ce->ce_flags |= CE_FSMONITOR_VALID;
- trace_printf_key(&trace_fsmonitor, "mark_fsmonitor_clean '%s'", ce->name);
- }
-}
+extern void mark_fsmonitor_valid(struct index_state *istate, struct cache_entry *ce);
/*
* Clear the given cache entry's CE_FSMONITOR_VALID bit and invalidate
@@ -65,13 +57,6 @@ static inline void mark_fsmonitor_valid(struct index_state *istate, struct cache
* trigger an lstat() or invalidate the untracked cache for the
* corresponding directory
*/
-static inline void mark_fsmonitor_invalid(struct index_state *istate, struct cache_entry *ce)
-{
- if (core_fsmonitor) {
- ce->ce_flags &= ~CE_FSMONITOR_VALID;
- untracked_cache_invalidate_path(istate, ce->name, 1);
- trace_printf_key(&trace_fsmonitor, "mark_fsmonitor_invalid '%s'", ce->name);
- }
-}
+extern void mark_fsmonitor_invalid(struct index_state *istate, struct cache_entry *ce);
#endif
--
gitgitgadget
Nipunn Koorapati via GitGitGadget
