author | Matt Mackall <mpm@selenic.com> |
Tue, 19 Jan 2010 22:20:08 -0600 | |
branch | stable |
changeset 10263 | 25e572394f5c |
parent 9900 | 8939900073a8 |
child 10264 | d6512b3e9ac0 |
permissions | -rw-r--r-- |
6239 | 1 |
# server.py - inotify status server |
2 |
# |
|
3 |
# Copyright 2006, 2007, 2008 Bryan O'Sullivan <bos@serpentine.com> |
|
4 |
# Copyright 2007, 2008 Brendan Cully <brendan@kublai.com> |
|
5 |
# |
|
8225
46293a0c7e9f
updated license to be explicit about GPL version 2
Martin Geisler <mg@lazybytes.net>
parents:
8209
diff
changeset
|
6 |
# This software may be used and distributed according to the terms of the |
10263 | 7 |
# GNU General Public License version 2 or any later version. |
6239 | 8 |
|
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
9 |
from mercurial.i18n import _ |
9514
7c01599dd340
inotify: use cmdutil.service instead of local daemonizing code
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9351
diff
changeset
|
10 |
from mercurial import cmdutil, 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 |
||
8787
9aca76502280
inotify: server: move split() out of server
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8786
diff
changeset
|
29 |
def split(path): |
9aca76502280
inotify: server: move split() out of server
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8786
diff
changeset
|
30 |
c = path.rfind('/') |
9aca76502280
inotify: server: move split() out of server
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8786
diff
changeset
|
31 |
if c == -1: |
9aca76502280
inotify: server: move split() out of server
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8786
diff
changeset
|
32 |
return '', path |
9aca76502280
inotify: server: move split() out of server
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8786
diff
changeset
|
33 |
return path[:c], path[c+1:] |
9aca76502280
inotify: server: move split() out of server
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8786
diff
changeset
|
34 |
|
6239 | 35 |
walk_ignored_errors = (errno.ENOENT, errno.ENAMETOOLONG) |
36 |
||
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
37 |
def walkrepodirs(dirstate, absroot): |
6239 | 38 |
'''Iterate over all subdirectories of this repo. |
39 |
Exclude the .hg directory, any nested repos, and ignored dirs.''' |
|
40 |
def walkit(dirname, top): |
|
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
41 |
fullpath = join(absroot, dirname) |
6239 | 42 |
try: |
8321
ec985dcfd7da
inotify: inotify.server.walkrepodirs() simplify
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8320
diff
changeset
|
43 |
for name, kind in osutil.listdir(fullpath): |
6239 | 44 |
if kind == stat.S_IFDIR: |
45 |
if name == '.hg': |
|
8323
589a82fb02a2
inotify: inotify.server.walk*() cleanup
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8322
diff
changeset
|
46 |
if not top: |
589a82fb02a2
inotify: inotify.server.walk*() cleanup
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8322
diff
changeset
|
47 |
return |
6239 | 48 |
else: |
49 |
d = join(dirname, name) |
|
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
50 |
if dirstate._ignore(d): |
6239 | 51 |
continue |
8322
3c6c21eb3416
inotify: inotify.server.walkrepodirs() simplify walking
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8321
diff
changeset
|
52 |
for subdir in walkit(d, False): |
3c6c21eb3416
inotify: inotify.server.walkrepodirs() simplify walking
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8321
diff
changeset
|
53 |
yield subdir |
6239 | 54 |
except OSError, err: |
55 |
if err.errno not in walk_ignored_errors: |
|
56 |
raise |
|
8324
b923d599c309
inotify: inotify.server.walk*() remove unnecessary var
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8323
diff
changeset
|
57 |
yield fullpath |
8322
3c6c21eb3416
inotify: inotify.server.walkrepodirs() simplify walking
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8321
diff
changeset
|
58 |
|
3c6c21eb3416
inotify: inotify.server.walkrepodirs() simplify walking
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8321
diff
changeset
|
59 |
return walkit('', True) |
6239 | 60 |
|
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
61 |
def walk(dirstate, absroot, root): |
6239 | 62 |
'''Like os.walk, but only yields regular files.''' |
63 |
||
64 |
# This function is critical to performance during startup. |
|
65 |
||
66 |
def walkit(root, reporoot): |
|
67 |
files, dirs = [], [] |
|
68 |
||
69 |
try: |
|
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
70 |
fullpath = join(absroot, root) |
6239 | 71 |
for name, kind in osutil.listdir(fullpath): |
72 |
if kind == stat.S_IFDIR: |
|
73 |
if name == '.hg': |
|
8325
f2559645643a
inotify: inotify.server.walk() simplify control flow
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8324
diff
changeset
|
74 |
if not reporoot: |
8323
589a82fb02a2
inotify: inotify.server.walk*() cleanup
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8322
diff
changeset
|
75 |
return |
8325
f2559645643a
inotify: inotify.server.walk() simplify control flow
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8324
diff
changeset
|
76 |
else: |
f2559645643a
inotify: inotify.server.walk() simplify control flow
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8324
diff
changeset
|
77 |
dirs.append(name) |
8381
f52fcc864df4
inotify: server.walk(): use yield instead of for
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8336
diff
changeset
|
78 |
path = join(root, name) |
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
79 |
if dirstate._ignore(path): |
8381
f52fcc864df4
inotify: server.walk(): use yield instead of for
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8336
diff
changeset
|
80 |
continue |
f52fcc864df4
inotify: server.walk(): use yield instead of for
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8336
diff
changeset
|
81 |
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
|
82 |
yield result |
6239 | 83 |
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
|
84 |
files.append(name) |
8324
b923d599c309
inotify: inotify.server.walk*() remove unnecessary var
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8323
diff
changeset
|
85 |
yield fullpath, dirs, files |
6239 | 86 |
|
87 |
except OSError, err: |
|
9116
f90bbf1ea09f
inotify: fix issue1375, add a test.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9115
diff
changeset
|
88 |
if err.errno == errno.ENOTDIR: |
f90bbf1ea09f
inotify: fix issue1375, add a test.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9115
diff
changeset
|
89 |
# fullpath was a directory, but has since been replaced |
f90bbf1ea09f
inotify: fix issue1375, add a test.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9115
diff
changeset
|
90 |
# by a file. |
f90bbf1ea09f
inotify: fix issue1375, add a test.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9115
diff
changeset
|
91 |
yield fullpath, dirs, files |
f90bbf1ea09f
inotify: fix issue1375, add a test.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9115
diff
changeset
|
92 |
elif err.errno not in walk_ignored_errors: |
6239 | 93 |
raise |
8320
a1305c1c8d8e
inotify: inotify.server.walk() simplify algorithm
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8319
diff
changeset
|
94 |
|
a1305c1c8d8e
inotify: inotify.server.walk() simplify algorithm
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8319
diff
changeset
|
95 |
return walkit(root, root == '') |
6239 | 96 |
|
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
97 |
def _explain_watch_limit(ui, dirstate, rootabs): |
6239 | 98 |
path = '/proc/sys/fs/inotify/max_user_watches' |
99 |
try: |
|
100 |
limit = int(file(path).read()) |
|
101 |
except IOError, err: |
|
102 |
if err.errno != errno.ENOENT: |
|
103 |
raise |
|
104 |
raise util.Abort(_('this system does not seem to ' |
|
105 |
'support inotify')) |
|
106 |
ui.warn(_('*** the current per-user limit on the number ' |
|
107 |
'of inotify watches is %s\n') % limit) |
|
108 |
ui.warn(_('*** this limit is too low to watch every ' |
|
109 |
'directory in this repository\n')) |
|
110 |
ui.warn(_('*** counting directories: ')) |
|
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
111 |
ndirs = len(list(walkrepodirs(dirstate, rootabs))) |
6239 | 112 |
ui.warn(_('found %d\n') % ndirs) |
113 |
newlimit = min(limit, 1024) |
|
114 |
while newlimit < ((limit + ndirs) * 1.1): |
|
115 |
newlimit *= 2 |
|
116 |
ui.warn(_('*** to raise the limit from %d to %d (run as root):\n') % |
|
117 |
(limit, newlimit)) |
|
118 |
ui.warn(_('*** echo %d > %s\n') % (newlimit, path)) |
|
119 |
raise util.Abort(_('cannot watch %s until inotify watch limit is raised') |
|
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
120 |
% rootabs) |
6239 | 121 |
|
8610
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
122 |
class pollable(object): |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
123 |
""" |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
124 |
Interface to support polling. |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
125 |
The file descriptor returned by fileno() is registered to a polling |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
126 |
object. |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
127 |
Usage: |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
128 |
Every tick, check if an event has happened since the last tick: |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
129 |
* If yes, call handle_events |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
130 |
* If no, call handle_timeout |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
131 |
""" |
6239 | 132 |
poll_events = select.POLLIN |
8792
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
133 |
instances = {} |
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
134 |
poll = select.poll() |
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
135 |
|
8610
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
136 |
def fileno(self): |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
137 |
raise NotImplementedError |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
138 |
|
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
139 |
def handle_events(self, events): |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
140 |
raise NotImplementedError |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
141 |
|
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
142 |
def handle_timeout(self): |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
143 |
raise NotImplementedError |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
144 |
|
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
145 |
def shutdown(self): |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
146 |
raise NotImplementedError |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
147 |
|
8792
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
148 |
def register(self, timeout): |
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
149 |
fd = self.fileno() |
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
150 |
|
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
151 |
pollable.poll.register(fd, pollable.poll_events) |
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
152 |
pollable.instances[fd] = self |
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
153 |
|
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
154 |
self.registered = True |
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
155 |
self.timeout = timeout |
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
156 |
|
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
157 |
def unregister(self): |
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
158 |
pollable.poll.unregister(self) |
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
159 |
self.registered = False |
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
160 |
|
8793
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
161 |
@classmethod |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
162 |
def run(cls): |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
163 |
while True: |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
164 |
timeout = None |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
165 |
timeobj = None |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
166 |
for obj in cls.instances.itervalues(): |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
167 |
if obj.timeout is not None and (timeout is None or obj.timeout < timeout): |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
168 |
timeout, timeobj = obj.timeout, obj |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
169 |
try: |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
170 |
events = cls.poll.poll(timeout) |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
171 |
except select.error, err: |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
172 |
if err[0] == errno.EINTR: |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
173 |
continue |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
174 |
raise |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
175 |
if events: |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
176 |
by_fd = {} |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
177 |
for fd, event in events: |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
178 |
by_fd.setdefault(fd, []).append(event) |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
179 |
|
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
180 |
for fd, events in by_fd.iteritems(): |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
181 |
cls.instances[fd].handle_pollevents(events) |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
182 |
|
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
183 |
elif timeobj: |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
184 |
timeobj.handle_timeout() |
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
185 |
|
8791
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
186 |
def eventaction(code): |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
187 |
""" |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
188 |
Decorator to help handle events in repowatcher |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
189 |
""" |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
190 |
def decorator(f): |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
191 |
def wrapper(self, wpath): |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
192 |
if code == 'm' and wpath in self.lastevent and \ |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
193 |
self.lastevent[wpath] in 'cm': |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
194 |
return |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
195 |
self.lastevent[wpath] = code |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
196 |
self.timeout = 250 |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
197 |
|
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
198 |
f(self, wpath) |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
199 |
|
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
200 |
wrapper.func_name = f.func_name |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
201 |
return wrapper |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
202 |
return decorator |
23730a475363
inotify.server: the decorator eventaction() shouldn't be a method of repowatcher
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
8787
diff
changeset
|
203 |
|
9115
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
204 |
class directory(object): |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
205 |
""" |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
206 |
Representing a directory |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
207 |
|
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
208 |
* path is the relative path from repo root to this directory |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
209 |
* files is a dict listing the files in this directory |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
210 |
- keys are file names |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
211 |
- values are file status |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
212 |
* dirs is a dict listing the subdirectories |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
213 |
- key are subdirectories names |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
214 |
- values are directory objects |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
215 |
""" |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
216 |
def __init__(self, relpath=''): |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
217 |
self.path = relpath |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
218 |
self.files = {} |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
219 |
self.dirs = {} |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
220 |
|
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
221 |
def dir(self, relpath): |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
222 |
""" |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
223 |
Returns the directory contained at the relative path relpath. |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
224 |
Creates the intermediate directories if necessary. |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
225 |
""" |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
226 |
if not relpath: |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
227 |
return self |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
228 |
l = relpath.split('/') |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
229 |
ret = self |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
230 |
while l: |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
231 |
next = l.pop(0) |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
232 |
try: |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
233 |
ret = ret.dirs[next] |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
234 |
except KeyError: |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
235 |
d = directory(join(ret.path, next)) |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
236 |
ret.dirs[next] = d |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
237 |
ret = d |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
238 |
return ret |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
239 |
|
9854
95e1867f765b
inotify: mark directories visited during lookup (issue1844)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9514
diff
changeset
|
240 |
def walk(self, states, visited=None): |
9115
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
241 |
""" |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
242 |
yield (filename, status) pairs for items in the trees |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
243 |
that have status in states. |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
244 |
filenames are relative to the repo root |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
245 |
""" |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
246 |
for file, st in self.files.iteritems(): |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
247 |
if st in states: |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
248 |
yield join(self.path, file), st |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
249 |
for dir in self.dirs.itervalues(): |
9854
95e1867f765b
inotify: mark directories visited during lookup (issue1844)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9514
diff
changeset
|
250 |
if visited is not None: |
95e1867f765b
inotify: mark directories visited during lookup (issue1844)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9514
diff
changeset
|
251 |
visited.add(dir.path) |
9115
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
252 |
for e in dir.walk(states): |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
253 |
yield e |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
254 |
|
9854
95e1867f765b
inotify: mark directories visited during lookup (issue1844)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9514
diff
changeset
|
255 |
def lookup(self, states, path, visited): |
9115
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
256 |
""" |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
257 |
yield root-relative filenames that match path, and whose |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
258 |
status are in states: |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
259 |
* if path is a file, yield path |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
260 |
* if path is a directory, yield directory files |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
261 |
* if path is not tracked, yield nothing |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
262 |
""" |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
263 |
if path[-1] == '/': |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
264 |
path = path[:-1] |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
265 |
|
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
266 |
paths = path.split('/') |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
267 |
|
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
268 |
# we need to check separately for last node |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
269 |
last = paths.pop() |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
270 |
|
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
271 |
tree = self |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
272 |
try: |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
273 |
for dir in paths: |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
274 |
tree = tree.dirs[dir] |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
275 |
except KeyError: |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
276 |
# path is not tracked |
9854
95e1867f765b
inotify: mark directories visited during lookup (issue1844)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9514
diff
changeset
|
277 |
visited.add(tree.path) |
9115
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
278 |
return |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
279 |
|
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
280 |
try: |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
281 |
# if path is a directory, walk it |
9854
95e1867f765b
inotify: mark directories visited during lookup (issue1844)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9514
diff
changeset
|
282 |
target = tree.dirs[last] |
95e1867f765b
inotify: mark directories visited during lookup (issue1844)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9514
diff
changeset
|
283 |
visited.add(target.path) |
95e1867f765b
inotify: mark directories visited during lookup (issue1844)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9514
diff
changeset
|
284 |
for file, st in target.walk(states, visited): |
9115
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
285 |
yield file |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
286 |
except KeyError: |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
287 |
try: |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
288 |
if tree.files[last] in states: |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
289 |
# path is a file |
9854
95e1867f765b
inotify: mark directories visited during lookup (issue1844)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9514
diff
changeset
|
290 |
visited.add(tree.path) |
9115
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
291 |
yield path |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
292 |
except KeyError: |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
293 |
# path is not tracked |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
294 |
pass |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
295 |
|
8610
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
296 |
class repowatcher(pollable): |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
297 |
""" |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
298 |
Watches inotify events |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
299 |
""" |
6239 | 300 |
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
|
301 |
mask = ( |
dcfdcb51ac5c
inotify: make mask a class variable since it's instance-independant
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8382
diff
changeset
|
302 |
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
|
303 |
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
|
304 |
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
|
305 |
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
|
306 |
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
|
307 |
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
|
308 |
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
|
309 |
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
|
310 |
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
|
311 |
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
|
312 |
0) |
6239 | 313 |
|
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
314 |
def __init__(self, ui, dirstate, root): |
6239 | 315 |
self.ui = ui |
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
316 |
self.dirstate = dirstate |
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
317 |
|
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
318 |
self.wprefix = join(root, '') |
9349
56fb15ad8fb1
inotify: server: use wprefix everywhere, introduce prefixlen
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9348
diff
changeset
|
319 |
self.prefixlen = len(self.wprefix) |
6239 | 320 |
try: |
8385
1536501ade62
inotify: Coding Style: name classes in lowercase.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8384
diff
changeset
|
321 |
self.watcher = watcher.watcher() |
6239 | 322 |
except OSError, err: |
323 |
raise util.Abort(_('inotify service not available: %s') % |
|
324 |
err.strerror) |
|
8385
1536501ade62
inotify: Coding Style: name classes in lowercase.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8384
diff
changeset
|
325 |
self.threshold = watcher.threshold(self.watcher) |
6239 | 326 |
self.fileno = self.watcher.fileno |
327 |
||
9115
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
328 |
self.tree = directory() |
6239 | 329 |
self.statcache = {} |
9115
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
330 |
self.statustrees = dict([(s, directory()) for s in self.statuskeys]) |
6239 | 331 |
|
332 |
self.last_event = None |
|
333 |
||
8605
ed2d9bdbfad2
inotify: do not defer inotify events processing
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8604
diff
changeset
|
334 |
self.lastevent = {} |
6239 | 335 |
|
8792
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
336 |
self.register(timeout=None) |
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
337 |
|
6239 | 338 |
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
|
339 |
self.handle_timeout() |
6239 | 340 |
self.scan() |
341 |
||
342 |
def event_time(self): |
|
343 |
last = self.last_event |
|
344 |
now = time.time() |
|
345 |
self.last_event = now |
|
346 |
||
347 |
if last is None: |
|
348 |
return 'start' |
|
349 |
delta = now - last |
|
350 |
if delta < 5: |
|
351 |
return '+%.3f' % delta |
|
352 |
if delta < 50: |
|
353 |
return '+%.2f' % delta |
|
354 |
return '+%.1f' % delta |
|
355 |
||
356 |
def dirstate_info(self): |
|
357 |
try: |
|
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
358 |
st = os.lstat(self.wprefix + '.hg/dirstate') |
6239 | 359 |
return st.st_mtime, st.st_ino |
360 |
except OSError, err: |
|
361 |
if err.errno != errno.ENOENT: |
|
362 |
raise |
|
363 |
return 0, 0 |
|
364 |
||
365 |
def add_watch(self, path, mask): |
|
366 |
if not path: |
|
367 |
return |
|
368 |
if self.watcher.path(path) is None: |
|
369 |
if self.ui.debugflag: |
|
9349
56fb15ad8fb1
inotify: server: use wprefix everywhere, introduce prefixlen
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9348
diff
changeset
|
370 |
self.ui.note(_('watching %r\n') % path[self.prefixlen:]) |
6239 | 371 |
try: |
372 |
self.watcher.add(path, mask) |
|
373 |
except OSError, err: |
|
374 |
if err.errno in (errno.ENOENT, errno.ENOTDIR): |
|
375 |
return |
|
376 |
if err.errno != errno.ENOSPC: |
|
377 |
raise |
|
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
378 |
_explain_watch_limit(self.ui, self.dirstate, self.wprefix) |
6239 | 379 |
|
380 |
def setup(self): |
|
9349
56fb15ad8fb1
inotify: server: use wprefix everywhere, introduce prefixlen
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9348
diff
changeset
|
381 |
self.ui.note(_('watching directories under %r\n') % self.wprefix) |
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
382 |
self.add_watch(self.wprefix + '.hg', inotify.IN_DELETE) |
6239 | 383 |
self.check_dirstate() |
384 |
||
385 |
def filestatus(self, fn, st): |
|
386 |
try: |
|
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
387 |
type_, mode, size, time = self.dirstate._map[fn][:4] |
6239 | 388 |
except KeyError: |
389 |
type_ = '?' |
|
390 |
if type_ == 'n': |
|
391 |
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
|
392 |
if size == -1: |
be81b4788115
inotify: fix confusion on files in lookup state
Matt Mackall <mpm@selenic.com>
parents:
6998
diff
changeset
|
393 |
return 'l' |
6239 | 394 |
if size and (size != st_size or (mode ^ st_mode) & 0100): |
395 |
return 'm' |
|
396 |
if time != int(st_mtime): |
|
397 |
return 'l' |
|
398 |
return 'n' |
|
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
399 |
if type_ == '?' and self.dirstate._ignore(fn): |
6239 | 400 |
return 'i' |
401 |
return type_ |
|
402 |
||
8599
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
403 |
def updatefile(self, wfn, osstat): |
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
404 |
''' |
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
405 |
update the file entry of an existing file. |
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
406 |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
407 |
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
|
408 |
''' |
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
409 |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
410 |
self._updatestatus(wfn, self.filestatus(wfn, osstat)) |
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
411 |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
412 |
def deletefile(self, wfn, oldstatus): |
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
413 |
''' |
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
414 |
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
|
415 |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
416 |
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
|
417 |
''' |
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
418 |
if oldstatus == 'r': |
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
419 |
newstatus = 'r' |
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
420 |
elif oldstatus in 'almn': |
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
421 |
newstatus = '!' |
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
422 |
else: |
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
423 |
newstatus = None |
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
424 |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
425 |
self.statcache.pop(wfn, None) |
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
426 |
self._updatestatus(wfn, newstatus) |
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
427 |
|
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
428 |
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
|
429 |
''' |
9115
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
430 |
Update the stored status of a file. |
8382
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
431 |
|
8599
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
432 |
newstatus: - char in (statuskeys + 'ni'), new status to apply. |
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
433 |
- 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
|
434 |
''' |
8787
9aca76502280
inotify: server: move split() out of server
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8786
diff
changeset
|
435 |
root, fn = split(wfn) |
9115
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
436 |
d = self.tree.dir(root) |
8599
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
437 |
|
9115
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
438 |
oldstatus = d.files.get(fn) |
8599
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
439 |
# oldstatus can be either: |
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
440 |
# - None : fn is new |
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
441 |
# - a char in statuskeys: fn is a (tracked) file |
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
442 |
|
8382
6f44b1adc948
inotify: RepoWatcher.updatestatus: document & use meaningful parameter names
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8381
diff
changeset
|
443 |
if self.ui.debugflag and oldstatus != newstatus: |
9115
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
444 |
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
|
445 |
(wfn, oldstatus, newstatus)) |
9115
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
446 |
|
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
447 |
if oldstatus and oldstatus in self.statuskeys \ |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
448 |
and oldstatus != newstatus: |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
449 |
del self.statustrees[oldstatus].dir(root).files[fn] |
9348
954f7a879495
inotify: server._updatestatus: simplify control flow
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9117
diff
changeset
|
450 |
|
954f7a879495
inotify: server._updatestatus: simplify control flow
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9117
diff
changeset
|
451 |
if newstatus in (None, 'i'): |
954f7a879495
inotify: server._updatestatus: simplify control flow
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9117
diff
changeset
|
452 |
d.files.pop(fn, None) |
954f7a879495
inotify: server._updatestatus: simplify control flow
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9117
diff
changeset
|
453 |
elif oldstatus != newstatus: |
9115
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
454 |
d.files[fn] = newstatus |
9348
954f7a879495
inotify: server._updatestatus: simplify control flow
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9117
diff
changeset
|
455 |
if newstatus != 'n': |
954f7a879495
inotify: server._updatestatus: simplify control flow
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9117
diff
changeset
|
456 |
self.statustrees[newstatus].dir(root).files[fn] = newstatus |
7892
67e59a9886d5
Fixing issue1542, adding a relevant test
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
7451
diff
changeset
|
457 |
|
6239 | 458 |
|
459 |
def check_deleted(self, key): |
|
460 |
# Files that had been deleted but were present in the dirstate |
|
461 |
# may have vanished from the dirstate; we must clean them up. |
|
462 |
nuke = [] |
|
9115
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
463 |
for wfn, ignore in self.statustrees[key].walk(key): |
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
464 |
if wfn not in self.dirstate: |
6239 | 465 |
nuke.append(wfn) |
466 |
for wfn in nuke: |
|
8787
9aca76502280
inotify: server: move split() out of server
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8786
diff
changeset
|
467 |
root, fn = split(wfn) |
9115
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
468 |
del self.statustrees[key].dir(root).files[fn] |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
469 |
del self.tree.dir(root).files[fn] |
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
470 |
|
6239 | 471 |
def scan(self, topdir=''): |
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
472 |
ds = self.dirstate._map.copy() |
9349
56fb15ad8fb1
inotify: server: use wprefix everywhere, introduce prefixlen
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9348
diff
changeset
|
473 |
self.add_watch(join(self.wprefix, topdir), self.mask) |
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
474 |
for root, dirs, files in walk(self.dirstate, self.wprefix, topdir): |
6239 | 475 |
for d in dirs: |
476 |
self.add_watch(join(root, d), self.mask) |
|
9349
56fb15ad8fb1
inotify: server: use wprefix everywhere, introduce prefixlen
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9348
diff
changeset
|
477 |
wroot = root[self.prefixlen:] |
8334
0695288e8c37
inotify: inotify.server.walk() filetype is never used, do not yield it
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8325
diff
changeset
|
478 |
for fn in files: |
6239 | 479 |
wfn = join(wroot, fn) |
8599
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
480 |
self.updatefile(wfn, self.getstat(wfn)) |
6239 | 481 |
ds.pop(wfn, None) |
482 |
wtopdir = topdir |
|
483 |
if wtopdir and wtopdir[-1] != '/': |
|
484 |
wtopdir += '/' |
|
485 |
for wfn, state in ds.iteritems(): |
|
486 |
if not wfn.startswith(wtopdir): |
|
487 |
continue |
|
7302
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
7280
diff
changeset
|
488 |
try: |
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
7280
diff
changeset
|
489 |
st = self.stat(wfn) |
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
7280
diff
changeset
|
490 |
except OSError: |
972737252d05
inotify: server raising an error when removing a file (issue1371)
Gerard Korsten <soonkia77@gmail.com>
parents:
7280
diff
changeset
|
491 |
status = state[0] |
8599
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
492 |
self.deletefile(wfn, status) |
6239 | 493 |
else: |
8599
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
494 |
self.updatefile(wfn, st) |
6239 | 495 |
self.check_deleted('!') |
496 |
self.check_deleted('r') |
|
497 |
||
498 |
def check_dirstate(self): |
|
499 |
ds_info = self.dirstate_info() |
|
500 |
if ds_info == self.ds_info: |
|
501 |
return |
|
502 |
self.ds_info = ds_info |
|
503 |
if not self.ui.debugflag: |
|
504 |
self.last_event = None |
|
505 |
self.ui.note(_('%s dirstate reload\n') % self.event_time()) |
|
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
506 |
self.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
|
507 |
self.handle_timeout() |
6239 | 508 |
self.scan() |
509 |
self.ui.note(_('%s end dirstate reload\n') % self.event_time()) |
|
510 |
||
511 |
def update_hgignore(self): |
|
512 |
# An update of the ignore file can potentially change the |
|
513 |
# states of all unknown and ignored files. |
|
514 |
||
515 |
# XXX If the user has other ignore files outside the repo, or |
|
516 |
# changes their list of ignore files at run time, we'll |
|
517 |
# potentially never see changes to them. We could get the |
|
518 |
# client to report to us what ignore data they're using. |
|
519 |
# But it's easier to do nothing than to open that can of |
|
520 |
# worms. |
|
521 |
||
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
522 |
if '_ignore' in self.dirstate.__dict__: |
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
523 |
delattr(self.dirstate, '_ignore') |
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
524 |
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
|
525 |
self.handle_timeout() |
6239 | 526 |
self.scan() |
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
527 |
|
6239 | 528 |
def getstat(self, wpath): |
529 |
try: |
|
530 |
return self.statcache[wpath] |
|
531 |
except KeyError: |
|
532 |
try: |
|
533 |
return self.stat(wpath) |
|
534 |
except OSError, err: |
|
535 |
if err.errno != errno.ENOENT: |
|
536 |
raise |
|
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
537 |
|
6239 | 538 |
def stat(self, wpath): |
539 |
try: |
|
540 |
st = os.lstat(join(self.wprefix, wpath)) |
|
541 |
ret = st.st_mode, st.st_size, st.st_mtime |
|
542 |
self.statcache[wpath] = ret |
|
543 |
return ret |
|
7280
810ca383da9c
remove unused variables
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7220
diff
changeset
|
544 |
except OSError: |
6239 | 545 |
self.statcache.pop(wpath, None) |
546 |
raise |
|
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
547 |
|
8606
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
548 |
@eventaction('c') |
6239 | 549 |
def created(self, wpath): |
550 |
if wpath == '.hgignore': |
|
551 |
self.update_hgignore() |
|
552 |
try: |
|
553 |
st = self.stat(wpath) |
|
554 |
if stat.S_ISREG(st[0]): |
|
8599
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
555 |
self.updatefile(wpath, st) |
7280
810ca383da9c
remove unused variables
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
7220
diff
changeset
|
556 |
except OSError: |
6239 | 557 |
pass |
558 |
||
8606
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
559 |
@eventaction('m') |
6239 | 560 |
def modified(self, wpath): |
561 |
if wpath == '.hgignore': |
|
562 |
self.update_hgignore() |
|
563 |
try: |
|
564 |
st = self.stat(wpath) |
|
565 |
if stat.S_ISREG(st[0]): |
|
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
566 |
if self.dirstate[wpath] in 'lmn': |
8599
1f706b1b62f3
inotify: server: refactor updatestatus()
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8557
diff
changeset
|
567 |
self.updatefile(wpath, st) |
6239 | 568 |
except OSError: |
569 |
pass |
|
570 |
||
8606
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
571 |
@eventaction('d') |
6239 | 572 |
def deleted(self, wpath): |
573 |
if wpath == '.hgignore': |
|
574 |
self.update_hgignore() |
|
575 |
elif wpath.startswith('.hg/'): |
|
576 |
if wpath == '.hg/wlock': |
|
577 |
self.check_dirstate() |
|
578 |
return |
|
579 |
||
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
580 |
self.deletefile(wpath, self.dirstate[wpath]) |
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
581 |
|
6239 | 582 |
def process_create(self, wpath, evt): |
583 |
if self.ui.debugflag: |
|
584 |
self.ui.note(_('%s event: created %s\n') % |
|
585 |
(self.event_time(), wpath)) |
|
586 |
||
587 |
if evt.mask & inotify.IN_ISDIR: |
|
588 |
self.scan(wpath) |
|
589 |
else: |
|
8606
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
590 |
self.created(wpath) |
6239 | 591 |
|
592 |
def process_delete(self, wpath, evt): |
|
593 |
if self.ui.debugflag: |
|
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
594 |
self.ui.note(_('%s event: deleted %s\n') % |
6239 | 595 |
(self.event_time(), wpath)) |
596 |
||
597 |
if evt.mask & inotify.IN_ISDIR: |
|
9115
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
598 |
tree = self.tree.dir(wpath) |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
599 |
todelete = [wfn for wfn, ignore in tree.walk('?')] |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
600 |
for fn in todelete: |
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
601 |
self.deletefile(fn, '?') |
6239 | 602 |
self.scan(wpath) |
8600
d46cdfcecaf1
inotify: proper fix for issue1542 (partially reverting 67e59a9886d5)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8599
diff
changeset
|
603 |
else: |
8606
1c5752dabf76
inotify: use a decorator instead of dispatching calls
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8605
diff
changeset
|
604 |
self.deleted(wpath) |
6239 | 605 |
|
606 |
def process_modify(self, wpath, evt): |
|
607 |
if self.ui.debugflag: |
|
608 |
self.ui.note(_('%s event: modified %s\n') % |
|
609 |
(self.event_time(), wpath)) |
|
610 |
||
611 |
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
|
612 |
self.modified(wpath) |
6239 | 613 |
|
614 |
def process_unmount(self, evt): |
|
615 |
self.ui.warn(_('filesystem containing %s was unmounted\n') % |
|
616 |
evt.fullpath) |
|
617 |
sys.exit(0) |
|
618 |
||
8609
aeaa0bd9dc24
inotify: process all inotify events in one batch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8608
diff
changeset
|
619 |
def handle_pollevents(self, events): |
6239 | 620 |
if self.ui.debugflag: |
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
621 |
self.ui.note(_('%s readable: %d bytes\n') % |
6239 | 622 |
(self.event_time(), self.threshold.readable())) |
623 |
if not self.threshold(): |
|
624 |
if self.registered: |
|
625 |
if self.ui.debugflag: |
|
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
626 |
self.ui.note(_('%s below threshold - unhooking\n') % |
6239 | 627 |
(self.event_time())) |
8792
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
628 |
self.unregister() |
6239 | 629 |
self.timeout = 250 |
630 |
else: |
|
631 |
self.read_events() |
|
632 |
||
633 |
def read_events(self, bufsize=None): |
|
634 |
events = self.watcher.read(bufsize) |
|
635 |
if self.ui.debugflag: |
|
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
636 |
self.ui.note(_('%s reading %d events\n') % |
6239 | 637 |
(self.event_time(), len(events))) |
638 |
for evt in events: |
|
8953
e1d119f450f0
inotify: server: remove wpath method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8952
diff
changeset
|
639 |
assert evt.fullpath.startswith(self.wprefix) |
9349
56fb15ad8fb1
inotify: server: use wprefix everywhere, introduce prefixlen
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9348
diff
changeset
|
640 |
wpath = evt.fullpath[self.prefixlen:] |
8953
e1d119f450f0
inotify: server: remove wpath method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8952
diff
changeset
|
641 |
|
9117
a87bc6e2a907
inotify: server: explicitely ignore events in subdirs of .hg/ (issue1735)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9116
diff
changeset
|
642 |
# paths have been normalized, wpath never ends with a '/' |
a87bc6e2a907
inotify: server: explicitely ignore events in subdirs of .hg/ (issue1735)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9116
diff
changeset
|
643 |
|
a87bc6e2a907
inotify: server: explicitely ignore events in subdirs of .hg/ (issue1735)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9116
diff
changeset
|
644 |
if wpath.startswith('.hg/') and evt.mask & inotify.IN_ISDIR: |
a87bc6e2a907
inotify: server: explicitely ignore events in subdirs of .hg/ (issue1735)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9116
diff
changeset
|
645 |
# ignore subdirectories of .hg/ (merge, patches...) |
a87bc6e2a907
inotify: server: explicitely ignore events in subdirs of .hg/ (issue1735)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9116
diff
changeset
|
646 |
continue |
a87bc6e2a907
inotify: server: explicitely ignore events in subdirs of .hg/ (issue1735)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9116
diff
changeset
|
647 |
|
6239 | 648 |
if evt.mask & inotify.IN_UNMOUNT: |
649 |
self.process_unmount(wpath, evt) |
|
650 |
elif evt.mask & (inotify.IN_MODIFY | inotify.IN_ATTRIB): |
|
651 |
self.process_modify(wpath, evt) |
|
652 |
elif evt.mask & (inotify.IN_DELETE | inotify.IN_DELETE_SELF | |
|
653 |
inotify.IN_MOVED_FROM): |
|
654 |
self.process_delete(wpath, evt) |
|
655 |
elif evt.mask & (inotify.IN_CREATE | inotify.IN_MOVED_TO): |
|
656 |
self.process_create(wpath, evt) |
|
657 |
||
8605
ed2d9bdbfad2
inotify: do not defer inotify events processing
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8604
diff
changeset
|
658 |
self.lastevent.clear() |
ed2d9bdbfad2
inotify: do not defer inotify events processing
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8604
diff
changeset
|
659 |
|
6239 | 660 |
def handle_timeout(self): |
661 |
if not self.registered: |
|
662 |
if self.ui.debugflag: |
|
6961
12163fb21fce
i18n: mark strings for translation in inotify extension
Martin Geisler <mg@daimi.au.dk>
parents:
6909
diff
changeset
|
663 |
self.ui.note(_('%s hooking back up with %d bytes readable\n') % |
6239 | 664 |
(self.event_time(), self.threshold.readable())) |
665 |
self.read_events(0) |
|
8792
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
666 |
self.register(timeout=None) |
6239 | 667 |
|
668 |
self.timeout = None |
|
669 |
||
670 |
def shutdown(self): |
|
671 |
self.watcher.close() |
|
672 |
||
8555
3e09bc5fee12
inotify: introduce debuginotify, which lists which paths are under watch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8554
diff
changeset
|
673 |
def debug(self): |
3e09bc5fee12
inotify: introduce debuginotify, which lists which paths are under watch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8554
diff
changeset
|
674 |
""" |
3e09bc5fee12
inotify: introduce debuginotify, which lists which paths are under watch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8554
diff
changeset
|
675 |
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
|
676 |
for debugging purposes. |
3e09bc5fee12
inotify: introduce debuginotify, which lists which paths are under watch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8554
diff
changeset
|
677 |
""" |
9349
56fb15ad8fb1
inotify: server: use wprefix everywhere, introduce prefixlen
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9348
diff
changeset
|
678 |
return sorted(tuple[0][self.prefixlen:] for tuple in self.watcher) |
8555
3e09bc5fee12
inotify: introduce debuginotify, which lists which paths are under watch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8554
diff
changeset
|
679 |
|
8610
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
680 |
class server(pollable): |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
681 |
""" |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
682 |
Listens for client queries on unix socket inotify.sock |
8ef1f63e554c
inotify: server: use a common 'pollable' interface for server & repowatcher
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8609
diff
changeset
|
683 |
""" |
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
684 |
def __init__(self, ui, root, repowatcher, timeout): |
6239 | 685 |
self.ui = ui |
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
686 |
self.repowatcher = repowatcher |
6239 | 687 |
self.sock = socket.socket(socket.AF_UNIX) |
9350
b789ea382fc0
inotify: server: use dirstate instead of repo
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9349
diff
changeset
|
688 |
self.sockpath = join(root, '.hg/inotify.sock') |
6997
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
689 |
self.realsockpath = None |
6239 | 690 |
try: |
691 |
self.sock.bind(self.sockpath) |
|
692 |
except socket.error, err: |
|
693 |
if err[0] == errno.EADDRINUSE: |
|
9900
8939900073a8
inotify: improve error messages
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9897
diff
changeset
|
694 |
raise AlreadyStartedException( _('cannot start: socket is ' |
8939900073a8
inotify: improve error messages
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9897
diff
changeset
|
695 |
'already bound')) |
6997
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
696 |
if err[0] == "AF_UNIX path too long": |
9900
8939900073a8
inotify: improve error messages
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9897
diff
changeset
|
697 |
if os.path.islink(self.sockpath) and \ |
8939900073a8
inotify: improve error messages
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9897
diff
changeset
|
698 |
not os.path.exists(self.sockpath): |
8939900073a8
inotify: improve error messages
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9897
diff
changeset
|
699 |
raise util.Abort('inotify-server: cannot start: ' |
8939900073a8
inotify: improve error messages
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9897
diff
changeset
|
700 |
'.hg/inotify.sock is a broken symlink') |
6997
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
701 |
tempdir = tempfile.mkdtemp(prefix="hg-inotify-") |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
702 |
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
|
703 |
try: |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
704 |
self.sock.bind(self.realsockpath) |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
705 |
os.symlink(self.realsockpath, self.sockpath) |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
706 |
except (OSError, socket.error), inst: |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
707 |
try: |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
708 |
os.unlink(self.realsockpath) |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
709 |
except: |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
710 |
pass |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
711 |
os.rmdir(tempdir) |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
712 |
if inst.errno == errno.EEXIST: |
9900
8939900073a8
inotify: improve error messages
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9897
diff
changeset
|
713 |
raise AlreadyStartedException(_('cannot start: tried ' |
8939900073a8
inotify: improve error messages
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9897
diff
changeset
|
714 |
'linking .hg/inotify.sock to a temporary socket but' |
8939900073a8
inotify: improve error messages
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9897
diff
changeset
|
715 |
' .hg/inotify.sock already exists')) |
6997
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
716 |
raise |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
717 |
else: |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
718 |
raise |
6239 | 719 |
self.sock.listen(5) |
720 |
self.fileno = self.sock.fileno |
|
8792
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
721 |
self.register(timeout=timeout) |
6239 | 722 |
|
723 |
def handle_timeout(self): |
|
724 |
pass |
|
725 |
||
8554
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
726 |
def answer_stat_query(self, cs): |
6239 | 727 |
names = cs.read().split('\0') |
6287
c86207d41512
Spacing cleanup
Thomas Arendsen Hein <thomas@intevation.de>
parents:
6239
diff
changeset
|
728 |
|
6239 | 729 |
states = names.pop() |
730 |
||
731 |
self.ui.note(_('answering query for %r\n') % states) |
|
732 |
||
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
733 |
if self.repowatcher.timeout: |
6239 | 734 |
# We got a query while a rescan is pending. Make sure we |
735 |
# rescan before responding, or we could give back a wrong |
|
736 |
# answer. |
|
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
737 |
self.repowatcher.handle_timeout() |
6239 | 738 |
|
9854
95e1867f765b
inotify: mark directories visited during lookup (issue1844)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9514
diff
changeset
|
739 |
visited = set() |
6239 | 740 |
if not names: |
741 |
def genresult(states, tree): |
|
9115
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
742 |
for fn, state in tree.walk(states): |
6239 | 743 |
yield fn |
744 |
else: |
|
745 |
def genresult(states, tree): |
|
746 |
for fn in names: |
|
9854
95e1867f765b
inotify: mark directories visited during lookup (issue1844)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9514
diff
changeset
|
747 |
for f in tree.lookup(states, fn, visited): |
9115
b55d44719b47
inotify: server: new data structure to keep track of changes.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8953
diff
changeset
|
748 |
yield f |
6239 | 749 |
|
8554
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
750 |
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
|
751 |
genresult('l', self.repowatcher.statustrees['l']), |
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
752 |
genresult('m', self.repowatcher.statustrees['m']), |
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
753 |
genresult('a', self.repowatcher.statustrees['a']), |
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
754 |
genresult('r', self.repowatcher.statustrees['r']), |
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
755 |
genresult('!', self.repowatcher.statustrees['!']), |
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
756 |
'?' in states |
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
757 |
and genresult('?', self.repowatcher.statustrees['?']) |
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
758 |
or [], |
6239 | 759 |
[], |
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
760 |
'c' in states and genresult('n', self.repowatcher.tree) or [], |
9854
95e1867f765b
inotify: mark directories visited during lookup (issue1844)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9514
diff
changeset
|
761 |
visited |
6239 | 762 |
]] |
763 |
||
8555
3e09bc5fee12
inotify: introduce debuginotify, which lists which paths are under watch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8554
diff
changeset
|
764 |
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
|
765 |
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
|
766 |
|
8609
aeaa0bd9dc24
inotify: process all inotify events in one batch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8608
diff
changeset
|
767 |
def handle_pollevents(self, events): |
aeaa0bd9dc24
inotify: process all inotify events in one batch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8608
diff
changeset
|
768 |
for e in events: |
aeaa0bd9dc24
inotify: process all inotify events in one batch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8608
diff
changeset
|
769 |
self.handle_pollevent() |
aeaa0bd9dc24
inotify: process all inotify events in one batch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8608
diff
changeset
|
770 |
|
8608
228db070bfc4
inotify: rename handle_event to handle_pollevent to avoid confusion
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8607
diff
changeset
|
771 |
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
|
772 |
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
|
773 |
|
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
774 |
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
|
775 |
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
|
776 |
|
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
777 |
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
|
778 |
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
|
779 |
'version %d\n') % version) |
8952
7c7a672e9db7
inotify: return version to client even when not matching
Simon Heimberg <simohe@besonet.ch>
parents:
8794
diff
changeset
|
780 |
try: |
7c7a672e9db7
inotify: return version to client even when not matching
Simon Heimberg <simohe@besonet.ch>
parents:
8794
diff
changeset
|
781 |
# try to send back our version to the client |
7c7a672e9db7
inotify: return version to client even when not matching
Simon Heimberg <simohe@besonet.ch>
parents:
8794
diff
changeset
|
782 |
# this way, the client too is informed of the mismatch |
7c7a672e9db7
inotify: return version to client even when not matching
Simon Heimberg <simohe@besonet.ch>
parents:
8794
diff
changeset
|
783 |
sock.sendall(chr(common.version)) |
7c7a672e9db7
inotify: return version to client even when not matching
Simon Heimberg <simohe@besonet.ch>
parents:
8794
diff
changeset
|
784 |
except: |
7c7a672e9db7
inotify: return version to client even when not matching
Simon Heimberg <simohe@besonet.ch>
parents:
8794
diff
changeset
|
785 |
pass |
8554
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
786 |
return |
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
787 |
|
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
788 |
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
|
789 |
|
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
790 |
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
|
791 |
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
|
792 |
elif type == 'DBUG': |
3e09bc5fee12
inotify: introduce debuginotify, which lists which paths are under watch
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8554
diff
changeset
|
793 |
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
|
794 |
else: |
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
795 |
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
|
796 |
return |
47d7347484f5
inotify: put STAT-specific query answer generation part in its own method
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8553
diff
changeset
|
797 |
|
6239 | 798 |
try: |
799 |
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
|
800 |
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
|
801 |
|
8553
e387ecd7a6ed
inotify: change protocol so that different query types can be supported.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8386
diff
changeset
|
802 |
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
|
803 |
*map(len, results))) |
6239 | 804 |
sock.sendall(''.join(results)) |
805 |
finally: |
|
806 |
sock.shutdown(socket.SHUT_WR) |
|
807 |
except socket.error, err: |
|
808 |
if err[0] != errno.EPIPE: |
|
809 |
raise |
|
810 |
||
811 |
def shutdown(self): |
|
812 |
self.sock.close() |
|
813 |
try: |
|
814 |
os.unlink(self.sockpath) |
|
6997
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
815 |
if self.realsockpath: |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
816 |
os.unlink(self.realsockpath) |
9c4e488f105e
inotify: workaround ENAMETOOLONG by using symlinks
Benoit Boissinot <benoit.boissinot@ens-lyon.org>
parents:
6994
diff
changeset
|
817 |
os.rmdir(os.path.dirname(self.realsockpath)) |
6239 | 818 |
except OSError, err: |
819 |
if err.errno != errno.ENOENT: |
|
820 |
raise |
|
821 |
||
8385
1536501ade62
inotify: Coding Style: name classes in lowercase.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8384
diff
changeset
|
822 |
class master(object): |
9351
206f7f4c5c2a
inotify: client: no repo use
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9350
diff
changeset
|
823 |
def __init__(self, ui, dirstate, root, timeout=None): |
6239 | 824 |
self.ui = ui |
9351
206f7f4c5c2a
inotify: client: no repo use
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9350
diff
changeset
|
825 |
self.repowatcher = repowatcher(ui, dirstate, root) |
206f7f4c5c2a
inotify: client: no repo use
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9350
diff
changeset
|
826 |
self.server = server(ui, root, self.repowatcher, timeout) |
6239 | 827 |
|
828 |
def shutdown(self): |
|
8792
3e23b1d20837
inotify: refactor (un)register methods into pollable object
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8791
diff
changeset
|
829 |
for obj in pollable.instances.itervalues(): |
6239 | 830 |
obj.shutdown() |
831 |
||
832 |
def run(self): |
|
8335
713ec3f9c9de
inotify: Clarify the use of "watcher" name.
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8334
diff
changeset
|
833 |
self.repowatcher.setup() |
6239 | 834 |
self.ui.note(_('finished setup\n')) |
835 |
if os.getenv('TIME_STARTUP'): |
|
836 |
sys.exit(0) |
|
8793
9d0c521bce0e
inotify: put the "while True: poll()" loop in pollable class
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
8792
diff
changeset
|
837 |
pollable.run() |
6239 | 838 |
|
9514
7c01599dd340
inotify: use cmdutil.service instead of local daemonizing code
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9351
diff
changeset
|
839 |
def start(ui, dirstate, root, opts): |
7c01599dd340
inotify: use cmdutil.service instead of local daemonizing code
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9351
diff
changeset
|
840 |
timeout = opts.get('timeout') |
7c01599dd340
inotify: use cmdutil.service instead of local daemonizing code
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9351
diff
changeset
|
841 |
if timeout: |
7c01599dd340
inotify: use cmdutil.service instead of local daemonizing code
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9351
diff
changeset
|
842 |
timeout = float(timeout) * 1e3 |
7c01599dd340
inotify: use cmdutil.service instead of local daemonizing code
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9351
diff
changeset
|
843 |
|
7c01599dd340
inotify: use cmdutil.service instead of local daemonizing code
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9351
diff
changeset
|
844 |
class service(object): |
7c01599dd340
inotify: use cmdutil.service instead of local daemonizing code
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9351
diff
changeset
|
845 |
def init(self): |
7451
fca9947652ce
inotify: close most file descriptors when autostarting
Brendan Cully <brendan@kublai.com>
parents:
7420
diff
changeset
|
846 |
try: |
9514
7c01599dd340
inotify: use cmdutil.service instead of local daemonizing code
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9351
diff
changeset
|
847 |
self.master = master(ui, dirstate, root, timeout) |
7c01599dd340
inotify: use cmdutil.service instead of local daemonizing code
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9351
diff
changeset
|
848 |
except AlreadyStartedException, inst: |
9900
8939900073a8
inotify: improve error messages
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9897
diff
changeset
|
849 |
raise util.Abort("inotify-server: %s" % inst) |
6239 | 850 |
|
9514
7c01599dd340
inotify: use cmdutil.service instead of local daemonizing code
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9351
diff
changeset
|
851 |
def run(self): |
7c01599dd340
inotify: use cmdutil.service instead of local daemonizing code
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9351
diff
changeset
|
852 |
try: |
7c01599dd340
inotify: use cmdutil.service instead of local daemonizing code
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9351
diff
changeset
|
853 |
self.master.run() |
7c01599dd340
inotify: use cmdutil.service instead of local daemonizing code
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9351
diff
changeset
|
854 |
finally: |
7c01599dd340
inotify: use cmdutil.service instead of local daemonizing code
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9351
diff
changeset
|
855 |
self.master.shutdown() |
6239 | 856 |
|
9514
7c01599dd340
inotify: use cmdutil.service instead of local daemonizing code
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9351
diff
changeset
|
857 |
if 'inserve' not in sys.argv: |
7c01599dd340
inotify: use cmdutil.service instead of local daemonizing code
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9351
diff
changeset
|
858 |
runargs = [sys.argv[0], 'inserve', '-R', root] |
9897
97eda2133a9b
inotify: add a inotify.pidfile configuration possibility
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9854
diff
changeset
|
859 |
else: |
97eda2133a9b
inotify: add a inotify.pidfile configuration possibility
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9854
diff
changeset
|
860 |
runargs = sys.argv[:] |
97eda2133a9b
inotify: add a inotify.pidfile configuration possibility
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9854
diff
changeset
|
861 |
|
97eda2133a9b
inotify: add a inotify.pidfile configuration possibility
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9854
diff
changeset
|
862 |
pidfile = ui.config('inotify', 'pidfile') |
97eda2133a9b
inotify: add a inotify.pidfile configuration possibility
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9854
diff
changeset
|
863 |
if opts['daemon'] and pidfile is not None and 'pid-file' not in runargs: |
97eda2133a9b
inotify: add a inotify.pidfile configuration possibility
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9854
diff
changeset
|
864 |
runargs.append("--pid-file=%s" % pidfile) |
6239 | 865 |
|
9514
7c01599dd340
inotify: use cmdutil.service instead of local daemonizing code
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9351
diff
changeset
|
866 |
service = service() |
7c01599dd340
inotify: use cmdutil.service instead of local daemonizing code
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9351
diff
changeset
|
867 |
logfile = ui.config('inotify', 'log') |
7c01599dd340
inotify: use cmdutil.service instead of local daemonizing code
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9351
diff
changeset
|
868 |
cmdutil.service(opts, initfn=service.init, runfn=service.run, |
7c01599dd340
inotify: use cmdutil.service instead of local daemonizing code
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents:
9351
diff
changeset
|
869 |
logfile=logfile, runargs=runargs) |