Mercurial > public > mercurial-scm > hg
annotate hgext/inotify/server.py @ 8609:aeaa0bd9dc24
inotify: process all inotify events in one batch
When several inotify events happen, we don't have to process each event
separately, calling everytime repowatcher.read_events() to fetch events from
the underlying watcher: it is sufficient to call once read_events, to fetch
all the events from the watcher.
| author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
|---|---|
| date | Thu, 21 May 2009 19:26:15 +0900 |
| parents | 228db070bfc4 |
| children | 8ef1f63e554c |
| 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 | |
|
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.tree = {} | |
| 148 self.statcache = {} | |
| 149 self.statustrees = dict([(s, {}) for s in self.statuskeys]) | |
| 150 | |
| 151 self.watches = 0 | |
| 152 self.last_event = None | |
| 153 | |
|
8605
ed2d9bdbfad2
inotify: do not defer inotify events processing
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8604
diff
changeset
|
154 self.lastevent = {} |
| 6239 | 155 |
| 156 self.ds_info = self.dirstate_info() | |
|
8604
578f2a0049cd
inotify: do not recurse in handle_timeout(): call it explicitely, not in scan()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8600
diff
changeset
|
157 self.handle_timeout() |
| 6239 | 158 self.scan() |
| 159 | |
| 160 def event_time(self): | |
| 161 last = self.last_event | |
| 162 now = time.time() | |
| 163 self.last_event = now | |
| 164 | |
| 165 if last is None: | |
| 166 return 'start' | |
| 167 delta = now - last | |
| 168 if delta < 5: | |
| 169 return '+%.3f' % delta | |
| 170 if delta < 50: | |
| 171 return '+%.2f' % delta | |
| 172 return '+%.1f' % delta | |
| 173 | |
| 174 def dirstate_info(self): | |
| 175 try: | |
| 176 st = os.lstat(self.repo.join('dirstate')) | |
| 177 return st.st_mtime, st.st_ino | |
| 178 except OSError, err: | |
| 179 if err.errno != errno.ENOENT: | |
| 180 raise | |
| 181 return 0, 0 | |
| 182 | |
| 183 def add_watch(self, path, mask): | |
| 184 if not path: | |
| 185 return | |
| 186 if self.watcher.path(path) is None: | |
| 187 if self.ui.debugflag: | |
| 188 self.ui.note(_('watching %r\n') % path[len(self.wprefix):]) | |
| 189 try: | |
| 190 self.watcher.add(path, mask) | |
| 191 self.watches += 1 | |
| 192 except OSError, err: | |
| 193 if err.errno in (errno.ENOENT, errno.ENOTDIR): | |
| 194 return | |
| 195 if err.errno != errno.ENOSPC: | |
| 196 raise | |
| 197 _explain_watch_limit(self.ui, self.repo, self.watches) | |
| 198 | |
| 199 def setup(self): | |
| 200 self.ui.note(_('watching directories under %r\n') % self.repo.root) | |
| 201 self.add_watch(self.repo.path, inotify.IN_DELETE) | |
| 202 self.check_dirstate() | |
| 203 | |
| 204 def wpath(self, evt): | |
| 205 path = evt.fullpath | |
| 206 if path == self.repo.root: | |
| 207 return '' | |
| 208 if path.startswith(self.wprefix): | |
| 209 return path[len(self.wprefix):] | |
| 210 raise 'wtf? ' + path | |
| 211 | |
| 212 def dir(self, tree, path): | |
| 213 if path: | |
| 214 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
|
215 tree = tree.setdefault(name, {}) |
| 6239 | 216 return tree |
| 217 | |
| 218 def lookup(self, path, tree): | |
| 219 if path: | |
| 220 try: | |
| 221 for name in path.split('/'): | |
| 222 tree = tree[name] | |
| 223 except KeyError: | |
|
7351
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
224 return 'x' |
| 6239 | 225 except TypeError: |
|
7351
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
226 return 'd' |
| 6239 | 227 return tree |
| 228 | |
| 229 def split(self, path): | |
| 230 c = path.rfind('/') | |
| 231 if c == -1: | |
| 232 return '', path | |
| 233 return path[:c], path[c+1:] | |
| 234 | |
| 235 def filestatus(self, fn, st): | |
| 236 try: | |
| 237 type_, mode, size, time = self.repo.dirstate._map[fn][:4] | |
| 238 except KeyError: | |
| 239 type_ = '?' | |
| 240 if type_ == 'n': | |
| 241 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
|
242 if size == -1: |
|
be81b4788115
inotify: fix confusion on files in lookup state
Matt Mackall <mpm@selenic.com>
parents:
6998
diff
changeset
|
243 return 'l' |
| 6239 | 244 if size and (size != st_size or (mode ^ st_mode) & 0100): |
| 245 return 'm' | |
| 246 if time != int(st_mtime): | |
| 247 return 'l' | |
| 248 return 'n' | |
| 249 if type_ == '?' and self.repo.dirstate._ignore(fn): | |
| 250 return 'i' | |
| 251 return type_ | |
| 252 | |
|
8599
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
253 def updatefile(self, wfn, osstat): |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
254 ''' |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
255 update the file entry of an existing file. |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
256 |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
257 osstat: (mode, size, time) tuple, as returned by os.lstat(wfn) |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
258 ''' |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
259 |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
260 self._updatestatus(wfn, self.filestatus(wfn, osstat)) |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
261 |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
262 def deletefile(self, wfn, oldstatus): |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
263 ''' |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
264 update the entry of a file which has been deleted. |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
265 |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
266 oldstatus: char in statuskeys, status of the file before deletion |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
267 ''' |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
268 if oldstatus == 'r': |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
269 newstatus = 'r' |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
270 elif oldstatus in 'almn': |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
271 newstatus = '!' |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
272 else: |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
273 newstatus = None |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
274 |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
275 self.statcache.pop(wfn, None) |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
276 self._updatestatus(wfn, newstatus) |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
277 |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
278 def _updatestatus(self, wfn, newstatus): |
|
8382
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
279 ''' |
|
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
280 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
|
281 |
|
8599
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
282 newstatus: - char in (statuskeys + 'ni'), new status to apply. |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
283 - or None, to stop tracking wfn |
|
8382
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
284 ''' |
| 6239 | 285 root, fn = self.split(wfn) |
| 286 d = self.dir(self.tree, root) | |
|
8599
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
287 |
|
7351
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
288 oldstatus = d.get(fn) |
|
8599
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
289 # oldstatus can be either: |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
290 # - None : fn is new |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
291 # - a char in statuskeys: fn is a (tracked) file |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
292 # - a dict: fn is a directory |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
293 isdir = isinstance(oldstatus, dict) |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
294 |
|
8382
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
295 if self.ui.debugflag and oldstatus != newstatus: |
| 6239 | 296 if isdir: |
|
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
297 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
|
298 (wfn, len(oldstatus), newstatus)) |
| 6239 | 299 else: |
|
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
300 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
|
301 (wfn, oldstatus, newstatus)) |
| 6239 | 302 if not isdir: |
|
8599
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
303 if oldstatus and oldstatus in self.statuskeys \ |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
304 and oldstatus != newstatus: |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
305 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
|
306 if newstatus and newstatus != 'i': |
|
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
307 d[fn] = newstatus |
|
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
308 if newstatus in self.statuskeys: |
|
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
309 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
|
310 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
|
311 dd[fn] = newstatus |
| 6239 | 312 else: |
| 313 d.pop(fn, None) | |
|
7892
67e59a9886d5
Fixing issue1542, adding a relevant test
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7451
diff
changeset
|
314 |
| 6239 | 315 |
| 316 def check_deleted(self, key): | |
| 317 # Files that had been deleted but were present in the dirstate | |
| 318 # may have vanished from the dirstate; we must clean them up. | |
| 319 nuke = [] | |
| 320 for wfn, ignore in self.walk(key, self.statustrees[key]): | |
| 321 if wfn not in self.repo.dirstate: | |
| 322 nuke.append(wfn) | |
| 323 for wfn in nuke: | |
| 324 root, fn = self.split(wfn) | |
| 325 del self.dir(self.statustrees[key], root)[fn] | |
| 326 del self.dir(self.tree, root)[fn] | |
|
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
327 |
| 6239 | 328 def scan(self, topdir=''): |
| 329 ds = self.repo.dirstate._map.copy() | |
| 330 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
|
331 for root, dirs, files in walk(self.repo, topdir): |
| 6239 | 332 for d in dirs: |
| 333 self.add_watch(join(root, d), self.mask) | |
| 334 wroot = root[len(self.wprefix):] | |
| 335 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
|
336 for fn in files: |
| 6239 | 337 wfn = join(wroot, fn) |
|
8599
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
338 self.updatefile(wfn, self.getstat(wfn)) |
| 6239 | 339 ds.pop(wfn, None) |
| 340 wtopdir = topdir | |
| 341 if wtopdir and wtopdir[-1] != '/': | |
| 342 wtopdir += '/' | |
| 343 for wfn, state in ds.iteritems(): | |
| 344 if not wfn.startswith(wtopdir): | |
| 345 continue | |
|
7302
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
7280
diff
changeset
|
346 try: |
|
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
7280
diff
changeset
|
347 st = self.stat(wfn) |
|
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
7280
diff
changeset
|
348 except OSError: |
|
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
7280
diff
changeset
|
349 status = state[0] |
|
8599
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
350 self.deletefile(wfn, status) |
| 6239 | 351 else: |
|
8599
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
352 self.updatefile(wfn, st) |
| 6239 | 353 self.check_deleted('!') |
| 354 self.check_deleted('r') | |
| 355 | |
| 356 def check_dirstate(self): | |
| 357 ds_info = self.dirstate_info() | |
| 358 if ds_info == self.ds_info: | |
| 359 return | |
| 360 self.ds_info = ds_info | |
| 361 if not self.ui.debugflag: | |
| 362 self.last_event = None | |
| 363 self.ui.note(_('%s dirstate reload\n') % self.event_time()) | |
| 364 self.repo.dirstate.invalidate() | |
|
8604
578f2a0049cd
inotify: do not recurse in handle_timeout(): call it explicitely, not in scan()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8600
diff
changeset
|
365 self.handle_timeout() |
| 6239 | 366 self.scan() |
| 367 self.ui.note(_('%s end dirstate reload\n') % self.event_time()) | |
| 368 | |
| 369 def walk(self, states, tree, prefix=''): | |
| 370 # This is the "inner loop" when talking to the client. | |
|
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
371 |
| 6239 | 372 for name, val in tree.iteritems(): |
| 373 path = join(prefix, name) | |
|
7351
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
374 try: |
|
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
375 if val in states: |
|
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
376 yield path, val |
|
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
377 except TypeError: |
|
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
378 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
|
379 yield p |
| 6239 | 380 |
| 381 def update_hgignore(self): | |
| 382 # An update of the ignore file can potentially change the | |
| 383 # states of all unknown and ignored files. | |
| 384 | |
| 385 # XXX If the user has other ignore files outside the repo, or | |
| 386 # changes their list of ignore files at run time, we'll | |
| 387 # potentially never see changes to them. We could get the | |
| 388 # client to report to us what ignore data they're using. | |
| 389 # But it's easier to do nothing than to open that can of | |
| 390 # worms. | |
| 391 | |
|
7085
1fcc282e2c43
inotify: fixup rebuilding ignore
Matt Mackall <mpm@selenic.com>
parents:
7082
diff
changeset
|
392 if '_ignore' in self.repo.dirstate.__dict__: |
|
1fcc282e2c43
inotify: fixup rebuilding ignore
Matt Mackall <mpm@selenic.com>
parents:
7082
diff
changeset
|
393 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
|
394 self.ui.note(_('rescanning due to .hgignore change\n')) |
|
8604
578f2a0049cd
inotify: do not recurse in handle_timeout(): call it explicitely, not in scan()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8600
diff
changeset
|
395 self.handle_timeout() |
| 6239 | 396 self.scan() |
|
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
397 |
| 6239 | 398 def getstat(self, wpath): |
| 399 try: | |
| 400 return self.statcache[wpath] | |
| 401 except KeyError: | |
| 402 try: | |
| 403 return self.stat(wpath) | |
| 404 except OSError, err: | |
| 405 if err.errno != errno.ENOENT: | |
| 406 raise | |
|
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
407 |
| 6239 | 408 def stat(self, wpath): |
| 409 try: | |
| 410 st = os.lstat(join(self.wprefix, wpath)) | |
| 411 ret = st.st_mode, st.st_size, st.st_mtime | |
| 412 self.statcache[wpath] = ret | |
| 413 return ret | |
|
7280
810ca383da9c
remove unused variables
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7220
diff
changeset
|
414 except OSError: |
| 6239 | 415 self.statcache.pop(wpath, None) |
| 416 raise | |
|
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
417 |
|
8606
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
418 def eventaction(code): |
|
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
419 def decorator(f): |
|
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
420 def wrapper(self, wpath): |
|
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
421 if code == 'm' and wpath in self.lastevent and \ |
|
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
422 self.lastevent[wpath] in 'cm': |
|
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
423 return |
|
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
424 self.lastevent[wpath] = code |
|
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
425 self.timeout = 250 |
|
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
426 |
|
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
427 f(self, wpath) |
|
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
428 |
|
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
429 wrapper.func_name = f.func_name |
|
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
430 return wrapper |
|
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
431 return decorator |
|
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
432 |
|
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
433 @eventaction('c') |
| 6239 | 434 def created(self, wpath): |
| 435 if wpath == '.hgignore': | |
| 436 self.update_hgignore() | |
| 437 try: | |
| 438 st = self.stat(wpath) | |
| 439 if stat.S_ISREG(st[0]): | |
|
8599
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
440 self.updatefile(wpath, st) |
|
7280
810ca383da9c
remove unused variables
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7220
diff
changeset
|
441 except OSError: |
| 6239 | 442 pass |
| 443 | |
|
8606
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
444 @eventaction('m') |
| 6239 | 445 def modified(self, wpath): |
| 446 if wpath == '.hgignore': | |
| 447 self.update_hgignore() | |
| 448 try: | |
| 449 st = self.stat(wpath) | |
| 450 if stat.S_ISREG(st[0]): | |
| 451 if self.repo.dirstate[wpath] in 'lmn': | |
|
8599
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
452 self.updatefile(wpath, st) |
| 6239 | 453 except OSError: |
| 454 pass | |
| 455 | |
|
8606
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
456 @eventaction('d') |
| 6239 | 457 def deleted(self, wpath): |
| 458 if wpath == '.hgignore': | |
| 459 self.update_hgignore() | |
| 460 elif wpath.startswith('.hg/'): | |
| 461 if wpath == '.hg/wlock': | |
| 462 self.check_dirstate() | |
| 463 return | |
| 464 | |
|
8599
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
465 self.deletefile(wpath, self.repo.dirstate[wpath]) |
|
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
466 |
| 6239 | 467 def process_create(self, wpath, evt): |
| 468 if self.ui.debugflag: | |
| 469 self.ui.note(_('%s event: created %s\n') % | |
| 470 (self.event_time(), wpath)) | |
| 471 | |
| 472 if evt.mask & inotify.IN_ISDIR: | |
| 473 self.scan(wpath) | |
| 474 else: | |
|
8606
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
475 self.created(wpath) |
| 6239 | 476 |
| 477 def process_delete(self, wpath, evt): | |
| 478 if self.ui.debugflag: | |
|
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
479 self.ui.note(_('%s event: deleted %s\n') % |
| 6239 | 480 (self.event_time(), wpath)) |
| 481 | |
| 482 if evt.mask & inotify.IN_ISDIR: | |
|
8600
d46cdfcecaf1
inotify: proper fix for issue1542 (partially reverting 67e59a9886d5)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8599
diff
changeset
|
483 tree = self.dir(self.tree, wpath).copy() |
|
d46cdfcecaf1
inotify: proper fix for issue1542 (partially reverting 67e59a9886d5)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8599
diff
changeset
|
484 for wfn, ignore in self.walk('?', tree): |
|
d46cdfcecaf1
inotify: proper fix for issue1542 (partially reverting 67e59a9886d5)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8599
diff
changeset
|
485 self.deletefile(join(wpath, wfn), '?') |
| 6239 | 486 self.scan(wpath) |
|
8600
d46cdfcecaf1
inotify: proper fix for issue1542 (partially reverting 67e59a9886d5)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8599
diff
changeset
|
487 else: |
|
8606
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
488 self.deleted(wpath) |
| 6239 | 489 |
| 490 def process_modify(self, wpath, evt): | |
| 491 if self.ui.debugflag: | |
| 492 self.ui.note(_('%s event: modified %s\n') % | |
| 493 (self.event_time(), wpath)) | |
| 494 | |
| 495 if not (evt.mask & inotify.IN_ISDIR): | |
|
8606
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
496 self.modified(wpath) |
| 6239 | 497 |
| 498 def process_unmount(self, evt): | |
| 499 self.ui.warn(_('filesystem containing %s was unmounted\n') % | |
| 500 evt.fullpath) | |
| 501 sys.exit(0) | |
| 502 | |
|
8609
aeaa0bd9dc24
inotify: process all inotify events in one batch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8608
diff
changeset
|
503 def handle_pollevents(self, events): |
| 6239 | 504 if self.ui.debugflag: |
|
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
505 self.ui.note(_('%s readable: %d bytes\n') % |
| 6239 | 506 (self.event_time(), self.threshold.readable())) |
| 507 if not self.threshold(): | |
| 508 if self.registered: | |
| 509 if self.ui.debugflag: | |
|
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
510 self.ui.note(_('%s below threshold - unhooking\n') % |
| 6239 | 511 (self.event_time())) |
|
8607
e17eba98c789
inotify: handle_event: do not use event and fd parameters.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8606
diff
changeset
|
512 self.master.poll.unregister(self.fileno()) |
| 6239 | 513 self.registered = False |
| 514 self.timeout = 250 | |
| 515 else: | |
| 516 self.read_events() | |
| 517 | |
| 518 def read_events(self, bufsize=None): | |
| 519 events = self.watcher.read(bufsize) | |
| 520 if self.ui.debugflag: | |
|
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
521 self.ui.note(_('%s reading %d events\n') % |
| 6239 | 522 (self.event_time(), len(events))) |
| 523 for evt in events: | |
| 524 wpath = self.wpath(evt) | |
| 525 if evt.mask & inotify.IN_UNMOUNT: | |
| 526 self.process_unmount(wpath, evt) | |
| 527 elif evt.mask & (inotify.IN_MODIFY | inotify.IN_ATTRIB): | |
| 528 self.process_modify(wpath, evt) | |
| 529 elif evt.mask & (inotify.IN_DELETE | inotify.IN_DELETE_SELF | | |
| 530 inotify.IN_MOVED_FROM): | |
| 531 self.process_delete(wpath, evt) | |
| 532 elif evt.mask & (inotify.IN_CREATE | inotify.IN_MOVED_TO): | |
| 533 self.process_create(wpath, evt) | |
| 534 | |
|
8605
ed2d9bdbfad2
inotify: do not defer inotify events processing
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8604
diff
changeset
|
535 self.lastevent.clear() |
|
ed2d9bdbfad2
inotify: do not defer inotify events processing
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8604
diff
changeset
|
536 |
| 6239 | 537 def handle_timeout(self): |
| 538 if not self.registered: | |
| 539 if self.ui.debugflag: | |
|
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
540 self.ui.note(_('%s hooking back up with %d bytes readable\n') % |
| 6239 | 541 (self.event_time(), self.threshold.readable())) |
| 542 self.read_events(0) | |
| 543 self.master.poll.register(self, select.POLLIN) | |
| 544 self.registered = True | |
| 545 | |
| 546 self.timeout = None | |
| 547 | |
| 548 def shutdown(self): | |
| 549 self.watcher.close() | |
| 550 | |
|
8555
3e09bc5fee12
inotify: introduce debuginotify, which lists which paths are under watch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8554
diff
changeset
|
551 def debug(self): |
|
3e09bc5fee12
inotify: introduce debuginotify, which lists which paths are under watch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8554
diff
changeset
|
552 """ |
|
3e09bc5fee12
inotify: introduce debuginotify, which lists which paths are under watch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8554
diff
changeset
|
553 Returns a sorted list of relatives paths currently watched, |
|
3e09bc5fee12
inotify: introduce debuginotify, which lists which paths are under watch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8554
diff
changeset
|
554 for debugging purposes. |
|
3e09bc5fee12
inotify: introduce debuginotify, which lists which paths are under watch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8554
diff
changeset
|
555 """ |
|
3e09bc5fee12
inotify: introduce debuginotify, which lists which paths are under watch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8554
diff
changeset
|
556 return sorted(tuple[0][len(self.wprefix):] for tuple in self.watcher) |
|
3e09bc5fee12
inotify: introduce debuginotify, which lists which paths are under watch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8554
diff
changeset
|
557 |
|
8385
1536501ade62
inotify: Coding Style: name classes in lowercase.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8384
diff
changeset
|
558 class server(object): |
| 6239 | 559 poll_events = select.POLLIN |
| 560 | |
|
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
561 def __init__(self, ui, repo, repowatcher, timeout): |
| 6239 | 562 self.ui = ui |
| 563 self.repo = repo | |
|
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
564 self.repowatcher = repowatcher |
| 6239 | 565 self.timeout = timeout |
| 566 self.sock = socket.socket(socket.AF_UNIX) | |
| 567 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
|
568 self.realsockpath = None |
| 6239 | 569 try: |
| 570 self.sock.bind(self.sockpath) | |
| 571 except socket.error, err: | |
| 572 if err[0] == errno.EADDRINUSE: | |
|
6997
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
573 raise AlreadyStartedException(_('could not start server: %s') |
| 6239 | 574 % err[1]) |
|
6997
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
575 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
|
576 tempdir = tempfile.mkdtemp(prefix="hg-inotify-") |
|
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
577 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
|
578 try: |
|
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
579 self.sock.bind(self.realsockpath) |
|
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
580 os.symlink(self.realsockpath, self.sockpath) |
|
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
581 except (OSError, socket.error), inst: |
|
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
582 try: |
|
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
583 os.unlink(self.realsockpath) |
|
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
584 except: |
|
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
585 pass |
|
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
586 os.rmdir(tempdir) |
|
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
587 if inst.errno == errno.EEXIST: |
|
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
588 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
|
589 % inst.strerror) |
|
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
590 raise |
|
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
591 else: |
|
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
592 raise |
| 6239 | 593 self.sock.listen(5) |
| 594 self.fileno = self.sock.fileno | |
| 595 | |
| 596 def handle_timeout(self): | |
| 597 pass | |
| 598 | |
|
8554
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
599 def answer_stat_query(self, cs): |
| 6239 | 600 names = cs.read().split('\0') |
|
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
601 |
| 6239 | 602 states = names.pop() |
| 603 | |
| 604 self.ui.note(_('answering query for %r\n') % states) | |
| 605 | |
|
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
606 if self.repowatcher.timeout: |
| 6239 | 607 # We got a query while a rescan is pending. Make sure we |
| 608 # rescan before responding, or we could give back a wrong | |
| 609 # answer. | |
|
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
610 self.repowatcher.handle_timeout() |
| 6239 | 611 |
| 612 if not names: | |
| 613 def genresult(states, tree): | |
|
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
614 for fn, state in self.repowatcher.walk(states, tree): |
| 6239 | 615 yield fn |
| 616 else: | |
| 617 def genresult(states, tree): | |
| 618 for fn in names: | |
|
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
619 l = self.repowatcher.lookup(fn, tree) |
|
7351
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
620 try: |
|
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
621 if l in states: |
|
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
622 yield fn |
|
5ab0abf27dd9
Backed out changeset c5dbe86b0fee (issue1375)
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7350
diff
changeset
|
623 except TypeError: |
|
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
624 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
|
625 yield f |
| 6239 | 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 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
|
628 genresult('l', self.repowatcher.statustrees['l']), |
|
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
629 genresult('m', self.repowatcher.statustrees['m']), |
|
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
630 genresult('a', self.repowatcher.statustrees['a']), |
|
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
631 genresult('r', self.repowatcher.statustrees['r']), |
|
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
632 genresult('!', self.repowatcher.statustrees['!']), |
|
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
633 '?' in states |
|
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
634 and genresult('?', self.repowatcher.statustrees['?']) |
|
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
635 or [], |
| 6239 | 636 [], |
|
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
637 'c' in states and genresult('n', self.repowatcher.tree) or [], |
| 6239 | 638 ]] |
| 639 | |
|
8555
3e09bc5fee12
inotify: introduce debuginotify, which lists which paths are under watch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8554
diff
changeset
|
640 def answer_dbug_query(self): |
|
3e09bc5fee12
inotify: introduce debuginotify, which lists which paths are under watch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8554
diff
changeset
|
641 return ['\0'.join(self.repowatcher.debug())] |
|
3e09bc5fee12
inotify: introduce debuginotify, which lists which paths are under watch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8554
diff
changeset
|
642 |
|
8609
aeaa0bd9dc24
inotify: process all inotify events in one batch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8608
diff
changeset
|
643 def handle_pollevents(self, events): |
|
aeaa0bd9dc24
inotify: process all inotify events in one batch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8608
diff
changeset
|
644 for e in events: |
|
aeaa0bd9dc24
inotify: process all inotify events in one batch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8608
diff
changeset
|
645 self.handle_pollevent() |
|
aeaa0bd9dc24
inotify: process all inotify events in one batch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8608
diff
changeset
|
646 |
|
8608
228db070bfc4
inotify: rename handle_event to handle_pollevent to avoid confusion
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8607
diff
changeset
|
647 def handle_pollevent(self): |
|
8554
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
648 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
|
649 |
|
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
650 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
|
651 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
|
652 |
|
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
653 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
|
654 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
|
655 '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
|
656 return |
|
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
657 |
|
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
658 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
|
659 |
|
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
660 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
|
661 results = self.answer_stat_query(cs) |
|
8555
3e09bc5fee12
inotify: introduce debuginotify, which lists which paths are under watch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8554
diff
changeset
|
662 elif type == 'DBUG': |
|
3e09bc5fee12
inotify: introduce debuginotify, which lists which paths are under watch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8554
diff
changeset
|
663 results = self.answer_dbug_query() |
|
8554
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
664 else: |
|
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
665 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
|
666 return |
|
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
667 |
| 6239 | 668 try: |
| 669 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
|
670 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
|
671 |
|
8553
e387ecd7a6ed
inotify: change protocol so that different query types can be supported.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8386
diff
changeset
|
672 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
|
673 *map(len, results))) |
| 6239 | 674 sock.sendall(''.join(results)) |
| 675 finally: | |
| 676 sock.shutdown(socket.SHUT_WR) | |
| 677 except socket.error, err: | |
| 678 if err[0] != errno.EPIPE: | |
| 679 raise | |
| 680 | |
| 681 def shutdown(self): | |
| 682 self.sock.close() | |
| 683 try: | |
| 684 os.unlink(self.sockpath) | |
|
6997
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
685 if self.realsockpath: |
|
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
686 os.unlink(self.realsockpath) |
|
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
687 os.rmdir(os.path.dirname(self.realsockpath)) |
| 6239 | 688 except OSError, err: |
| 689 if err.errno != errno.ENOENT: | |
| 690 raise | |
| 691 | |
|
8385
1536501ade62
inotify: Coding Style: name classes in lowercase.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8384
diff
changeset
|
692 class master(object): |
| 6239 | 693 def __init__(self, ui, repo, timeout=None): |
| 694 self.ui = ui | |
| 695 self.repo = repo | |
| 696 self.poll = select.poll() | |
|
8385
1536501ade62
inotify: Coding Style: name classes in lowercase.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8384
diff
changeset
|
697 self.repowatcher = repowatcher(ui, repo, self) |
|
1536501ade62
inotify: Coding Style: name classes in lowercase.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8384
diff
changeset
|
698 self.server = server(ui, repo, self.repowatcher, timeout) |
| 6239 | 699 self.table = {} |
|
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
700 for obj in (self.repowatcher, self.server): |
| 6239 | 701 fd = obj.fileno() |
| 702 self.table[fd] = obj | |
| 703 self.poll.register(fd, obj.poll_events) | |
| 704 | |
| 705 def register(self, fd, mask): | |
| 706 self.poll.register(fd, mask) | |
| 707 | |
| 708 def shutdown(self): | |
| 709 for obj in self.table.itervalues(): | |
| 710 obj.shutdown() | |
| 711 | |
| 712 def run(self): | |
|
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
713 self.repowatcher.setup() |
| 6239 | 714 self.ui.note(_('finished setup\n')) |
| 715 if os.getenv('TIME_STARTUP'): | |
| 716 sys.exit(0) | |
| 717 while True: | |
| 718 timeout = None | |
| 719 timeobj = None | |
| 720 for obj in self.table.itervalues(): | |
| 721 if obj.timeout is not None and (timeout is None or obj.timeout < timeout): | |
| 722 timeout, timeobj = obj.timeout, obj | |
| 723 try: | |
| 724 if self.ui.debugflag: | |
| 725 if timeout is None: | |
|
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
726 self.ui.note(_('polling: no timeout\n')) |
| 6239 | 727 else: |
|
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
728 self.ui.note(_('polling: %sms timeout\n') % timeout) |
| 6239 | 729 events = self.poll.poll(timeout) |
| 730 except select.error, err: | |
| 731 if err[0] == errno.EINTR: | |
| 732 continue | |
| 733 raise | |
| 734 if events: | |
|
8609
aeaa0bd9dc24
inotify: process all inotify events in one batch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8608
diff
changeset
|
735 by_fd = {} |
| 6239 | 736 for fd, event in events: |
|
8609
aeaa0bd9dc24
inotify: process all inotify events in one batch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8608
diff
changeset
|
737 by_fd.setdefault(fd, []).append(event) |
|
aeaa0bd9dc24
inotify: process all inotify events in one batch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8608
diff
changeset
|
738 |
|
aeaa0bd9dc24
inotify: process all inotify events in one batch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8608
diff
changeset
|
739 for fd, events in by_fd.iteritems(): |
|
aeaa0bd9dc24
inotify: process all inotify events in one batch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8608
diff
changeset
|
740 self.table[fd].handle_pollevents(events) |
|
aeaa0bd9dc24
inotify: process all inotify events in one batch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8608
diff
changeset
|
741 |
| 6239 | 742 elif timeobj: |
| 743 timeobj.handle_timeout() | |
| 744 | |
| 745 def start(ui, repo): | |
|
7451
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
746 def closefds(ignore): |
|
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
747 # (from python bug #1177468) |
|
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
748 # close all inherited file descriptors |
|
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
749 # 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
|
750 # 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
|
751 # 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
|
752 try: |
|
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
753 os.urandom(4) |
|
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
754 urandom_fd = getattr(os, '_urandomfd', None) |
|
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
755 except AttributeError: |
|
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
756 urandom_fd = None |
|
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
757 ignore.append(urandom_fd) |
|
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
758 for fd in range(3, 256): |
|
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
759 if fd in ignore: |
|
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
760 continue |
|
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
761 try: |
|
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
762 os.close(fd) |
|
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
763 except OSError: |
|
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
764 pass |
|
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
765 |
|
8385
1536501ade62
inotify: Coding Style: name classes in lowercase.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8384
diff
changeset
|
766 m = master(ui, repo) |
| 6239 | 767 sys.stdout.flush() |
| 768 sys.stderr.flush() | |
| 769 | |
| 770 pid = os.fork() | |
| 771 if pid: | |
| 772 return pid | |
| 773 | |
|
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
774 closefds([m.server.fileno(), m.repowatcher.fileno()]) |
| 6239 | 775 os.setsid() |
| 776 | |
| 777 fd = os.open('/dev/null', os.O_RDONLY) | |
| 778 os.dup2(fd, 0) | |
| 779 if fd > 0: | |
| 780 os.close(fd) | |
| 781 | |
| 782 fd = os.open(ui.config('inotify', 'log', '/dev/null'), | |
| 783 os.O_RDWR | os.O_CREAT | os.O_TRUNC) | |
| 784 os.dup2(fd, 1) | |
| 785 os.dup2(fd, 2) | |
| 786 if fd > 2: | |
| 787 os.close(fd) | |
| 788 | |
| 789 try: | |
| 790 m.run() | |
| 791 finally: | |
| 792 m.shutdown() | |
| 793 os._exit(0) |