Mercurial > hg
annotate hgext/inotify/server.py @ 8383:dcfdcb51ac5c
inotify: make mask a class variable since it's instance-independant
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Fri, 08 May 2009 16:40:39 +0900 |
parents | 6f44b1adc948 |
children | 483d9b2103da |
rev | line source |
---|---|
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 | |
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
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: | |
139 self.watcher = watcher.Watcher() | |
140 except OSError, err: | |
141 raise util.Abort(_('inotify service not available: %s') % | |
142 err.strerror) | |
143 self.threshold = watcher.Threshold(self.watcher) | |
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('/'): | |
7351
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
217 tree.setdefault(name, {}) |
6239 | 218 tree = tree[name] |
219 return tree | |
220 | |
221 def lookup(self, path, tree): | |
222 if path: | |
223 try: | |
224 for name in path.split('/'): | |
225 tree = tree[name] | |
226 except KeyError: | |
7351
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
227 return 'x' |
6239 | 228 except TypeError: |
7351
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
229 return 'd' |
6239 | 230 return tree |
231 | |
232 def split(self, path): | |
233 c = path.rfind('/') | |
234 if c == -1: | |
235 return '', path | |
236 return path[:c], path[c+1:] | |
237 | |
238 def filestatus(self, fn, st): | |
239 try: | |
240 type_, mode, size, time = self.repo.dirstate._map[fn][:4] | |
241 except KeyError: | |
242 type_ = '?' | |
243 if type_ == 'n': | |
244 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
|
245 if size == -1: |
be81b4788115
inotify: fix confusion on files in lookup state
Matt Mackall <mpm@selenic.com>
parents:
6998
diff
changeset
|
246 return 'l' |
6239 | 247 if size and (size != st_size or (mode ^ st_mode) & 0100): |
248 return 'm' | |
249 if time != int(st_mtime): | |
250 return 'l' | |
251 return 'n' | |
252 if type_ == '?' and self.repo.dirstate._ignore(fn): | |
253 return 'i' | |
254 return type_ | |
255 | |
8382
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
256 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
|
257 ''' |
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
258 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
|
259 |
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
260 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
|
261 |
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
262 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
|
263 ''' |
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
264 if osstat: |
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
265 newstatus = self.filestatus(wfn, osstat) |
6239 | 266 else: |
267 self.statcache.pop(wfn, None) | |
268 root, fn = self.split(wfn) | |
269 d = self.dir(self.tree, root) | |
7351
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
270 oldstatus = d.get(fn) |
6239 | 271 isdir = False |
272 if oldstatus: | |
273 try: | |
8382
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
274 if not newstatus: |
6239 | 275 if oldstatus in 'almn': |
8382
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
276 newstatus = '!' |
6239 | 277 elif oldstatus == 'r': |
8382
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
278 newstatus = 'r' |
6239 | 279 except TypeError: |
280 # oldstatus may be a dict left behind by a deleted | |
281 # directory | |
282 isdir = True | |
283 else: | |
8382
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
284 if oldstatus in self.statuskeys and oldstatus != newstatus: |
6239 | 285 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
|
286 if self.ui.debugflag and oldstatus != newstatus: |
6239 | 287 if isdir: |
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
288 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
|
289 (wfn, len(oldstatus), newstatus)) |
6239 | 290 else: |
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
291 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
|
292 (wfn, oldstatus, newstatus)) |
6239 | 293 if not isdir: |
8382
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
294 if newstatus and newstatus != 'i': |
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
295 d[fn] = newstatus |
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
296 if newstatus in self.statuskeys: |
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
297 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
|
298 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
|
299 dd[fn] = newstatus |
6239 | 300 else: |
301 d.pop(fn, None) | |
8382
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
302 elif not newstatus: |
7892
67e59a9886d5
Fixing issue1542, adding a relevant test
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7451
diff
changeset
|
303 # 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
|
304 for subfile, b in oldstatus.copy().iteritems(): |
67e59a9886d5
Fixing issue1542, adding a relevant test
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7451
diff
changeset
|
305 self.updatestatus(wfn + '/' + subfile, None) |
67e59a9886d5
Fixing issue1542, adding a relevant test
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7451
diff
changeset
|
306 |
6239 | 307 |
308 def check_deleted(self, key): | |
309 # Files that had been deleted but were present in the dirstate | |
310 # may have vanished from the dirstate; we must clean them up. | |
311 nuke = [] | |
312 for wfn, ignore in self.walk(key, self.statustrees[key]): | |
313 if wfn not in self.repo.dirstate: | |
314 nuke.append(wfn) | |
315 for wfn in nuke: | |
316 root, fn = self.split(wfn) | |
317 del self.dir(self.statustrees[key], root)[fn] | |
318 del self.dir(self.tree, root)[fn] | |
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
319 |
6239 | 320 def scan(self, topdir=''): |
321 self.handle_timeout() | |
322 ds = self.repo.dirstate._map.copy() | |
323 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
|
324 for root, dirs, files in walk(self.repo, topdir): |
6239 | 325 for d in dirs: |
326 self.add_watch(join(root, d), self.mask) | |
327 wroot = root[len(self.wprefix):] | |
328 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
|
329 for fn in files: |
6239 | 330 wfn = join(wroot, fn) |
331 self.updatestatus(wfn, self.getstat(wfn)) | |
332 ds.pop(wfn, None) | |
333 wtopdir = topdir | |
334 if wtopdir and wtopdir[-1] != '/': | |
335 wtopdir += '/' | |
336 for wfn, state in ds.iteritems(): | |
337 if not wfn.startswith(wtopdir): | |
338 continue | |
7302
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
7280
diff
changeset
|
339 try: |
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
7280
diff
changeset
|
340 st = self.stat(wfn) |
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
7280
diff
changeset
|
341 except OSError: |
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
7280
diff
changeset
|
342 status = state[0] |
8382
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
343 self.updatestatus(wfn, None, newstatus=status) |
6239 | 344 else: |
7086
4033195d455b
inotify: avoid status getting out of sync
Matt Mackall <mpm@selenic.com>
parents:
7085
diff
changeset
|
345 self.updatestatus(wfn, st) |
6239 | 346 self.check_deleted('!') |
347 self.check_deleted('r') | |
348 | |
349 def check_dirstate(self): | |
350 ds_info = self.dirstate_info() | |
351 if ds_info == self.ds_info: | |
352 return | |
353 self.ds_info = ds_info | |
354 if not self.ui.debugflag: | |
355 self.last_event = None | |
356 self.ui.note(_('%s dirstate reload\n') % self.event_time()) | |
357 self.repo.dirstate.invalidate() | |
358 self.scan() | |
359 self.ui.note(_('%s end dirstate reload\n') % self.event_time()) | |
360 | |
361 def walk(self, states, tree, prefix=''): | |
362 # This is the "inner loop" when talking to the client. | |
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
363 |
6239 | 364 for name, val in tree.iteritems(): |
365 path = join(prefix, name) | |
7351
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
366 try: |
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
367 if val in states: |
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
368 yield path, val |
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
369 except TypeError: |
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
370 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
|
371 yield p |
6239 | 372 |
373 def update_hgignore(self): | |
374 # An update of the ignore file can potentially change the | |
375 # states of all unknown and ignored files. | |
376 | |
377 # XXX If the user has other ignore files outside the repo, or | |
378 # changes their list of ignore files at run time, we'll | |
379 # potentially never see changes to them. We could get the | |
380 # client to report to us what ignore data they're using. | |
381 # But it's easier to do nothing than to open that can of | |
382 # worms. | |
383 | |
7085
1fcc282e2c43
inotify: fixup rebuilding ignore
Matt Mackall <mpm@selenic.com>
parents:
7082
diff
changeset
|
384 if '_ignore' in self.repo.dirstate.__dict__: |
1fcc282e2c43
inotify: fixup rebuilding ignore
Matt Mackall <mpm@selenic.com>
parents:
7082
diff
changeset
|
385 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
|
386 self.ui.note(_('rescanning due to .hgignore change\n')) |
6239 | 387 self.scan() |
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
388 |
6239 | 389 def getstat(self, wpath): |
390 try: | |
391 return self.statcache[wpath] | |
392 except KeyError: | |
393 try: | |
394 return self.stat(wpath) | |
395 except OSError, err: | |
396 if err.errno != errno.ENOENT: | |
397 raise | |
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
398 |
6239 | 399 def stat(self, wpath): |
400 try: | |
401 st = os.lstat(join(self.wprefix, wpath)) | |
402 ret = st.st_mode, st.st_size, st.st_mtime | |
403 self.statcache[wpath] = ret | |
404 return ret | |
7280
810ca383da9c
remove unused variables
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7220
diff
changeset
|
405 except OSError: |
6239 | 406 self.statcache.pop(wpath, None) |
407 raise | |
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
408 |
6239 | 409 def created(self, wpath): |
410 if wpath == '.hgignore': | |
411 self.update_hgignore() | |
412 try: | |
413 st = self.stat(wpath) | |
414 if stat.S_ISREG(st[0]): | |
415 self.updatestatus(wpath, st) | |
7280
810ca383da9c
remove unused variables
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7220
diff
changeset
|
416 except OSError: |
6239 | 417 pass |
418 | |
419 def modified(self, wpath): | |
420 if wpath == '.hgignore': | |
421 self.update_hgignore() | |
422 try: | |
423 st = self.stat(wpath) | |
424 if stat.S_ISREG(st[0]): | |
425 if self.repo.dirstate[wpath] in 'lmn': | |
426 self.updatestatus(wpath, st) | |
427 except OSError: | |
428 pass | |
429 | |
430 def deleted(self, wpath): | |
431 if wpath == '.hgignore': | |
432 self.update_hgignore() | |
433 elif wpath.startswith('.hg/'): | |
434 if wpath == '.hg/wlock': | |
435 self.check_dirstate() | |
436 return | |
437 | |
438 self.updatestatus(wpath, None) | |
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
439 |
6239 | 440 def schedule_work(self, wpath, evt): |
441 self.eventq.setdefault(wpath, []) | |
442 prev = self.eventq[wpath] | |
443 try: | |
444 if prev and evt == 'm' and prev[-1] in 'cm': | |
445 return | |
446 self.eventq[wpath].append(evt) | |
447 finally: | |
448 self.deferred += 1 | |
449 self.timeout = 250 | |
450 | |
451 def deferred_event(self, wpath, evt): | |
452 if evt == 'c': | |
453 self.created(wpath) | |
454 elif evt == 'm': | |
455 self.modified(wpath) | |
456 elif evt == 'd': | |
457 self.deleted(wpath) | |
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
458 |
6239 | 459 def process_create(self, wpath, evt): |
460 if self.ui.debugflag: | |
461 self.ui.note(_('%s event: created %s\n') % | |
462 (self.event_time(), wpath)) | |
463 | |
464 if evt.mask & inotify.IN_ISDIR: | |
465 self.scan(wpath) | |
466 else: | |
467 self.schedule_work(wpath, 'c') | |
468 | |
469 def process_delete(self, wpath, evt): | |
470 if self.ui.debugflag: | |
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
471 self.ui.note(_('%s event: deleted %s\n') % |
6239 | 472 (self.event_time(), wpath)) |
473 | |
474 if evt.mask & inotify.IN_ISDIR: | |
475 self.scan(wpath) | |
7892
67e59a9886d5
Fixing issue1542, adding a relevant test
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7451
diff
changeset
|
476 self.schedule_work(wpath, 'd') |
6239 | 477 |
478 def process_modify(self, wpath, evt): | |
479 if self.ui.debugflag: | |
480 self.ui.note(_('%s event: modified %s\n') % | |
481 (self.event_time(), wpath)) | |
482 | |
483 if not (evt.mask & inotify.IN_ISDIR): | |
484 self.schedule_work(wpath, 'm') | |
485 | |
486 def process_unmount(self, evt): | |
487 self.ui.warn(_('filesystem containing %s was unmounted\n') % | |
488 evt.fullpath) | |
489 sys.exit(0) | |
490 | |
491 def handle_event(self, fd, event): | |
492 if self.ui.debugflag: | |
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
493 self.ui.note(_('%s readable: %d bytes\n') % |
6239 | 494 (self.event_time(), self.threshold.readable())) |
495 if not self.threshold(): | |
496 if self.registered: | |
497 if self.ui.debugflag: | |
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
498 self.ui.note(_('%s below threshold - unhooking\n') % |
6239 | 499 (self.event_time())) |
500 self.master.poll.unregister(fd) | |
501 self.registered = False | |
502 self.timeout = 250 | |
503 else: | |
504 self.read_events() | |
505 | |
506 def read_events(self, bufsize=None): | |
507 events = self.watcher.read(bufsize) | |
508 if self.ui.debugflag: | |
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
509 self.ui.note(_('%s reading %d events\n') % |
6239 | 510 (self.event_time(), len(events))) |
511 for evt in events: | |
512 wpath = self.wpath(evt) | |
513 if evt.mask & inotify.IN_UNMOUNT: | |
514 self.process_unmount(wpath, evt) | |
515 elif evt.mask & (inotify.IN_MODIFY | inotify.IN_ATTRIB): | |
516 self.process_modify(wpath, evt) | |
517 elif evt.mask & (inotify.IN_DELETE | inotify.IN_DELETE_SELF | | |
518 inotify.IN_MOVED_FROM): | |
519 self.process_delete(wpath, evt) | |
520 elif evt.mask & (inotify.IN_CREATE | inotify.IN_MOVED_TO): | |
521 self.process_create(wpath, evt) | |
522 | |
523 def handle_timeout(self): | |
524 if not self.registered: | |
525 if self.ui.debugflag: | |
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
526 self.ui.note(_('%s hooking back up with %d bytes readable\n') % |
6239 | 527 (self.event_time(), self.threshold.readable())) |
528 self.read_events(0) | |
529 self.master.poll.register(self, select.POLLIN) | |
530 self.registered = True | |
531 | |
532 if self.eventq: | |
533 if self.ui.debugflag: | |
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
534 self.ui.note(_('%s processing %d deferred events as %d\n') % |
6239 | 535 (self.event_time(), self.deferred, |
536 len(self.eventq))) | |
8209
a1a5a57efe90
replace util.sort with sorted built-in
Matt Mackall <mpm@selenic.com>
parents:
7892
diff
changeset
|
537 for wpath, evts in sorted(self.eventq.iteritems()): |
6239 | 538 for evt in evts: |
539 self.deferred_event(wpath, evt) | |
540 self.eventq.clear() | |
541 self.deferred = 0 | |
542 self.timeout = None | |
543 | |
544 def shutdown(self): | |
545 self.watcher.close() | |
546 | |
547 class Server(object): | |
548 poll_events = select.POLLIN | |
549 | |
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
550 def __init__(self, ui, repo, repowatcher, timeout): |
6239 | 551 self.ui = ui |
552 self.repo = repo | |
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
553 self.repowatcher = repowatcher |
6239 | 554 self.timeout = timeout |
555 self.sock = socket.socket(socket.AF_UNIX) | |
556 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
|
557 self.realsockpath = None |
6239 | 558 try: |
559 self.sock.bind(self.sockpath) | |
560 except socket.error, err: | |
561 if err[0] == errno.EADDRINUSE: | |
6997
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
562 raise AlreadyStartedException(_('could not start server: %s') |
6239 | 563 % err[1]) |
6997
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
564 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
|
565 tempdir = tempfile.mkdtemp(prefix="hg-inotify-") |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
566 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
|
567 try: |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
568 self.sock.bind(self.realsockpath) |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
569 os.symlink(self.realsockpath, self.sockpath) |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
570 except (OSError, socket.error), inst: |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
571 try: |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
572 os.unlink(self.realsockpath) |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
573 except: |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
574 pass |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
575 os.rmdir(tempdir) |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
576 if inst.errno == errno.EEXIST: |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
577 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
|
578 % inst.strerror) |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
579 raise |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
580 else: |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
581 raise |
6239 | 582 self.sock.listen(5) |
583 self.fileno = self.sock.fileno | |
584 | |
585 def handle_timeout(self): | |
586 pass | |
587 | |
588 def handle_event(self, fd, event): | |
589 sock, addr = self.sock.accept() | |
590 | |
591 cs = common.recvcs(sock) | |
592 version = ord(cs.read(1)) | |
593 | |
594 sock.sendall(chr(common.version)) | |
595 | |
596 if version != common.version: | |
597 self.ui.warn(_('received query from incompatible client ' | |
598 'version %d\n') % version) | |
599 return | |
600 | |
601 names = cs.read().split('\0') | |
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
602 |
6239 | 603 states = names.pop() |
604 | |
605 self.ui.note(_('answering query for %r\n') % states) | |
606 | |
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
607 if self.repowatcher.timeout: |
6239 | 608 # We got a query while a rescan is pending. Make sure we |
609 # rescan before responding, or we could give back a wrong | |
610 # answer. | |
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
611 self.repowatcher.handle_timeout() |
6239 | 612 |
613 if not names: | |
614 def genresult(states, tree): | |
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
615 for fn, state in self.repowatcher.walk(states, tree): |
6239 | 616 yield fn |
617 else: | |
618 def genresult(states, tree): | |
619 for fn in names: | |
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
620 l = self.repowatcher.lookup(fn, tree) |
7351
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
621 try: |
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
622 if l in states: |
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
623 yield fn |
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
624 except TypeError: |
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
625 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
|
626 yield f |
6239 | 627 |
628 results = ['\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
|
629 genresult('l', self.repowatcher.statustrees['l']), |
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
630 genresult('m', self.repowatcher.statustrees['m']), |
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
631 genresult('a', self.repowatcher.statustrees['a']), |
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
632 genresult('r', self.repowatcher.statustrees['r']), |
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
633 genresult('!', self.repowatcher.statustrees['!']), |
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
634 '?' in states |
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
635 and genresult('?', self.repowatcher.statustrees['?']) |
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
636 or [], |
6239 | 637 [], |
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
638 'c' in states and genresult('n', self.repowatcher.tree) or [], |
6239 | 639 ]] |
640 | |
641 try: | |
642 try: | |
643 sock.sendall(struct.pack(common.resphdrfmt, | |
644 *map(len, results))) | |
645 sock.sendall(''.join(results)) | |
646 finally: | |
647 sock.shutdown(socket.SHUT_WR) | |
648 except socket.error, err: | |
649 if err[0] != errno.EPIPE: | |
650 raise | |
651 | |
652 def shutdown(self): | |
653 self.sock.close() | |
654 try: | |
655 os.unlink(self.sockpath) | |
6997
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
656 if self.realsockpath: |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
657 os.unlink(self.realsockpath) |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
658 os.rmdir(os.path.dirname(self.realsockpath)) |
6239 | 659 except OSError, err: |
660 if err.errno != errno.ENOENT: | |
661 raise | |
662 | |
663 class Master(object): | |
664 def __init__(self, ui, repo, timeout=None): | |
665 self.ui = ui | |
666 self.repo = repo | |
667 self.poll = select.poll() | |
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
668 self.repowatcher = RepoWatcher(ui, repo, self) |
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
669 self.server = Server(ui, repo, self.repowatcher, timeout) |
6239 | 670 self.table = {} |
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
671 for obj in (self.repowatcher, self.server): |
6239 | 672 fd = obj.fileno() |
673 self.table[fd] = obj | |
674 self.poll.register(fd, obj.poll_events) | |
675 | |
676 def register(self, fd, mask): | |
677 self.poll.register(fd, mask) | |
678 | |
679 def shutdown(self): | |
680 for obj in self.table.itervalues(): | |
681 obj.shutdown() | |
682 | |
683 def run(self): | |
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
684 self.repowatcher.setup() |
6239 | 685 self.ui.note(_('finished setup\n')) |
686 if os.getenv('TIME_STARTUP'): | |
687 sys.exit(0) | |
688 while True: | |
689 timeout = None | |
690 timeobj = None | |
691 for obj in self.table.itervalues(): | |
692 if obj.timeout is not None and (timeout is None or obj.timeout < timeout): | |
693 timeout, timeobj = obj.timeout, obj | |
694 try: | |
695 if self.ui.debugflag: | |
696 if timeout is None: | |
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
697 self.ui.note(_('polling: no timeout\n')) |
6239 | 698 else: |
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
699 self.ui.note(_('polling: %sms timeout\n') % timeout) |
6239 | 700 events = self.poll.poll(timeout) |
701 except select.error, err: | |
702 if err[0] == errno.EINTR: | |
703 continue | |
704 raise | |
705 if events: | |
706 for fd, event in events: | |
707 self.table[fd].handle_event(fd, event) | |
708 elif timeobj: | |
709 timeobj.handle_timeout() | |
710 | |
711 def start(ui, repo): | |
7451
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
712 def closefds(ignore): |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
713 # (from python bug #1177468) |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
714 # close all inherited file descriptors |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
715 # 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
|
716 # 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
|
717 # 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
|
718 try: |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
719 os.urandom(4) |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
720 urandom_fd = getattr(os, '_urandomfd', None) |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
721 except AttributeError: |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
722 urandom_fd = None |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
723 ignore.append(urandom_fd) |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
724 for fd in range(3, 256): |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
725 if fd in ignore: |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
726 continue |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
727 try: |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
728 os.close(fd) |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
729 except OSError: |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
730 pass |
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
731 |
6239 | 732 m = Master(ui, repo) |
733 sys.stdout.flush() | |
734 sys.stderr.flush() | |
735 | |
736 pid = os.fork() | |
737 if pid: | |
738 return pid | |
739 | |
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
740 closefds([m.server.fileno(), m.repowatcher.fileno()]) |
6239 | 741 os.setsid() |
742 | |
743 fd = os.open('/dev/null', os.O_RDONLY) | |
744 os.dup2(fd, 0) | |
745 if fd > 0: | |
746 os.close(fd) | |
747 | |
748 fd = os.open(ui.config('inotify', 'log', '/dev/null'), | |
749 os.O_RDWR | os.O_CREAT | os.O_TRUNC) | |
750 os.dup2(fd, 1) | |
751 os.dup2(fd, 2) | |
752 if fd > 2: | |
753 os.close(fd) | |
754 | |
755 try: | |
756 m.run() | |
757 finally: | |
758 m.shutdown() | |
759 os._exit(0) |