author | Brendan Cully <brendan@kublai.com> |
Wed, 19 Nov 2008 13:00:48 -0800 | |
changeset 7393 | 92c952c4470c |
parent 7329 | fd4bf5269733 |
child 7434 | cf7741aa1e96 |
permissions | -rw-r--r-- |
6239 | 1 |
# __init__.py - inotify-based status acceleration for Linux |
2 |
# |
|
3 |
# Copyright 2006, 2007, 2008 Bryan O'Sullivan <bos@serpentine.com> |
|
4 |
# Copyright 2007, 2008 Brendan Cully <brendan@kublai.com> |
|
5 |
# |
|
6 |
# This software may be used and distributed according to the terms |
|
7 |
# of the GNU General Public License, incorporated herein by reference. |
|
8 |
||
9 |
'''inotify-based status acceleration for Linux systems |
|
10 |
''' |
|
11 |
||
12 |
# todo: socket permissions |
|
13 |
||
7225
59b4ae211584
i18n: import _ instead of gettext
Martin Geisler <mg@daimi.au.dk>
parents:
7219
diff
changeset
|
14 |
from mercurial.i18n import _ |
6239 | 15 |
from mercurial import cmdutil, util |
16 |
import client, errno, os, server, socket |
|
17 |
from weakref import proxy |
|
18 |
||
19 |
def serve(ui, repo, **opts): |
|
20 |
'''start an inotify server for this repository''' |
|
21 |
timeout = opts.get('timeout') |
|
22 |
if timeout: |
|
23 |
timeout = float(timeout) * 1e3 |
|
24 |
||
25 |
class service: |
|
26 |
def init(self): |
|
6995
25619b72f86a
inotify: fix traceback when the server has been already started
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6239
diff
changeset
|
27 |
try: |
25619b72f86a
inotify: fix traceback when the server has been already started
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6239
diff
changeset
|
28 |
self.master = server.Master(ui, repo, timeout) |
25619b72f86a
inotify: fix traceback when the server has been already started
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6239
diff
changeset
|
29 |
except server.AlreadyStartedException, inst: |
25619b72f86a
inotify: fix traceback when the server has been already started
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6239
diff
changeset
|
30 |
raise util.Abort(str(inst)) |
6239 | 31 |
|
32 |
def run(self): |
|
33 |
try: |
|
34 |
self.master.run() |
|
35 |
finally: |
|
36 |
self.master.shutdown() |
|
37 |
||
38 |
service = service() |
|
39 |
cmdutil.service(opts, initfn=service.init, runfn=service.run) |
|
40 |
||
41 |
def reposetup(ui, repo): |
|
42 |
if not repo.local(): |
|
43 |
return |
|
44 |
||
45 |
# XXX: weakref until hg stops relying on __del__ |
|
46 |
repo = proxy(repo) |
|
47 |
||
48 |
class inotifydirstate(repo.dirstate.__class__): |
|
49 |
# Set to True if we're the inotify server, so we don't attempt |
|
50 |
# to recurse. |
|
51 |
inotifyserver = False |
|
52 |
||
6753
ed5ffb2c12f3
repo.status: eliminate list_
Matt Mackall <mpm@selenic.com>
parents:
6603
diff
changeset
|
53 |
def status(self, match, ignored, clean, unknown=True): |
6603
41eb20cc1c02
match: remove files arg from repo.status and friends
Matt Mackall <mpm@selenic.com>
parents:
6239
diff
changeset
|
54 |
files = match.files() |
7393
92c952c4470c
inotify: fix status . in repo.root
Brendan Cully <brendan@kublai.com>
parents:
7329
diff
changeset
|
55 |
if '.' in files: |
92c952c4470c
inotify: fix status . in repo.root
Brendan Cully <brendan@kublai.com>
parents:
7329
diff
changeset
|
56 |
files = [] |
6239 | 57 |
try: |
6753
ed5ffb2c12f3
repo.status: eliminate list_
Matt Mackall <mpm@selenic.com>
parents:
6603
diff
changeset
|
58 |
if not ignored and not self.inotifyserver: |
6239 | 59 |
result = client.query(ui, repo, files, match, False, |
6753
ed5ffb2c12f3
repo.status: eliminate list_
Matt Mackall <mpm@selenic.com>
parents:
6603
diff
changeset
|
60 |
clean, unknown) |
7219
1f6d2e487135
inotify: add debugging mode to inotify
Matt Mackall <mpm@selenic.com>
parents:
7218
diff
changeset
|
61 |
if ui.config('inotify', 'debug'): |
1f6d2e487135
inotify: add debugging mode to inotify
Matt Mackall <mpm@selenic.com>
parents:
7218
diff
changeset
|
62 |
r2 = super(inotifydirstate, self).status( |
1f6d2e487135
inotify: add debugging mode to inotify
Matt Mackall <mpm@selenic.com>
parents:
7218
diff
changeset
|
63 |
match, False, clean, unknown) |
1f6d2e487135
inotify: add debugging mode to inotify
Matt Mackall <mpm@selenic.com>
parents:
7218
diff
changeset
|
64 |
for c,a,b in zip('LMARDUIC', result, r2): |
1f6d2e487135
inotify: add debugging mode to inotify
Matt Mackall <mpm@selenic.com>
parents:
7218
diff
changeset
|
65 |
for f in a: |
1f6d2e487135
inotify: add debugging mode to inotify
Matt Mackall <mpm@selenic.com>
parents:
7218
diff
changeset
|
66 |
if f not in b: |
1f6d2e487135
inotify: add debugging mode to inotify
Matt Mackall <mpm@selenic.com>
parents:
7218
diff
changeset
|
67 |
ui.warn('*** inotify: %s +%s\n' % (c, f)) |
1f6d2e487135
inotify: add debugging mode to inotify
Matt Mackall <mpm@selenic.com>
parents:
7218
diff
changeset
|
68 |
for f in b: |
1f6d2e487135
inotify: add debugging mode to inotify
Matt Mackall <mpm@selenic.com>
parents:
7218
diff
changeset
|
69 |
if f not in a: |
7304
68374f1c8c87
inotify: fix bug in formatting
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7225
diff
changeset
|
70 |
ui.warn('*** inotify: %s -%s\n' % (c, f)) |
7219
1f6d2e487135
inotify: add debugging mode to inotify
Matt Mackall <mpm@selenic.com>
parents:
7218
diff
changeset
|
71 |
result = r2 |
1f6d2e487135
inotify: add debugging mode to inotify
Matt Mackall <mpm@selenic.com>
parents:
7218
diff
changeset
|
72 |
|
6239 | 73 |
if result is not None: |
74 |
return result |
|
6997
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6996
diff
changeset
|
75 |
except (OSError, socket.error), err: |
6239 | 76 |
if err[0] == errno.ECONNREFUSED: |
77 |
ui.warn(_('(found dead inotify server socket; ' |
|
78 |
'removing it)\n')) |
|
79 |
os.unlink(repo.join('inotify.sock')) |
|
6996
fecf060f32a1
inotify: deactivate inotify status on failure
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6995
diff
changeset
|
80 |
if err[0] in (errno.ECONNREFUSED, errno.ENOENT) and \ |
7218
1bd7f90465b3
inotify: auto-start by default when enabled
Matt Mackall <mpm@selenic.com>
parents:
7217
diff
changeset
|
81 |
ui.configbool('inotify', 'autostart', True): |
6239 | 82 |
query = None |
83 |
ui.debug(_('(starting inotify server)\n')) |
|
84 |
try: |
|
7329
fd4bf5269733
Do not abort with inotify extension enabled, but not supported by the system.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
7304
diff
changeset
|
85 |
try: |
fd4bf5269733
Do not abort with inotify extension enabled, but not supported by the system.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
7304
diff
changeset
|
86 |
server.start(ui, repo) |
fd4bf5269733
Do not abort with inotify extension enabled, but not supported by the system.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
7304
diff
changeset
|
87 |
query = client.query |
fd4bf5269733
Do not abort with inotify extension enabled, but not supported by the system.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
7304
diff
changeset
|
88 |
except server.AlreadyStartedException, inst: |
fd4bf5269733
Do not abort with inotify extension enabled, but not supported by the system.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
7304
diff
changeset
|
89 |
# another process may have started its own |
fd4bf5269733
Do not abort with inotify extension enabled, but not supported by the system.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
7304
diff
changeset
|
90 |
# inotify server while this one was starting. |
fd4bf5269733
Do not abort with inotify extension enabled, but not supported by the system.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
7304
diff
changeset
|
91 |
ui.debug(str(inst)) |
fd4bf5269733
Do not abort with inotify extension enabled, but not supported by the system.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
7304
diff
changeset
|
92 |
query = client.query |
6239 | 93 |
except Exception, inst: |
94 |
ui.warn(_('could not start inotify server: ' |
|
95 |
'%s\n') % inst) |
|
96 |
if query: |
|
97 |
try: |
|
98 |
return query(ui, repo, files or [], match, |
|
6753
ed5ffb2c12f3
repo.status: eliminate list_
Matt Mackall <mpm@selenic.com>
parents:
6603
diff
changeset
|
99 |
ignored, clean, unknown) |
6239 | 100 |
except socket.error, err: |
101 |
ui.warn(_('could not talk to new inotify ' |
|
6996
fecf060f32a1
inotify: deactivate inotify status on failure
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6995
diff
changeset
|
102 |
'server: %s\n') % err[-1]) |
7217
9fa2f8dcb869
inotify: friendlier message when daemon not running
Matt Mackall <mpm@selenic.com>
parents:
7083
diff
changeset
|
103 |
elif err[0] == errno.ENOENT: |
9fa2f8dcb869
inotify: friendlier message when daemon not running
Matt Mackall <mpm@selenic.com>
parents:
7083
diff
changeset
|
104 |
ui.warn(_('(inotify server not running)\n')) |
6996
fecf060f32a1
inotify: deactivate inotify status on failure
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6995
diff
changeset
|
105 |
else: |
fecf060f32a1
inotify: deactivate inotify status on failure
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6995
diff
changeset
|
106 |
ui.warn(_('failed to contact inotify server: %s\n') |
fecf060f32a1
inotify: deactivate inotify status on failure
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6995
diff
changeset
|
107 |
% err[-1]) |
fecf060f32a1
inotify: deactivate inotify status on failure
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6995
diff
changeset
|
108 |
ui.print_exc() |
fecf060f32a1
inotify: deactivate inotify status on failure
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6995
diff
changeset
|
109 |
# replace by old status function |
fecf060f32a1
inotify: deactivate inotify status on failure
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6995
diff
changeset
|
110 |
self.status = super(inotifydirstate, self).status |
6239 | 111 |
|
112 |
return super(inotifydirstate, self).status( |
|
6753
ed5ffb2c12f3
repo.status: eliminate list_
Matt Mackall <mpm@selenic.com>
parents:
6603
diff
changeset
|
113 |
match, ignored, clean, unknown) |
6239 | 114 |
|
115 |
repo.dirstate.__class__ = inotifydirstate |
|
116 |
||
117 |
cmdtable = { |
|
118 |
'^inserve': |
|
119 |
(serve, |
|
120 |
[('d', 'daemon', None, _('run server in background')), |
|
121 |
('', 'daemon-pipefds', '', _('used internally by daemon mode')), |
|
122 |
('t', 'idle-timeout', '', _('minutes to sit idle before exiting')), |
|
123 |
('', 'pid-file', '', _('name of file to write process ID to'))], |
|
124 |
_('hg inserve [OPT]...')), |
|
125 |
} |