watch_entries() is a lot of computation and could trigger a lot more
lookups in file-watcher. Normally after the first set of watches are
in place, we do not need to update often. Moreover if the number of
entries is small, the overhead of file watcher may actually slow git
down.
This patch only allows to update watches if the number of watchable
files is over a limit (and there are new files added if this is not
the first time). Measurements on Core i5-2520M and Linux 3.7.6, about
920 lstat() take 1ms. Somewhere between 2^16 and 2^17 lstat calls that
it starts to take longer than 100ms. 2^16 is chosen at the minimum
limit to start using file watcher.
Of course this is only sensible default for single-repo use
case. Lower it when you need to work with many small repos.
Recently updated files are not considered watchable because they are
likely to be updated again soon, not worth the ping-pong game with
file watcher. The default limit 10min is just a random value. Recent
limit is ignored if there are no watched files (e.g. a fresh clone, or
after a bad hand shake with file watcher).
Signed-off-by: Nguyễn Thái Ngọc Duy <pclo...@gmail.com>
---
Documentation/config.txt | 9 +++++++
Documentation/technical/index-format.txt | 3 +++
cache.h | 1 +
file-watcher-lib.c | 42 ++++++++++++++++++++++++++------
read-cache.c | 11 ++++++---
5 files changed, 56 insertions(+), 10 deletions(-)
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 6ad653a..451c100 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1052,6 +1052,15 @@ filewatcher.timeout::
the file watcher to respond before giving up. Default value is
50. Setting to -1 makes Git wait forever.
+filewatcher.minfiles::
+ Start watching files if the number of watchable files are
+ above this limit. Default value is 65536.
+
+filewatcher.recentlimit::
+ Files that are last updated within filewatcher.recentlimit
+ seconds from now are not considered watchable. Default value
+ is 600 (5 minutes).
+
fetch.recurseSubmodules::
This option can be either set to a boolean value or to 'on-demand'.
Setting it to a boolean changes the behavior of fetch and pull to
diff --git a/Documentation/technical/index-format.txt
b/Documentation/technical/index-format.txt
index 24fd0ae..7081e55 100644
--- a/Documentation/technical/index-format.txt
+++ b/Documentation/technical/index-format.txt
@@ -204,3 +204,6 @@ Git index format
- A bit map of all entries in the index, n-th bit of m-th byte
corresponds to CE_WATCHED of the <m * 8+ n>-th index entry.
+
+ - 1-byte, non-zero indicates the index should be scanned for new
+ watched entries.
diff --git a/cache.h b/cache.h
index b3ea574..10ff33e 100644
--- a/cache.h
+++ b/cache.h
@@ -279,6 +279,7 @@ struct index_state {
struct cache_tree *cache_tree;
struct cache_time timestamp;
unsigned name_hash_initialized : 1,
+ update_watches : 1,
initialized : 1;
struct hash_table name_hash;
struct hash_table dir_hash;
diff --git a/file-watcher-lib.c b/file-watcher-lib.c
index 791faae..d4949a5 100644
--- a/file-watcher-lib.c
+++ b/file-watcher-lib.c
@@ -5,6 +5,8 @@
static char *watcher_path;
static int WAIT_TIME = 50; /* in ms */
+static int watch_lowerlimit = 65536;
+static int recent_limit = 600;
static int connect_watcher(const char *path)
{
@@ -22,12 +24,17 @@ static int connect_watcher(const char *path)
static void reset_watches(struct index_state *istate, int disconnect)
{
- int i;
+ int i, changed = 0;
for (i = 0; i < istate->cache_nr; i++)
if (istate->cache[i]->ce_flags & CE_WATCHED) {
istate->cache[i]->ce_flags &= ~(CE_WATCHED | CE_VALID);
- istate->cache_changed = 1;
+ changed = 1;
}
+ recent_limit = 0;
+ if (changed) {
+ istate->update_watches = 1;
+ istate->cache_changed = 1;
+ }
if (disconnect && istate->watcher > 0) {
close(istate->watcher);
istate->watcher = -1;
@@ -49,6 +56,14 @@ static int watcher_config(const char *var, const char
*value, void *data)
WAIT_TIME = git_config_int(var, value);
return 0;
}
+ if (!strcmp(var, "filewatcher.minfiles")) {
+ watch_lowerlimit = git_config_int(var, value);
+ return 0;
+ }
+ if (!strcmp(var, "filewatcher.recentlimit")) {
+ recent_limit = git_config_int(var, value);
+ return 0;
+ }
return 0;
}
@@ -63,12 +78,18 @@ void open_watcher(struct index_state *istate)
}
if (!read_config) {
+ int i;
/*
* can't hook into git_default_config because
* read_cache() may be called even before git_config()
* call.
*/
git_config(watcher_config, NULL);
+ for (i = 0; i < istate->cache_nr; i++)
+ if (istate->cache[i]->ce_flags & CE_WATCHED)
+ break;
+ if (i == istate->cache_nr)
+ recent_limit = 0;
read_config = 1;
}
@@ -86,6 +107,7 @@ void open_watcher(struct index_state *istate)
(msg = packet_read_line_timeout(istate->watcher, WAIT_TIME, NULL))
== NULL ||
strcmp(msg, "ok")) {
reset_watches(istate, 0);
+ istate->update_watches = 1;
return;
}
}
@@ -99,7 +121,7 @@ static int sort_by_date(const void *a_, const void *b_)
return seca - secb;
}
-static inline int ce_watchable(struct cache_entry *ce)
+static inline int ce_watchable(struct cache_entry *ce, time_t now)
{
return
!(ce->ce_flags & CE_WATCHED) &&
@@ -109,7 +131,8 @@ static inline int ce_watchable(struct cache_entry *ce)
* obviously. S_IFLNK could be problematic because
* inotify may follow symlinks without IN_DONT_FOLLOW
*/
- S_ISREG(ce->ce_mode);
+ S_ISREG(ce->ce_mode) &&
+ (ce->ce_stat_data.sd_mtime.sec + recent_limit <= now);
}
static void send_watches(struct index_state *istate,
@@ -158,15 +181,20 @@ void watch_entries(struct index_state *istate)
{
int i, nr;
struct cache_entry **sorted;
+ time_t now = time(NULL);
- if (istate->watcher <= 0)
+ if (istate->watcher <= 0 || !istate->update_watches)
return;
+ istate->update_watches = 0;
+ istate->cache_changed = 1;
for (i = nr = 0; i < istate->cache_nr; i++)
- if (ce_watchable(istate->cache[i]))
+ if (ce_watchable(istate->cache[i], now))
nr++;
+ if (nr < watch_lowerlimit)
+ return;
sorted = xmalloc(sizeof(*sorted) * nr);
for (i = nr = 0; i < istate->cache_nr; i++)
- if (ce_watchable(istate->cache[i]))
+ if (ce_watchable(istate->cache[i], now))
sorted[nr++] = istate->cache[i];
qsort(sorted, nr, sizeof(*sorted), sort_by_date);
send_watches(istate, sorted, nr);
diff --git a/read-cache.c b/read-cache.c
index cb2188f..dc49858 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1009,6 +1009,7 @@ int add_index_entry(struct index_state *istate, struct
cache_entry *ce, int opti
(istate->cache_nr - pos - 1) * sizeof(ce));
set_index_entry(istate, pos, ce);
istate->cache_changed = 1;
+ istate->update_watches = 1;
return 0;
}
@@ -1295,13 +1296,14 @@ static void read_watch_extension(struct index_state
*istate, uint8_t *data,
unsigned long sz)
{
int i;
- if ((istate->cache_nr + 7) / 8 != sz) {
+ if ((istate->cache_nr + 7) / 8 + 1 != sz) {
error("invalid 'WATC' extension");
return;
}
for (i = 0; i < istate->cache_nr; i++)
if (data[i / 8] & (1 << (i % 8)))
istate->cache[i]->ce_flags |= CE_WATCHED;
+ istate->update_watches = data[sz - 1];
}
static int read_index_extension(struct index_state *istate,
@@ -1488,6 +1490,7 @@ int read_index_from(struct index_state *istate, const
char *path)
istate->cache_alloc = alloc_nr(istate->cache_nr);
istate->cache = xcalloc(istate->cache_alloc, sizeof(*istate->cache));
istate->initialized = 1;
+ istate->update_watches = 1;
if (istate->version == 4)
previous_name = &previous_name_buf;
@@ -1896,8 +1899,9 @@ int write_index(struct index_state *istate, int newfd)
if (err)
return -1;
}
- if (has_watches) {
- int id, sz = (entries - removed + 7) / 8;
+ if (has_watches ||
+ (istate->watcher != -1 && !istate->update_watches)) {
+ int id, sz = (entries - removed + 7) / 8 + 1;
uint8_t *data = xmalloc(sz);
memset(data, 0, sz);
for (i = 0, id = 0; i < entries && has_watches; i++) {
@@ -1910,6 +1914,7 @@ int write_index(struct index_state *istate, int newfd)
}
id++;
}
+ data[sz - 1] = istate->update_watches;
err = write_index_ext_header(&c, newfd, CACHE_EXT_WATCH, sz) < 0
|| ce_write(&c, newfd, data, sz) < 0;
free(data);
--
1.8.5.2.240.g8478abd
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
