author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
Wed, 22 Apr 2009 00:23:40 +0900 | |
changeset 8554 | 47d7347484f5 |
parent 8553 | e387ecd7a6ed |
child 8555 | 3e09bc5fee12 |
permissions | -rw-r--r-- |
6239 | 1 |
# server.py - inotify status server |
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 |
46293a0c7e9f
updated license to be explicit about GPL version 2
Martin Geisler <mg@lazybytes.net>
parents:
8209
diff
changeset
|
7 |
# GNU General Public License version 2, incorporated herein by reference. |
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 _ |
7420
b4ac1e2cd38c
inotify: remove unused imports (thanks pyflakes)
Brendan Cully <brendan@kublai.com>
parents:
7351
diff
changeset
|
10 |
from mercurial import osutil, util |
6239 | 11 |
import common |
6997
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
12 |
import errno, os, select, socket, stat, struct, sys, tempfile, time |
6239 | 13 |
|
14 |
try: |
|
6994
bf727bab38b9
Use relative imports in inotify.server.
Brendan Cully <brendan@kublai.com>
parents:
6287
diff
changeset
|
15 |
import linux as inotify |
bf727bab38b9
Use relative imports in inotify.server.
Brendan Cully <brendan@kublai.com>
parents:
6287
diff
changeset
|
16 |
from linux import watcher |
6239 | 17 |
except ImportError: |
18 |
raise |
|
19 |
||
20 |
class AlreadyStartedException(Exception): pass |
|
21 |
||
22 |
def join(a, b): |
|
23 |
if a: |
|
24 |
if a[-1] == '/': |
|
25 |
return a + b |
|
26 |
return a + '/' + b |
|
27 |
return b |
|
28 |
||
29 |
walk_ignored_errors = (errno.ENOENT, errno.ENAMETOOLONG) |
|
30 |
||
31 |
def walkrepodirs(repo): |
|
32 |
'''Iterate over all subdirectories of this repo. |
|
33 |
Exclude the .hg directory, any nested repos, and ignored dirs.''' |
|
34 |
rootslash = repo.root + os.sep |
|
8322
3c6c21eb3416
inotify: inotify.server.walkrepodirs() simplify walking
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8321
diff
changeset
|
35 |
|
6239 | 36 |
def walkit(dirname, top): |
8321
ec985dcfd7da
inotify: inotify.server.walkrepodirs() simplify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8320
diff
changeset
|
37 |
fullpath = rootslash + dirname |
6239 | 38 |
try: |
8321
ec985dcfd7da
inotify: inotify.server.walkrepodirs() simplify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8320
diff
changeset
|
39 |
for name, kind in osutil.listdir(fullpath): |
6239 | 40 |
if kind == stat.S_IFDIR: |
41 |
if name == '.hg': |
|
8323
589a82fb02a2
inotify: inotify.server.walk*() cleanup
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8322
diff
changeset
|
42 |
if not top: |
589a82fb02a2
inotify: inotify.server.walk*() cleanup
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8322
diff
changeset
|
43 |
return |
6239 | 44 |
else: |
45 |
d = join(dirname, name) |
|
46 |
if repo.dirstate._ignore(d): |
|
47 |
continue |
|
8322
3c6c21eb3416
inotify: inotify.server.walkrepodirs() simplify walking
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8321
diff
changeset
|
48 |
for subdir in walkit(d, False): |
3c6c21eb3416
inotify: inotify.server.walkrepodirs() simplify walking
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8321
diff
changeset
|
49 |
yield subdir |
6239 | 50 |
except OSError, err: |
51 |
if err.errno not in walk_ignored_errors: |
|
52 |
raise |
|
8324
b923d599c309
inotify: inotify.server.walk*() remove unnecessary var
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8323
diff
changeset
|
53 |
yield fullpath |
8322
3c6c21eb3416
inotify: inotify.server.walkrepodirs() simplify walking
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8321
diff
changeset
|
54 |
|
3c6c21eb3416
inotify: inotify.server.walkrepodirs() simplify walking
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8321
diff
changeset
|
55 |
return walkit('', True) |
6239 | 56 |
|
57 |
def walk(repo, root): |
|
58 |
'''Like os.walk, but only yields regular files.''' |
|
59 |
||
60 |
# This function is critical to performance during startup. |
|
61 |
||
62 |
rootslash = repo.root + os.sep |
|
63 |
||
64 |
def walkit(root, reporoot): |
|
65 |
files, dirs = [], [] |
|
66 |
||
67 |
try: |
|
68 |
fullpath = rootslash + root |
|
69 |
for name, kind in osutil.listdir(fullpath): |
|
70 |
if kind == stat.S_IFDIR: |
|
71 |
if name == '.hg': |
|
8325
f2559645643a
inotify: inotify.server.walk() simplify control flow
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8324
diff
changeset
|
72 |
if not reporoot: |
8323
589a82fb02a2
inotify: inotify.server.walk*() cleanup
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8322
diff
changeset
|
73 |
return |
8325
f2559645643a
inotify: inotify.server.walk() simplify control flow
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8324
diff
changeset
|
74 |
else: |
f2559645643a
inotify: inotify.server.walk() simplify control flow
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8324
diff
changeset
|
75 |
dirs.append(name) |
8381
f52fcc864df4
inotify: server.walk(): use yield instead of for
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8336
diff
changeset
|
76 |
path = join(root, name) |
f52fcc864df4
inotify: server.walk(): use yield instead of for
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8336
diff
changeset
|
77 |
if repo.dirstate._ignore(path): |
f52fcc864df4
inotify: server.walk(): use yield instead of for
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8336
diff
changeset
|
78 |
continue |
f52fcc864df4
inotify: server.walk(): use yield instead of for
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8336
diff
changeset
|
79 |
for result in walkit(path, False): |
f52fcc864df4
inotify: server.walk(): use yield instead of for
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8336
diff
changeset
|
80 |
yield result |
6239 | 81 |
elif kind in (stat.S_IFREG, stat.S_IFLNK): |
8334
0695288e8c37
inotify: inotify.server.walk() filetype is never used, do not yield it
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8325
diff
changeset
|
82 |
files.append(name) |
8324
b923d599c309
inotify: inotify.server.walk*() remove unnecessary var
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8323
diff
changeset
|
83 |
yield fullpath, dirs, files |
6239 | 84 |
|
85 |
except OSError, err: |
|
86 |
if err.errno not in walk_ignored_errors: |
|
87 |
raise |
|
8320
a1305c1c8d8e
inotify: inotify.server.walk() simplify algorithm
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8319
diff
changeset
|
88 |
|
a1305c1c8d8e
inotify: inotify.server.walk() simplify algorithm
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8319
diff
changeset
|
89 |
return walkit(root, root == '') |
6239 | 90 |
|
91 |
def _explain_watch_limit(ui, repo, count): |
|
92 |
path = '/proc/sys/fs/inotify/max_user_watches' |
|
93 |
try: |
|
94 |
limit = int(file(path).read()) |
|
95 |
except IOError, err: |
|
96 |
if err.errno != errno.ENOENT: |
|
97 |
raise |
|
98 |
raise util.Abort(_('this system does not seem to ' |
|
99 |
'support inotify')) |
|
100 |
ui.warn(_('*** the current per-user limit on the number ' |
|
101 |
'of inotify watches is %s\n') % limit) |
|
102 |
ui.warn(_('*** this limit is too low to watch every ' |
|
103 |
'directory in this repository\n')) |
|
104 |
ui.warn(_('*** counting directories: ')) |
|
105 |
ndirs = len(list(walkrepodirs(repo))) |
|
106 |
ui.warn(_('found %d\n') % ndirs) |
|
107 |
newlimit = min(limit, 1024) |
|
108 |
while newlimit < ((limit + ndirs) * 1.1): |
|
109 |
newlimit *= 2 |
|
110 |
ui.warn(_('*** to raise the limit from %d to %d (run as root):\n') % |
|
111 |
(limit, newlimit)) |
|
112 |
ui.warn(_('*** echo %d > %s\n') % (newlimit, path)) |
|
113 |
raise util.Abort(_('cannot watch %s until inotify watch limit is raised') |
|
114 |
% repo.root) |
|
115 |
||
8385
1536501ade62
inotify: Coding Style: name classes in lowercase.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8384
diff
changeset
|
116 |
class repowatcher(object): |
6239 | 117 |
poll_events = select.POLLIN |
118 |
statuskeys = 'almr!?' |
|
8383
dcfdcb51ac5c
inotify: make mask a class variable since it's instance-independant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8382
diff
changeset
|
119 |
mask = ( |
dcfdcb51ac5c
inotify: make mask a class variable since it's instance-independant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8382
diff
changeset
|
120 |
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
|
121 |
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
|
122 |
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
|
123 |
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
|
124 |
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
|
125 |
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
|
126 |
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
|
127 |
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
|
128 |
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
|
129 |
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
|
130 |
0) |
6239 | 131 |
|
132 |
def __init__(self, ui, repo, master): |
|
133 |
self.ui = ui |
|
134 |
self.repo = repo |
|
135 |
self.wprefix = self.repo.wjoin('') |
|
136 |
self.timeout = None |
|
137 |
self.master = master |
|
138 |
try: |
|
8385
1536501ade62
inotify: Coding Style: name classes in lowercase.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8384
diff
changeset
|
139 |
self.watcher = watcher.watcher() |
6239 | 140 |
except OSError, err: |
141 |
raise util.Abort(_('inotify service not available: %s') % |
|
142 |
err.strerror) |
|
8385
1536501ade62
inotify: Coding Style: name classes in lowercase.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8384
diff
changeset
|
143 |
self.threshold = watcher.threshold(self.watcher) |
6239 | 144 |
self.registered = True |
145 |
self.fileno = self.watcher.fileno |
|
146 |
||
147 |
self.repo.dirstate.__class__.inotifyserver = True |
|
148 |
||
149 |
self.tree = {} |
|
150 |
self.statcache = {} |
|
151 |
self.statustrees = dict([(s, {}) for s in self.statuskeys]) |
|
152 |
||
153 |
self.watches = 0 |
|
154 |
self.last_event = None |
|
155 |
||
156 |
self.eventq = {} |
|
157 |
self.deferred = 0 |
|
158 |
||
159 |
self.ds_info = self.dirstate_info() |
|
160 |
self.scan() |
|
161 |
||
162 |
def event_time(self): |
|
163 |
last = self.last_event |
|
164 |
now = time.time() |
|
165 |
self.last_event = now |
|
166 |
||
167 |
if last is None: |
|
168 |
return 'start' |
|
169 |
delta = now - last |
|
170 |
if delta < 5: |
|
171 |
return '+%.3f' % delta |
|
172 |
if delta < 50: |
|
173 |
return '+%.2f' % delta |
|
174 |
return '+%.1f' % delta |
|
175 |
||
176 |
def dirstate_info(self): |
|
177 |
try: |
|
178 |
st = os.lstat(self.repo.join('dirstate')) |
|
179 |
return st.st_mtime, st.st_ino |
|
180 |
except OSError, err: |
|
181 |
if err.errno != errno.ENOENT: |
|
182 |
raise |
|
183 |
return 0, 0 |
|
184 |
||
185 |
def add_watch(self, path, mask): |
|
186 |
if not path: |
|
187 |
return |
|
188 |
if self.watcher.path(path) is None: |
|
189 |
if self.ui.debugflag: |
|
190 |
self.ui.note(_('watching %r\n') % path[len(self.wprefix):]) |
|
191 |
try: |
|
192 |
self.watcher.add(path, mask) |
|
193 |
self.watches += 1 |
|
194 |
except OSError, err: |
|
195 |
if err.errno in (errno.ENOENT, errno.ENOTDIR): |
|
196 |
return |
|
197 |
if err.errno != errno.ENOSPC: |
|
198 |
raise |
|
199 |
_explain_watch_limit(self.ui, self.repo, self.watches) |
|
200 |
||
201 |
def setup(self): |
|
202 |
self.ui.note(_('watching directories under %r\n') % self.repo.root) |
|
203 |
self.add_watch(self.repo.path, inotify.IN_DELETE) |
|
204 |
self.check_dirstate() |
|
205 |
||
206 |
def wpath(self, evt): |
|
207 |
path = evt.fullpath |
|
208 |
if path == self.repo.root: |
|
209 |
return '' |
|
210 |
if path.startswith(self.wprefix): |
|
211 |
return path[len(self.wprefix):] |
|
212 |
raise 'wtf? ' + path |
|
213 |
||
214 |
def dir(self, tree, path): |
|
215 |
if path: |
|
216 |
for name in path.split('/'): |
|
8384
483d9b2103da
inotify: dic.setdefault(k, d) ; v = dic[k] --> v = dic.setdefault(k, d)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8383
diff
changeset
|
217 |
tree = tree.setdefault(name, {}) |
6239 | 218 |
return tree |
219 |
||
220 |
def lookup(self, path, tree): |
|
221 |
if path: |
|
222 |
try: |
|
223 |
for name in path.split('/'): |
|
224 |
tree = tree[name] |
|
225 |
except KeyError: |
|
7351
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
226 |
return 'x' |
6239 | 227 |
except TypeError: |
7351
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
228 |
return 'd' |
6239 | 229 |
return tree |
230 |
||
231 |
def split(self, path): |
|
232 |
c = path.rfind('/') |
|
233 |
if c == -1: |
|
234 |
return '', path |
|
235 |
return path[:c], path[c+1:] |
|
236 |
||
237 |
def filestatus(self, fn, st): |
|
238 |
try: |
|
239 |
type_, mode, size, time = self.repo.dirstate._map[fn][:4] |
|
240 |
except KeyError: |
|
241 |
type_ = '?' |
|
242 |
if type_ == 'n': |
|
243 |
st_mode, st_size, st_mtime = st |
|
7082
be81b4788115
inotify: fix confusion on files in lookup state
Matt Mackall <mpm@selenic.com>
parents:
6998
diff
changeset
|
244 |
if size == -1: |
be81b4788115
inotify: fix confusion on files in lookup state
Matt Mackall <mpm@selenic.com>
parents:
6998
diff
changeset
|
245 |
return 'l' |
6239 | 246 |
if size and (size != st_size or (mode ^ st_mode) & 0100): |
247 |
return 'm' |
|
248 |
if time != int(st_mtime): |
|
249 |
return 'l' |
|
250 |
return 'n' |
|
251 |
if type_ == '?' and self.repo.dirstate._ignore(fn): |
|
252 |
return 'i' |
|
253 |
return type_ |
|
254 |
||
8382
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
255 |
def updatestatus(self, wfn, osstat=None, newstatus=None): |
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
256 |
''' |
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
257 |
Update the stored status of a file or directory. |
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
258 |
|
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
259 |
osstat: (mode, size, time) tuple, as returned by os.lstat(wfn) |
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
260 |
|
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
261 |
newstatus: char in statuskeys, new status to apply. |
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
262 |
''' |
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
263 |
if osstat: |
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
264 |
newstatus = self.filestatus(wfn, osstat) |
6239 | 265 |
else: |
266 |
self.statcache.pop(wfn, None) |
|
267 |
root, fn = self.split(wfn) |
|
268 |
d = self.dir(self.tree, root) |
|
7351
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
269 |
oldstatus = d.get(fn) |
6239 | 270 |
isdir = False |
271 |
if oldstatus: |
|
272 |
try: |
|
8382
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
273 |
if not newstatus: |
6239 | 274 |
if oldstatus in 'almn': |
8382
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
275 |
newstatus = '!' |
6239 | 276 |
elif oldstatus == 'r': |
8382
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
277 |
newstatus = 'r' |
6239 | 278 |
except TypeError: |
279 |
# oldstatus may be a dict left behind by a deleted |
|
280 |
# directory |
|
281 |
isdir = True |
|
282 |
else: |
|
8382
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
283 |
if oldstatus in self.statuskeys and oldstatus != newstatus: |
6239 | 284 |
del self.dir(self.statustrees[oldstatus], root)[fn] |
8382
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
285 |
if self.ui.debugflag and oldstatus != newstatus: |
6239 | 286 |
if isdir: |
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
287 |
self.ui.note(_('status: %r dir(%d) -> %s\n') % |
8382
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
288 |
(wfn, len(oldstatus), newstatus)) |
6239 | 289 |
else: |
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
290 |
self.ui.note(_('status: %r %s -> %s\n') % |
8382
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
291 |
(wfn, oldstatus, newstatus)) |
6239 | 292 |
if not isdir: |
8382
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
293 |
if newstatus and newstatus != 'i': |
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
294 |
d[fn] = newstatus |
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
295 |
if newstatus in self.statuskeys: |
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
296 |
dd = self.dir(self.statustrees[newstatus], root) |
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
297 |
if oldstatus != newstatus or fn not in dd: |
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
298 |
dd[fn] = newstatus |
6239 | 299 |
else: |
300 |
d.pop(fn, None) |
|
8382
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
301 |
elif not newstatus: |
7892
67e59a9886d5
Fixing issue1542, adding a relevant test
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7451
diff
changeset
|
302 |
# a directory is being removed, check its contents |
67e59a9886d5
Fixing issue1542, adding a relevant test
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7451
diff
changeset
|
303 |
for subfile, b in oldstatus.copy().iteritems(): |
67e59a9886d5
Fixing issue1542, adding a relevant test
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7451
diff
changeset
|
304 |
self.updatestatus(wfn + '/' + subfile, None) |
67e59a9886d5
Fixing issue1542, adding a relevant test
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7451
diff
changeset
|
305 |
|
6239 | 306 |
|
307 |
def check_deleted(self, key): |
|
308 |
# Files that had been deleted but were present in the dirstate |
|
309 |
# may have vanished from the dirstate; we must clean them up. |
|
310 |
nuke = [] |
|
311 |
for wfn, ignore in self.walk(key, self.statustrees[key]): |
|
312 |
if wfn not in self.repo.dirstate: |
|
313 |
nuke.append(wfn) |
|
314 |
for wfn in nuke: |
|
315 |
root, fn = self.split(wfn) |
|
316 |
del self.dir(self.statustrees[key], root)[fn] |
|
317 |
del self.dir(self.tree, root)[fn] |
|
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
318 |
|
6239 | 319 |
def scan(self, topdir=''): |
320 |
self.handle_timeout() |
|
321 |
ds = self.repo.dirstate._map.copy() |
|
322 |
self.add_watch(join(self.repo.root, topdir), self.mask) |
|
8334
0695288e8c37
inotify: inotify.server.walk() filetype is never used, do not yield it
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8325
diff
changeset
|
323 |
for root, dirs, files in walk(self.repo, topdir): |
6239 | 324 |
for d in dirs: |
325 |
self.add_watch(join(root, d), self.mask) |
|
326 |
wroot = root[len(self.wprefix):] |
|
327 |
d = self.dir(self.tree, wroot) |
|
8334
0695288e8c37
inotify: inotify.server.walk() filetype is never used, do not yield it
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8325
diff
changeset
|
328 |
for fn in files: |
6239 | 329 |
wfn = join(wroot, fn) |
330 |
self.updatestatus(wfn, self.getstat(wfn)) |
|
331 |
ds.pop(wfn, None) |
|
332 |
wtopdir = topdir |
|
333 |
if wtopdir and wtopdir[-1] != '/': |
|
334 |
wtopdir += '/' |
|
335 |
for wfn, state in ds.iteritems(): |
|
336 |
if not wfn.startswith(wtopdir): |
|
337 |
continue |
|
7302
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
7280
diff
changeset
|
338 |
try: |
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
7280
diff
changeset
|
339 |
st = self.stat(wfn) |
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
7280
diff
changeset
|
340 |
except OSError: |
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
7280
diff
changeset
|
341 |
status = state[0] |
8382
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
342 |
self.updatestatus(wfn, None, newstatus=status) |
6239 | 343 |
else: |
7086
4033195d455b
inotify: avoid status getting out of sync
Matt Mackall <mpm@selenic.com>
parents:
7085
diff
changeset
|
344 |
self.updatestatus(wfn, st) |
6239 | 345 |
self.check_deleted('!') |
346 |
self.check_deleted('r') |
|
347 |
||
348 |
def check_dirstate(self): |
|
349 |
ds_info = self.dirstate_info() |
|
350 |
if ds_info == self.ds_info: |
|
351 |
return |
|
352 |
self.ds_info = ds_info |
|
353 |
if not self.ui.debugflag: |
|
354 |
self.last_event = None |
|
355 |
self.ui.note(_('%s dirstate reload\n') % self.event_time()) |
|
356 |
self.repo.dirstate.invalidate() |
|
357 |
self.scan() |
|
358 |
self.ui.note(_('%s end dirstate reload\n') % self.event_time()) |
|
359 |
||
360 |
def walk(self, states, tree, prefix=''): |
|
361 |
# This is the "inner loop" when talking to the client. |
|
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
362 |
|
6239 | 363 |
for name, val in tree.iteritems(): |
364 |
path = join(prefix, name) |
|
7351
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
365 |
try: |
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
366 |
if val in states: |
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
367 |
yield path, val |
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
368 |
except TypeError: |
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
369 |
for p in self.walk(states, val, path): |
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
370 |
yield p |
6239 | 371 |
|
372 |
def update_hgignore(self): |
|
373 |
# An update of the ignore file can potentially change the |
|
374 |
# states of all unknown and ignored files. |
|
375 |
||
376 |
# XXX If the user has other ignore files outside the repo, or |
|
377 |
# changes their list of ignore files at run time, we'll |
|
378 |
# potentially never see changes to them. We could get the |
|
379 |
# client to report to us what ignore data they're using. |
|
380 |
# But it's easier to do nothing than to open that can of |
|
381 |
# worms. |
|
382 |
||
7085
1fcc282e2c43
inotify: fixup rebuilding ignore
Matt Mackall <mpm@selenic.com>
parents:
7082
diff
changeset
|
383 |
if '_ignore' in self.repo.dirstate.__dict__: |
1fcc282e2c43
inotify: fixup rebuilding ignore
Matt Mackall <mpm@selenic.com>
parents:
7082
diff
changeset
|
384 |
delattr(self.repo.dirstate, '_ignore') |
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
385 |
self.ui.note(_('rescanning due to .hgignore change\n')) |
6239 | 386 |
self.scan() |
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
387 |
|
6239 | 388 |
def getstat(self, wpath): |
389 |
try: |
|
390 |
return self.statcache[wpath] |
|
391 |
except KeyError: |
|
392 |
try: |
|
393 |
return self.stat(wpath) |
|
394 |
except OSError, err: |
|
395 |
if err.errno != errno.ENOENT: |
|
396 |
raise |
|
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
397 |
|
6239 | 398 |
def stat(self, wpath): |
399 |
try: |
|
400 |
st = os.lstat(join(self.wprefix, wpath)) |
|
401 |
ret = st.st_mode, st.st_size, st.st_mtime |
|
402 |
self.statcache[wpath] = ret |
|
403 |
return ret |
|
7280
810ca383da9c
remove unused variables
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7220
diff
changeset
|
404 |
except OSError: |
6239 | 405 |
self.statcache.pop(wpath, None) |
406 |
raise |
|
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
407 |
|
6239 | 408 |
def created(self, wpath): |
409 |
if wpath == '.hgignore': |
|
410 |
self.update_hgignore() |
|
411 |
try: |
|
412 |
st = self.stat(wpath) |
|
413 |
if stat.S_ISREG(st[0]): |
|
414 |
self.updatestatus(wpath, st) |
|
7280
810ca383da9c
remove unused variables
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7220
diff
changeset
|
415 |
except OSError: |
6239 | 416 |
pass |
417 |
||
418 |
def modified(self, wpath): |
|
419 |
if wpath == '.hgignore': |
|
420 |
self.update_hgignore() |
|
421 |
try: |
|
422 |
st = self.stat(wpath) |
|
423 |
if stat.S_ISREG(st[0]): |
|
424 |
if self.repo.dirstate[wpath] in 'lmn': |
|
425 |
self.updatestatus(wpath, st) |
|
426 |
except OSError: |
|
427 |
pass |
|
428 |
||
429 |
def deleted(self, wpath): |
|
430 |
if wpath == '.hgignore': |
|
431 |
self.update_hgignore() |
|
432 |
elif wpath.startswith('.hg/'): |
|
433 |
if wpath == '.hg/wlock': |
|
434 |
self.check_dirstate() |
|
435 |
return |
|
436 |
||
437 |
self.updatestatus(wpath, None) |
|
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
438 |
|
6239 | 439 |
def schedule_work(self, wpath, evt): |
8384
483d9b2103da
inotify: dic.setdefault(k, d) ; v = dic[k] --> v = dic.setdefault(k, d)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8383
diff
changeset
|
440 |
prev = self.eventq.setdefault(wpath, []) |
6239 | 441 |
try: |
442 |
if prev and evt == 'm' and prev[-1] in 'cm': |
|
443 |
return |
|
444 |
self.eventq[wpath].append(evt) |
|
445 |
finally: |
|
446 |
self.deferred += 1 |
|
447 |
self.timeout = 250 |
|
448 |
||
449 |
def deferred_event(self, wpath, evt): |
|
450 |
if evt == 'c': |
|
451 |
self.created(wpath) |
|
452 |
elif evt == 'm': |
|
453 |
self.modified(wpath) |
|
454 |
elif evt == 'd': |
|
455 |
self.deleted(wpath) |
|
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
456 |
|
6239 | 457 |
def process_create(self, wpath, evt): |
458 |
if self.ui.debugflag: |
|
459 |
self.ui.note(_('%s event: created %s\n') % |
|
460 |
(self.event_time(), wpath)) |
|
461 |
||
462 |
if evt.mask & inotify.IN_ISDIR: |
|
463 |
self.scan(wpath) |
|
464 |
else: |
|
465 |
self.schedule_work(wpath, 'c') |
|
466 |
||
467 |
def process_delete(self, wpath, evt): |
|
468 |
if self.ui.debugflag: |
|
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
469 |
self.ui.note(_('%s event: deleted %s\n') % |
6239 | 470 |
(self.event_time(), wpath)) |
471 |
||
472 |
if evt.mask & inotify.IN_ISDIR: |
|
473 |
self.scan(wpath) |
|
7892
67e59a9886d5
Fixing issue1542, adding a relevant test
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7451
diff
changeset
|
474 |
self.schedule_work(wpath, 'd') |
6239 | 475 |
|
476 |
def process_modify(self, wpath, evt): |
|
477 |
if self.ui.debugflag: |
|
478 |
self.ui.note(_('%s event: modified %s\n') % |
|
479 |
(self.event_time(), wpath)) |
|
480 |
||
481 |
if not (evt.mask & inotify.IN_ISDIR): |
|
482 |
self.schedule_work(wpath, 'm') |
|
483 |
||
484 |
def process_unmount(self, evt): |
|
485 |
self.ui.warn(_('filesystem containing %s was unmounted\n') % |
|
486 |
evt.fullpath) |
|
487 |
sys.exit(0) |
|
488 |
||
489 |
def handle_event(self, fd, event): |
|
490 |
if self.ui.debugflag: |
|
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
491 |
self.ui.note(_('%s readable: %d bytes\n') % |
6239 | 492 |
(self.event_time(), self.threshold.readable())) |
493 |
if not self.threshold(): |
|
494 |
if self.registered: |
|
495 |
if self.ui.debugflag: |
|
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
496 |
self.ui.note(_('%s below threshold - unhooking\n') % |
6239 | 497 |
(self.event_time())) |
498 |
self.master.poll.unregister(fd) |
|
499 |
self.registered = False |
|
500 |
self.timeout = 250 |
|
501 |
else: |
|
502 |
self.read_events() |
|
503 |
||
504 |
def read_events(self, bufsize=None): |
|
505 |
events = self.watcher.read(bufsize) |
|
506 |
if self.ui.debugflag: |
|
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
507 |
self.ui.note(_('%s reading %d events\n') % |
6239 | 508 |
(self.event_time(), len(events))) |
509 |
for evt in events: |
|
510 |
wpath = self.wpath(evt) |
|
511 |
if evt.mask & inotify.IN_UNMOUNT: |
|
512 |
self.process_unmount(wpath, evt) |
|
513 |
elif evt.mask & (inotify.IN_MODIFY | inotify.IN_ATTRIB): |
|
514 |
self.process_modify(wpath, evt) |
|
515 |
elif evt.mask & (inotify.IN_DELETE | inotify.IN_DELETE_SELF | |
|
516 |
inotify.IN_MOVED_FROM): |
|
517 |
self.process_delete(wpath, evt) |
|
518 |
elif evt.mask & (inotify.IN_CREATE | inotify.IN_MOVED_TO): |
|
519 |
self.process_create(wpath, evt) |
|
520 |
||
521 |
def handle_timeout(self): |
|
522 |
if not self.registered: |
|
523 |
if self.ui.debugflag: |
|
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
524 |
self.ui.note(_('%s hooking back up with %d bytes readable\n') % |
6239 | 525 |
(self.event_time(), self.threshold.readable())) |
526 |
self.read_events(0) |
|
527 |
self.master.poll.register(self, select.POLLIN) |
|
528 |
self.registered = True |
|
529 |
||
530 |
if self.eventq: |
|
531 |
if self.ui.debugflag: |
|
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
532 |
self.ui.note(_('%s processing %d deferred events as %d\n') % |
6239 | 533 |
(self.event_time(), self.deferred, |
534 |
len(self.eventq))) |
|
8209
a1a5a57efe90
replace util.sort with sorted built-in
Matt Mackall <mpm@selenic.com>
parents:
7892
diff
changeset
|
535 |
for wpath, evts in sorted(self.eventq.iteritems()): |
6239 | 536 |
for evt in evts: |
537 |
self.deferred_event(wpath, evt) |
|
538 |
self.eventq.clear() |
|
539 |
self.deferred = 0 |
|
540 |
self.timeout = None |
|
541 |
||
542 |
def shutdown(self): |
|
543 |
self.watcher.close() |
|
544 |
||
8385
1536501ade62
inotify: Coding Style: name classes in lowercase.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8384
diff
changeset
|
545 |
class server(object): |
6239 | 546 |
poll_events = select.POLLIN |
547 |
||
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
548 |
def __init__(self, ui, repo, repowatcher, timeout): |
6239 | 549 |
self.ui = ui |
550 |
self.repo = repo |
|
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
551 |
self.repowatcher = repowatcher |
6239 | 552 |
self.timeout = timeout |
553 |
self.sock = socket.socket(socket.AF_UNIX) |
|
554 |
self.sockpath = self.repo.join('inotify.sock') |
|
6997
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
555 |
self.realsockpath = None |
6239 | 556 |
try: |
557 |
self.sock.bind(self.sockpath) |
|
558 |
except socket.error, err: |
|
559 |
if err[0] == errno.EADDRINUSE: |
|
6997
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
560 |
raise AlreadyStartedException(_('could not start server: %s') |
6239 | 561 |
% err[1]) |
6997
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
562 |
if err[0] == "AF_UNIX path too long": |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
563 |
tempdir = tempfile.mkdtemp(prefix="hg-inotify-") |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
564 |
self.realsockpath = os.path.join(tempdir, "inotify.sock") |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
565 |
try: |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
566 |
self.sock.bind(self.realsockpath) |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
567 |
os.symlink(self.realsockpath, self.sockpath) |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
568 |
except (OSError, socket.error), inst: |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
569 |
try: |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
570 |
os.unlink(self.realsockpath) |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
571 |
except: |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
572 |
pass |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
573 |
os.rmdir(tempdir) |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
574 |
if inst.errno == errno.EEXIST: |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
575 |
raise AlreadyStartedException(_('could not start server: %s') |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
576 |
% inst.strerror) |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
577 |
raise |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
578 |
else: |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
579 |
raise |
6239 | 580 |
self.sock.listen(5) |
581 |
self.fileno = self.sock.fileno |
|
582 |
||
583 |
def handle_timeout(self): |
|
584 |
pass |
|
585 |
||
8554
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
586 |
def answer_stat_query(self, cs): |
6239 | 587 |
names = cs.read().split('\0') |
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
588 |
|
6239 | 589 |
states = names.pop() |
590 |
||
591 |
self.ui.note(_('answering query for %r\n') % states) |
|
592 |
||
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
593 |
if self.repowatcher.timeout: |
6239 | 594 |
# We got a query while a rescan is pending. Make sure we |
595 |
# rescan before responding, or we could give back a wrong |
|
596 |
# answer. |
|
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
597 |
self.repowatcher.handle_timeout() |
6239 | 598 |
|
599 |
if not names: |
|
600 |
def genresult(states, tree): |
|
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
601 |
for fn, state in self.repowatcher.walk(states, tree): |
6239 | 602 |
yield fn |
603 |
else: |
|
604 |
def genresult(states, tree): |
|
605 |
for fn in names: |
|
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
606 |
l = self.repowatcher.lookup(fn, tree) |
7351
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
607 |
try: |
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
608 |
if l in states: |
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
609 |
yield fn |
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
610 |
except TypeError: |
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
611 |
for f, s in self.repowatcher.walk(states, l, fn): |
7351
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
612 |
yield f |
6239 | 613 |
|
8554
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
614 |
return ['\0'.join(r) for r in [ |
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
615 |
genresult('l', self.repowatcher.statustrees['l']), |
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
616 |
genresult('m', self.repowatcher.statustrees['m']), |
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
617 |
genresult('a', self.repowatcher.statustrees['a']), |
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
618 |
genresult('r', self.repowatcher.statustrees['r']), |
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
619 |
genresult('!', self.repowatcher.statustrees['!']), |
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
620 |
'?' in states |
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
621 |
and genresult('?', self.repowatcher.statustrees['?']) |
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
622 |
or [], |
6239 | 623 |
[], |
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
624 |
'c' in states and genresult('n', self.repowatcher.tree) or [], |
6239 | 625 |
]] |
626 |
||
8554
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
627 |
def handle_event(self, fd, event): |
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
628 |
sock, addr = self.sock.accept() |
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
629 |
|
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
630 |
cs = common.recvcs(sock) |
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
631 |
version = ord(cs.read(1)) |
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
632 |
|
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
633 |
if version != common.version: |
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
634 |
self.ui.warn(_('received query from incompatible client ' |
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
635 |
'version %d\n') % version) |
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
636 |
return |
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
637 |
|
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
638 |
type = cs.read(4) |
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
639 |
|
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
640 |
if type == 'STAT': |
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
641 |
results = self.answer_stat_query(cs) |
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
642 |
else: |
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
643 |
self.ui.warn(_('unrecognized query type: %s\n') % type) |
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
644 |
return |
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
645 |
|
6239 | 646 |
try: |
647 |
try: |
|
8386
4aad982111b6
inotify: Abstract the layer format and sizes to a inotify.common dictionary
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8385
diff
changeset
|
648 |
v = chr(common.version) |
4aad982111b6
inotify: Abstract the layer format and sizes to a inotify.common dictionary
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8385
diff
changeset
|
649 |
|
8553
e387ecd7a6ed
inotify: change protocol so that different query types can be supported.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8386
diff
changeset
|
650 |
sock.sendall(v + type + struct.pack(common.resphdrfmts[type], |
e387ecd7a6ed
inotify: change protocol so that different query types can be supported.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8386
diff
changeset
|
651 |
*map(len, results))) |
6239 | 652 |
sock.sendall(''.join(results)) |
653 |
finally: |
|
654 |
sock.shutdown(socket.SHUT_WR) |
|
655 |
except socket.error, err: |
|
656 |
if err[0] != errno.EPIPE: |
|
657 |
raise |
|
658 |
||
659 |
def shutdown(self): |
|
660 |
self.sock.close() |
|
661 |
try: |
|
662 |
os.unlink(self.sockpath) |
|
6997
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
663 |
if self.realsockpath: |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
664 |
os.unlink(self.realsockpath) |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
665 |
os.rmdir(os.path.dirname(self.realsockpath)) |
6239 | 666 |
except OSError, err: |
667 |
if err.errno != errno.ENOENT: |
|
668 |
raise |
|
669 |
||
8385
1536501ade62
inotify: Coding Style: name classes in lowercase.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8384
diff
changeset
|
670 |
class master(object): |
6239 | 671 |
def __init__(self, ui, repo, timeout=None): |
672 |
self.ui = ui |
|
673 |
self.repo = repo |
|
674 |
self.poll = select.poll() |
|
8385
1536501ade62
inotify: Coding Style: name classes in lowercase.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8384
diff
changeset
|
675 |
self.repowatcher = repowatcher(ui, repo, self) |
1536501ade62
inotify: Coding Style: name classes in lowercase.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8384
diff
changeset
|
676 |
self.server = server(ui, repo, self.repowatcher, timeout) |
6239 | 677 |
self.table = {} |
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
678 |
for obj in (self.repowatcher, self.server): |
6239 | 679 |
fd = obj.fileno() |
680 |
self.table[fd] = obj |
|
681 |
self.poll.register(fd, obj.poll_events) |
|
682 |
||
683 |
def register(self, fd, mask): |
|
684 |
self.poll.register(fd, mask) |
|
685 |
||
686 |
def shutdown(self): |
|
687 |
for obj in self.table.itervalues(): |
|
688 |
obj.shutdown() |
|
689 |
||
690 |
def run(self): |
|
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
691 |
self.repowatcher.setup() |
6239 | 692 |
self.ui.note(_('finished setup\n')) |
693 |
if os.getenv('TIME_STARTUP'): |
|
694 |
sys.exit(0) |
|
695 |
while True: |
|
696 |
timeout = None |
|
697 |
timeobj = None |
|
698 |
for obj in self.table.itervalues(): |
|
699 |
if obj.timeout is not None and (timeout is None or obj.timeout < timeout): |
|
700 |
timeout, timeobj = obj.timeout, obj |
|
701 |
try: |
|
702 |
if self.ui.debugflag: |
|
703 |
if timeout is None: |
|
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
704 |
self.ui.note(_('polling: no timeout\n')) |
6239 | 705 |
else: |
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
706 |
self.ui.note(_('polling: %sms timeout\n') % timeout) |
6239 | 707 |
events = self.poll.poll(timeout) |
708 |
except select.error, err: |
|
709 |
if err[0] == errno.EINTR: |
|
710 |
continue |
|
711 |
raise |
|
712 |
if events: |
|
713 |
for fd, event in events: |
|
714 |
self.table[fd].handle_event(fd, event) |
|
715 |
elif timeobj: |
|
716 |
timeobj.handle_timeout() |
|
717 |
||
718 |
def start(ui, repo): |
|
7451
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
719 |
def closefds(ignore): |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
720 |
# (from python bug #1177468) |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
721 |
# close all inherited file descriptors |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
722 |
# Python 2.4.1 and later use /dev/urandom to seed the random module's RNG |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
723 |
# a file descriptor is kept internally as os._urandomfd (created on demand |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
724 |
# the first time os.urandom() is called), and should not be closed |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
725 |
try: |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
726 |
os.urandom(4) |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
727 |
urandom_fd = getattr(os, '_urandomfd', None) |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
728 |
except AttributeError: |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
729 |
urandom_fd = None |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
730 |
ignore.append(urandom_fd) |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
731 |
for fd in range(3, 256): |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
732 |
if fd in ignore: |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
733 |
continue |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
734 |
try: |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
735 |
os.close(fd) |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
736 |
except OSError: |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
737 |
pass |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
738 |
|
8385
1536501ade62
inotify: Coding Style: name classes in lowercase.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8384
diff
changeset
|
739 |
m = master(ui, repo) |
6239 | 740 |
sys.stdout.flush() |
741 |
sys.stderr.flush() |
|
742 |
||
743 |
pid = os.fork() |
|
744 |
if pid: |
|
745 |
return pid |
|
746 |
||
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
747 |
closefds([m.server.fileno(), m.repowatcher.fileno()]) |
6239 | 748 |
os.setsid() |
749 |
||
750 |
fd = os.open('/dev/null', os.O_RDONLY) |
|
751 |
os.dup2(fd, 0) |
|
752 |
if fd > 0: |
|
753 |
os.close(fd) |
|
754 |
||
755 |
fd = os.open(ui.config('inotify', 'log', '/dev/null'), |
|
756 |
os.O_RDWR | os.O_CREAT | os.O_TRUNC) |
|
757 |
os.dup2(fd, 1) |
|
758 |
os.dup2(fd, 2) |
|
759 |
if fd > 2: |
|
760 |
os.close(fd) |
|
761 |
||
762 |
try: |
|
763 |
m.run() |
|
764 |
finally: |
|
765 |
m.shutdown() |
|
766 |
os._exit(0) |