Mercurial > hg
annotate hgext/inotify/linuxserver.py @ 10394:4612cded5176
fix coding style (reported by pylint)
author | Benoit Boissinot <benoit.boissinot@ens-lyon.org> |
---|---|
date | Mon, 08 Feb 2010 15:36:34 +0100 |
parents | 08a0f04b56bd |
children | 5ddde896a19d |
rev | line source |
---|---|
9933
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
1 # linuxserver.py - inotify status server for linux |
6239 | 2 # |
3 # Copyright 2006, 2007, 2008 Bryan O'Sullivan <bos@serpentine.com> | |
4 # Copyright 2007, 2008 Brendan Cully <brendan@kublai.com> | |
5 # | |
8225
46293a0c7e9f
updated license to be explicit about GPL version 2
Martin Geisler <mg@lazybytes.net>
parents:
8209
diff
changeset
|
6 # This software may be used and distributed according to the terms of the |
10263 | 7 # GNU General Public License version 2 or any later version. |
6239 | 8 |
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
9 from mercurial.i18n import _ |
9933
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
10 from mercurial import osutil, util |
6239 | 11 import common |
9933
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
12 import server |
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
13 import errno, os, select, stat, sys, time |
6239 | 14 |
15 try: | |
6994
bf727bab38b9
Use relative imports in inotify.server.
Brendan Cully <brendan@kublai.com>
parents:
6287
diff
changeset
|
16 import linux as inotify |
bf727bab38b9
Use relative imports in inotify.server.
Brendan Cully <brendan@kublai.com>
parents:
6287
diff
changeset
|
17 from linux import watcher |
6239 | 18 except ImportError: |
19 raise | |
20 | |
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
21 def walkrepodirs(dirstate, absroot): |
6239 | 22 '''Iterate over all subdirectories of this repo. |
23 Exclude the .hg directory, any nested repos, and ignored dirs.''' | |
24 def walkit(dirname, top): | |
9933
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
25 fullpath = server.join(absroot, dirname) |
6239 | 26 try: |
8321
ec985dcfd7da
inotify: inotify.server.walkrepodirs() simplify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8320
diff
changeset
|
27 for name, kind in osutil.listdir(fullpath): |
6239 | 28 if kind == stat.S_IFDIR: |
29 if name == '.hg': | |
8323
589a82fb02a2
inotify: inotify.server.walk*() cleanup
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8322
diff
changeset
|
30 if not top: |
589a82fb02a2
inotify: inotify.server.walk*() cleanup
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8322
diff
changeset
|
31 return |
6239 | 32 else: |
9933
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
33 d = server.join(dirname, name) |
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
34 if dirstate._ignore(d): |
6239 | 35 continue |
8322
3c6c21eb3416
inotify: inotify.server.walkrepodirs() simplify walking
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8321
diff
changeset
|
36 for subdir in walkit(d, False): |
3c6c21eb3416
inotify: inotify.server.walkrepodirs() simplify walking
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8321
diff
changeset
|
37 yield subdir |
6239 | 38 except OSError, err: |
9933
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
39 if err.errno not in server.walk_ignored_errors: |
6239 | 40 raise |
8324
b923d599c309
inotify: inotify.server.walk*() remove unnecessary var
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8323
diff
changeset
|
41 yield fullpath |
8322
3c6c21eb3416
inotify: inotify.server.walkrepodirs() simplify walking
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8321
diff
changeset
|
42 |
3c6c21eb3416
inotify: inotify.server.walkrepodirs() simplify walking
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8321
diff
changeset
|
43 return walkit('', True) |
6239 | 44 |
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
45 def _explain_watch_limit(ui, dirstate, rootabs): |
6239 | 46 path = '/proc/sys/fs/inotify/max_user_watches' |
47 try: | |
48 limit = int(file(path).read()) | |
49 except IOError, err: | |
50 if err.errno != errno.ENOENT: | |
51 raise | |
52 raise util.Abort(_('this system does not seem to ' | |
53 'support inotify')) | |
54 ui.warn(_('*** the current per-user limit on the number ' | |
55 'of inotify watches is %s\n') % limit) | |
56 ui.warn(_('*** this limit is too low to watch every ' | |
57 'directory in this repository\n')) | |
58 ui.warn(_('*** counting directories: ')) | |
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
59 ndirs = len(list(walkrepodirs(dirstate, rootabs))) |
6239 | 60 ui.warn(_('found %d\n') % ndirs) |
61 newlimit = min(limit, 1024) | |
62 while newlimit < ((limit + ndirs) * 1.1): | |
63 newlimit *= 2 | |
64 ui.warn(_('*** to raise the limit from %d to %d (run as root):\n') % | |
65 (limit, newlimit)) | |
66 ui.warn(_('*** echo %d > %s\n') % (newlimit, path)) | |
67 raise util.Abort(_('cannot watch %s until inotify watch limit is raised') | |
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
68 % rootabs) |
6239 | 69 |
8610
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
70 class pollable(object): |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
71 """ |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
72 Interface to support polling. |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
73 The file descriptor returned by fileno() is registered to a polling |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
74 object. |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
75 Usage: |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
76 Every tick, check if an event has happened since the last tick: |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
77 * If yes, call handle_events |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
78 * If no, call handle_timeout |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
79 """ |
6239 | 80 poll_events = select.POLLIN |
8792
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
81 instances = {} |
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
82 poll = select.poll() |
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
83 |
8610
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
84 def fileno(self): |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
85 raise NotImplementedError |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
86 |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
87 def handle_events(self, events): |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
88 raise NotImplementedError |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
89 |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
90 def handle_timeout(self): |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
91 raise NotImplementedError |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
92 |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
93 def shutdown(self): |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
94 raise NotImplementedError |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
95 |
8792
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
96 def register(self, timeout): |
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
97 fd = self.fileno() |
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
98 |
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
99 pollable.poll.register(fd, pollable.poll_events) |
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
100 pollable.instances[fd] = self |
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
101 |
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
102 self.registered = True |
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
103 self.timeout = timeout |
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
104 |
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
105 def unregister(self): |
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
106 pollable.poll.unregister(self) |
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
107 self.registered = False |
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
108 |
8793
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
109 @classmethod |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
110 def run(cls): |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
111 while True: |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
112 timeout = None |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
113 timeobj = None |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
114 for obj in cls.instances.itervalues(): |
10282
08a0f04b56bd
many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com>
parents:
10264
diff
changeset
|
115 if obj.timeout is not None and (timeout is None |
08a0f04b56bd
many, many trivial check-code fixups
Matt Mackall <mpm@selenic.com>
parents:
10264
diff
changeset
|
116 or obj.timeout < timeout): |
8793
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
117 timeout, timeobj = obj.timeout, obj |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
118 try: |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
119 events = cls.poll.poll(timeout) |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
120 except select.error, err: |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
121 if err[0] == errno.EINTR: |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
122 continue |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
123 raise |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
124 if events: |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
125 by_fd = {} |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
126 for fd, event in events: |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
127 by_fd.setdefault(fd, []).append(event) |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
128 |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
129 for fd, events in by_fd.iteritems(): |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
130 cls.instances[fd].handle_pollevents(events) |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
131 |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
132 elif timeobj: |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
133 timeobj.handle_timeout() |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
134 |
8791
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
135 def eventaction(code): |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
136 """ |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
137 Decorator to help handle events in repowatcher |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
138 """ |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
139 def decorator(f): |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
140 def wrapper(self, wpath): |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
141 if code == 'm' and wpath in self.lastevent and \ |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
142 self.lastevent[wpath] in 'cm': |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
143 return |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
144 self.lastevent[wpath] = code |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
145 self.timeout = 250 |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
146 |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
147 f(self, wpath) |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
148 |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
149 wrapper.func_name = f.func_name |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
150 return wrapper |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
151 return decorator |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
152 |
9933
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
153 class repowatcher(server.repowatcher, pollable): |
8610
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
154 """ |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
155 Watches inotify events |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
156 """ |
8383
dcfdcb51ac5c
inotify: make mask a class variable since it's instance-independant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8382
diff
changeset
|
157 mask = ( |
dcfdcb51ac5c
inotify: make mask a class variable since it's instance-independant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8382
diff
changeset
|
158 inotify.IN_ATTRIB | |
dcfdcb51ac5c
inotify: make mask a class variable since it's instance-independant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8382
diff
changeset
|
159 inotify.IN_CREATE | |
dcfdcb51ac5c
inotify: make mask a class variable since it's instance-independant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8382
diff
changeset
|
160 inotify.IN_DELETE | |
dcfdcb51ac5c
inotify: make mask a class variable since it's instance-independant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8382
diff
changeset
|
161 inotify.IN_DELETE_SELF | |
dcfdcb51ac5c
inotify: make mask a class variable since it's instance-independant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8382
diff
changeset
|
162 inotify.IN_MODIFY | |
dcfdcb51ac5c
inotify: make mask a class variable since it's instance-independant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8382
diff
changeset
|
163 inotify.IN_MOVED_FROM | |
dcfdcb51ac5c
inotify: make mask a class variable since it's instance-independant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8382
diff
changeset
|
164 inotify.IN_MOVED_TO | |
dcfdcb51ac5c
inotify: make mask a class variable since it's instance-independant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8382
diff
changeset
|
165 inotify.IN_MOVE_SELF | |
dcfdcb51ac5c
inotify: make mask a class variable since it's instance-independant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8382
diff
changeset
|
166 inotify.IN_ONLYDIR | |
dcfdcb51ac5c
inotify: make mask a class variable since it's instance-independant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8382
diff
changeset
|
167 inotify.IN_UNMOUNT | |
dcfdcb51ac5c
inotify: make mask a class variable since it's instance-independant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8382
diff
changeset
|
168 0) |
6239 | 169 |
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
170 def __init__(self, ui, dirstate, root): |
9933
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
171 server.repowatcher.__init__(self, ui, dirstate, root) |
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
172 |
9933
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
173 self.lastevent = {} |
10090
a3ad96ead8f0
inotify: do not rely on stat(.hg/dirstate) to invalidate our dirstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10089
diff
changeset
|
174 self.dirty = False |
6239 | 175 try: |
8385
1536501ade62
inotify: Coding Style: name classes in lowercase.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8384
diff
changeset
|
176 self.watcher = watcher.watcher() |
6239 | 177 except OSError, err: |
178 raise util.Abort(_('inotify service not available: %s') % | |
179 err.strerror) | |
8385
1536501ade62
inotify: Coding Style: name classes in lowercase.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8384
diff
changeset
|
180 self.threshold = watcher.threshold(self.watcher) |
6239 | 181 self.fileno = self.watcher.fileno |
8792
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
182 self.register(timeout=None) |
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
183 |
8604
578f2a0049cd
inotify: do not recurse in handle_timeout(): call it explicitely, not in scan()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8600
diff
changeset
|
184 self.handle_timeout() |
6239 | 185 self.scan() |
186 | |
187 def event_time(self): | |
188 last = self.last_event | |
189 now = time.time() | |
190 self.last_event = now | |
191 | |
192 if last is None: | |
193 return 'start' | |
194 delta = now - last | |
195 if delta < 5: | |
196 return '+%.3f' % delta | |
197 if delta < 50: | |
198 return '+%.2f' % delta | |
199 return '+%.1f' % delta | |
200 | |
201 def add_watch(self, path, mask): | |
202 if not path: | |
203 return | |
204 if self.watcher.path(path) is None: | |
205 if self.ui.debugflag: | |
9349
56fb15ad8fb1
inotify: server: use wprefix everywhere, introduce prefixlen
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9348
diff
changeset
|
206 self.ui.note(_('watching %r\n') % path[self.prefixlen:]) |
6239 | 207 try: |
208 self.watcher.add(path, mask) | |
209 except OSError, err: | |
210 if err.errno in (errno.ENOENT, errno.ENOTDIR): | |
211 return | |
212 if err.errno != errno.ENOSPC: | |
213 raise | |
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
214 _explain_watch_limit(self.ui, self.dirstate, self.wprefix) |
6239 | 215 |
216 def setup(self): | |
9349
56fb15ad8fb1
inotify: server: use wprefix everywhere, introduce prefixlen
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9348
diff
changeset
|
217 self.ui.note(_('watching directories under %r\n') % self.wprefix) |
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
218 self.add_watch(self.wprefix + '.hg', inotify.IN_DELETE) |
6239 | 219 |
220 def scan(self, topdir=''): | |
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
221 ds = self.dirstate._map.copy() |
9933
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
222 self.add_watch(server.join(self.wprefix, topdir), self.mask) |
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
223 for root, dirs, files in server.walk(self.dirstate, self.wprefix, |
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
224 topdir): |
6239 | 225 for d in dirs: |
9933
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
226 self.add_watch(server.join(root, d), self.mask) |
9349
56fb15ad8fb1
inotify: server: use wprefix everywhere, introduce prefixlen
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9348
diff
changeset
|
227 wroot = root[self.prefixlen:] |
8334
0695288e8c37
inotify: inotify.server.walk() filetype is never used, do not yield it
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8325
diff
changeset
|
228 for fn in files: |
9933
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
229 wfn = server.join(wroot, fn) |
8599
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
230 self.updatefile(wfn, self.getstat(wfn)) |
6239 | 231 ds.pop(wfn, None) |
232 wtopdir = topdir | |
233 if wtopdir and wtopdir[-1] != '/': | |
234 wtopdir += '/' | |
235 for wfn, state in ds.iteritems(): | |
236 if not wfn.startswith(wtopdir): | |
237 continue | |
7302
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
7280
diff
changeset
|
238 try: |
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
7280
diff
changeset
|
239 st = self.stat(wfn) |
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
7280
diff
changeset
|
240 except OSError: |
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
7280
diff
changeset
|
241 status = state[0] |
8599
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
242 self.deletefile(wfn, status) |
6239 | 243 else: |
8599
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
244 self.updatefile(wfn, st) |
6239 | 245 self.check_deleted('!') |
246 self.check_deleted('r') | |
247 | |
8606
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
248 @eventaction('c') |
6239 | 249 def created(self, wpath): |
250 if wpath == '.hgignore': | |
251 self.update_hgignore() | |
252 try: | |
253 st = self.stat(wpath) | |
10089
8fab31727037
inotify: follow new files if they are regular or a symlink.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9933
diff
changeset
|
254 if stat.S_ISREG(st[0]) or stat.S_ISLNK(st[0]): |
8599
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
255 self.updatefile(wpath, st) |
7280
810ca383da9c
remove unused variables
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7220
diff
changeset
|
256 except OSError: |
6239 | 257 pass |
258 | |
8606
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
259 @eventaction('m') |
6239 | 260 def modified(self, wpath): |
261 if wpath == '.hgignore': | |
262 self.update_hgignore() | |
263 try: | |
264 st = self.stat(wpath) | |
265 if stat.S_ISREG(st[0]): | |
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
266 if self.dirstate[wpath] in 'lmn': |
8599
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
267 self.updatefile(wpath, st) |
6239 | 268 except OSError: |
269 pass | |
270 | |
8606
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
271 @eventaction('d') |
6239 | 272 def deleted(self, wpath): |
273 if wpath == '.hgignore': | |
274 self.update_hgignore() | |
275 elif wpath.startswith('.hg/'): | |
276 return | |
277 | |
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
278 self.deletefile(wpath, self.dirstate[wpath]) |
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
279 |
6239 | 280 def process_create(self, wpath, evt): |
281 if self.ui.debugflag: | |
282 self.ui.note(_('%s event: created %s\n') % | |
283 (self.event_time(), wpath)) | |
284 | |
285 if evt.mask & inotify.IN_ISDIR: | |
286 self.scan(wpath) | |
287 else: | |
8606
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
288 self.created(wpath) |
6239 | 289 |
290 def process_delete(self, wpath, evt): | |
291 if self.ui.debugflag: | |
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
292 self.ui.note(_('%s event: deleted %s\n') % |
6239 | 293 (self.event_time(), wpath)) |
294 | |
295 if evt.mask & inotify.IN_ISDIR: | |
9115
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
296 tree = self.tree.dir(wpath) |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
297 todelete = [wfn for wfn, ignore in tree.walk('?')] |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
298 for fn in todelete: |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
299 self.deletefile(fn, '?') |
6239 | 300 self.scan(wpath) |
8600
d46cdfcecaf1
inotify: proper fix for issue1542 (partially reverting 67e59a9886d5)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8599
diff
changeset
|
301 else: |
8606
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
302 self.deleted(wpath) |
6239 | 303 |
304 def process_modify(self, wpath, evt): | |
305 if self.ui.debugflag: | |
306 self.ui.note(_('%s event: modified %s\n') % | |
307 (self.event_time(), wpath)) | |
308 | |
309 if not (evt.mask & inotify.IN_ISDIR): | |
8606
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
310 self.modified(wpath) |
6239 | 311 |
312 def process_unmount(self, evt): | |
313 self.ui.warn(_('filesystem containing %s was unmounted\n') % | |
314 evt.fullpath) | |
315 sys.exit(0) | |
316 | |
8609
aeaa0bd9dc24
inotify: process all inotify events in one batch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8608
diff
changeset
|
317 def handle_pollevents(self, events): |
6239 | 318 if self.ui.debugflag: |
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
319 self.ui.note(_('%s readable: %d bytes\n') % |
6239 | 320 (self.event_time(), self.threshold.readable())) |
321 if not self.threshold(): | |
322 if self.registered: | |
323 if self.ui.debugflag: | |
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
324 self.ui.note(_('%s below threshold - unhooking\n') % |
6239 | 325 (self.event_time())) |
8792
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
326 self.unregister() |
6239 | 327 self.timeout = 250 |
328 else: | |
329 self.read_events() | |
330 | |
331 def read_events(self, bufsize=None): | |
332 events = self.watcher.read(bufsize) | |
333 if self.ui.debugflag: | |
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
334 self.ui.note(_('%s reading %d events\n') % |
6239 | 335 (self.event_time(), len(events))) |
336 for evt in events: | |
10091
0ce645cc3f20
inotify: completely ignore events on the repository root
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10090
diff
changeset
|
337 if evt.fullpath == self.wprefix[:-1]: |
0ce645cc3f20
inotify: completely ignore events on the repository root
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10090
diff
changeset
|
338 # events on the root of the repository |
0ce645cc3f20
inotify: completely ignore events on the repository root
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10090
diff
changeset
|
339 # itself, e.g. permission changes or repository move |
0ce645cc3f20
inotify: completely ignore events on the repository root
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10090
diff
changeset
|
340 continue |
8953
e1d119f450f0
inotify: server: remove wpath method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8952
diff
changeset
|
341 assert evt.fullpath.startswith(self.wprefix) |
9349
56fb15ad8fb1
inotify: server: use wprefix everywhere, introduce prefixlen
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9348
diff
changeset
|
342 wpath = evt.fullpath[self.prefixlen:] |
8953
e1d119f450f0
inotify: server: remove wpath method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8952
diff
changeset
|
343 |
9117
a87bc6e2a907
inotify: server: explicitely ignore events in subdirs of .hg/ (issue1735)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9116
diff
changeset
|
344 # paths have been normalized, wpath never ends with a '/' |
a87bc6e2a907
inotify: server: explicitely ignore events in subdirs of .hg/ (issue1735)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9116
diff
changeset
|
345 |
a87bc6e2a907
inotify: server: explicitely ignore events in subdirs of .hg/ (issue1735)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9116
diff
changeset
|
346 if wpath.startswith('.hg/') and evt.mask & inotify.IN_ISDIR: |
a87bc6e2a907
inotify: server: explicitely ignore events in subdirs of .hg/ (issue1735)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9116
diff
changeset
|
347 # ignore subdirectories of .hg/ (merge, patches...) |
a87bc6e2a907
inotify: server: explicitely ignore events in subdirs of .hg/ (issue1735)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9116
diff
changeset
|
348 continue |
10090
a3ad96ead8f0
inotify: do not rely on stat(.hg/dirstate) to invalidate our dirstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10089
diff
changeset
|
349 if wpath == ".hg/wlock": |
a3ad96ead8f0
inotify: do not rely on stat(.hg/dirstate) to invalidate our dirstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10089
diff
changeset
|
350 if evt.mask & inotify.IN_DELETE: |
a3ad96ead8f0
inotify: do not rely on stat(.hg/dirstate) to invalidate our dirstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10089
diff
changeset
|
351 self.dirstate.invalidate() |
a3ad96ead8f0
inotify: do not rely on stat(.hg/dirstate) to invalidate our dirstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10089
diff
changeset
|
352 self.dirty = False |
a3ad96ead8f0
inotify: do not rely on stat(.hg/dirstate) to invalidate our dirstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10089
diff
changeset
|
353 self.scan() |
a3ad96ead8f0
inotify: do not rely on stat(.hg/dirstate) to invalidate our dirstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10089
diff
changeset
|
354 elif evt.mask & inotify.IN_CREATE: |
a3ad96ead8f0
inotify: do not rely on stat(.hg/dirstate) to invalidate our dirstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10089
diff
changeset
|
355 self.dirty = True |
a3ad96ead8f0
inotify: do not rely on stat(.hg/dirstate) to invalidate our dirstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10089
diff
changeset
|
356 else: |
a3ad96ead8f0
inotify: do not rely on stat(.hg/dirstate) to invalidate our dirstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10089
diff
changeset
|
357 if self.dirty: |
a3ad96ead8f0
inotify: do not rely on stat(.hg/dirstate) to invalidate our dirstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10089
diff
changeset
|
358 continue |
9117
a87bc6e2a907
inotify: server: explicitely ignore events in subdirs of .hg/ (issue1735)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9116
diff
changeset
|
359 |
10090
a3ad96ead8f0
inotify: do not rely on stat(.hg/dirstate) to invalidate our dirstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10089
diff
changeset
|
360 if evt.mask & inotify.IN_UNMOUNT: |
a3ad96ead8f0
inotify: do not rely on stat(.hg/dirstate) to invalidate our dirstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10089
diff
changeset
|
361 self.process_unmount(wpath, evt) |
a3ad96ead8f0
inotify: do not rely on stat(.hg/dirstate) to invalidate our dirstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10089
diff
changeset
|
362 elif evt.mask & (inotify.IN_MODIFY | inotify.IN_ATTRIB): |
a3ad96ead8f0
inotify: do not rely on stat(.hg/dirstate) to invalidate our dirstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10089
diff
changeset
|
363 self.process_modify(wpath, evt) |
a3ad96ead8f0
inotify: do not rely on stat(.hg/dirstate) to invalidate our dirstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10089
diff
changeset
|
364 elif evt.mask & (inotify.IN_DELETE | inotify.IN_DELETE_SELF | |
a3ad96ead8f0
inotify: do not rely on stat(.hg/dirstate) to invalidate our dirstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10089
diff
changeset
|
365 inotify.IN_MOVED_FROM): |
a3ad96ead8f0
inotify: do not rely on stat(.hg/dirstate) to invalidate our dirstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10089
diff
changeset
|
366 self.process_delete(wpath, evt) |
a3ad96ead8f0
inotify: do not rely on stat(.hg/dirstate) to invalidate our dirstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10089
diff
changeset
|
367 elif evt.mask & (inotify.IN_CREATE | inotify.IN_MOVED_TO): |
a3ad96ead8f0
inotify: do not rely on stat(.hg/dirstate) to invalidate our dirstate
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
10089
diff
changeset
|
368 self.process_create(wpath, evt) |
6239 | 369 |
8605
ed2d9bdbfad2
inotify: do not defer inotify events processing
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8604
diff
changeset
|
370 self.lastevent.clear() |
ed2d9bdbfad2
inotify: do not defer inotify events processing
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8604
diff
changeset
|
371 |
6239 | 372 def handle_timeout(self): |
373 if not self.registered: | |
374 if self.ui.debugflag: | |
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
375 self.ui.note(_('%s hooking back up with %d bytes readable\n') % |
6239 | 376 (self.event_time(), self.threshold.readable())) |
377 self.read_events(0) | |
8792
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
378 self.register(timeout=None) |
6239 | 379 |
380 self.timeout = None | |
381 | |
382 def shutdown(self): | |
383 self.watcher.close() | |
384 | |
8555
3e09bc5fee12
inotify: introduce debuginotify, which lists which paths are under watch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8554
diff
changeset
|
385 def debug(self): |
3e09bc5fee12
inotify: introduce debuginotify, which lists which paths are under watch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8554
diff
changeset
|
386 """ |
3e09bc5fee12
inotify: introduce debuginotify, which lists which paths are under watch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8554
diff
changeset
|
387 Returns a sorted list of relatives paths currently watched, |
3e09bc5fee12
inotify: introduce debuginotify, which lists which paths are under watch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8554
diff
changeset
|
388 for debugging purposes. |
3e09bc5fee12
inotify: introduce debuginotify, which lists which paths are under watch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8554
diff
changeset
|
389 """ |
9349
56fb15ad8fb1
inotify: server: use wprefix everywhere, introduce prefixlen
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9348
diff
changeset
|
390 return sorted(tuple[0][self.prefixlen:] for tuple in self.watcher) |
8555
3e09bc5fee12
inotify: introduce debuginotify, which lists which paths are under watch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8554
diff
changeset
|
391 |
9933
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
392 class socketlistener(server.socketlistener, pollable): |
8610
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
393 """ |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
394 Listens for client queries on unix socket inotify.sock |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
395 """ |
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
396 def __init__(self, ui, root, repowatcher, timeout): |
9933
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
397 server.socketlistener.__init__(self, ui, root, repowatcher, timeout) |
8792
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
398 self.register(timeout=timeout) |
6239 | 399 |
400 def handle_timeout(self): | |
401 pass | |
402 | |
8609
aeaa0bd9dc24
inotify: process all inotify events in one batch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8608
diff
changeset
|
403 def handle_pollevents(self, events): |
aeaa0bd9dc24
inotify: process all inotify events in one batch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8608
diff
changeset
|
404 for e in events: |
9933
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
405 self.accept_connection() |
6239 | 406 |
407 def shutdown(self): | |
408 self.sock.close() | |
409 try: | |
410 os.unlink(self.sockpath) | |
6997
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
411 if self.realsockpath: |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
412 os.unlink(self.realsockpath) |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
413 os.rmdir(os.path.dirname(self.realsockpath)) |
6239 | 414 except OSError, err: |
415 if err.errno != errno.ENOENT: | |
416 raise | |
417 | |
9933
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
418 def answer_stat_query(self, cs): |
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
419 if self.repowatcher.timeout: |
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
420 # We got a query while a rescan is pending. Make sure we |
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
421 # rescan before responding, or we could give back a wrong |
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
422 # answer. |
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
423 self.repowatcher.handle_timeout() |
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
424 return server.socketlistener.answer_stat_query(self, cs) |
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
425 |
8385
1536501ade62
inotify: Coding Style: name classes in lowercase.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8384
diff
changeset
|
426 class master(object): |
9351
206f7f4c5c2a
inotify: client: no repo use
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9350
diff
changeset
|
427 def __init__(self, ui, dirstate, root, timeout=None): |
6239 | 428 self.ui = ui |
9351
206f7f4c5c2a
inotify: client: no repo use
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9350
diff
changeset
|
429 self.repowatcher = repowatcher(ui, dirstate, root) |
9933
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
430 self.socketlistener = socketlistener(ui, root, self.repowatcher, |
2e7902158af9
inotify: create a common, OS-independent server entry point
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9900
diff
changeset
|
431 timeout) |
6239 | 432 |
433 def shutdown(self): | |
8792
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
434 for obj in pollable.instances.itervalues(): |
6239 | 435 obj.shutdown() |
436 | |
437 def run(self): | |
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
438 self.repowatcher.setup() |
6239 | 439 self.ui.note(_('finished setup\n')) |
440 if os.getenv('TIME_STARTUP'): | |
441 sys.exit(0) | |
8793
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
442 pollable.run() |