author | mickeyl <mickeyl> | 2005-05-02 13:49:14 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2005-05-02 13:49:14 (UTC) |
commit | 8cbb0586482ec650d7ff4fa9b6a7390b8b050793 (patch) (unidiff) | |
tree | 926c2fedf0f62a965362178620625e3ddc5171de /libopie2/opiecore/ofilenotify.h | |
parent | 3a86e1464fb00d3d9b9962bcabc1041d8a3d9343 (diff) | |
download | opie-8cbb0586482ec650d7ff4fa9b6a7390b8b050793.zip opie-8cbb0586482ec650d7ff4fa9b6a7390b8b050793.tar.gz opie-8cbb0586482ec650d7ff4fa9b6a7390b8b050793.tar.bz2 |
Rewrite OFileNotification to use the upcoming inotify (kernel 2.6) interface instead of the deprecated dnotify
Diffstat (limited to 'libopie2/opiecore/ofilenotify.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | libopie2/opiecore/ofilenotify.h | 93 |
1 files changed, 50 insertions, 43 deletions
diff --git a/libopie2/opiecore/ofilenotify.h b/libopie2/opiecore/ofilenotify.h index d820f7c..e3621cf 100644 --- a/libopie2/opiecore/ofilenotify.h +++ b/libopie2/opiecore/ofilenotify.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | This file is part of the Opie Project | 2 | This file is part of the Opie Project |
3 | =. Copyright (C) 2004 Michael 'Mickey' Lauer <mickey@Vanille.de> | 3 | =. Copyright (C) 2004-2005 Michael 'Mickey' Lauer <mickey@Vanille.de> |
4 | .=l. Copyright (C) The Opie Team <opie-devel@handhelds.org> | 4 | .=l. Copyright (C) The Opie Team <opie-devel@handhelds.org> |
5 | .>+-= | 5 | .>+-= |
@@ -8,6 +8,6 @@ _;:, .> :=|. This program is free software; you can | |||
8 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public | 8 | :`=1 )Y*s>-.-- : the terms of the GNU Library General Public |
9 | .="- .-=="i, .._ License as published by the Free Software | 9 | .="- .-=="i, .._ License as published by the Free Software |
10 | - . .-<_> .<> Foundation; either version 2 of the License, | 10 | - . .-<_> .<> Foundation; version 2 of the License. |
11 | ._= =} : or (at your option) any later version. | 11 | ._= =} : |
12 | .%`+i> _;_. | 12 | .%`+i> _;_. |
13 | .i_,=:_. -<s. This program is distributed in the hope that | 13 | .i_,=:_. -<s. This program is distributed in the hope that |
@@ -34,11 +34,10 @@ _;:, .> :=|. This program is free software; you can | |||
34 | 34 | ||
35 | /* QT */ | 35 | /* QT */ |
36 | #include <qobject.h> | 36 | #include <qsocketnotifier.h> |
37 | #include <qsignal.h> | 37 | #include <qsignal.h> |
38 | #include <qstring.h> | 38 | #include <qstring.h> |
39 | 39 | ||
40 | /* STD */ | 40 | /* STD */ |
41 | #include <signal.h> | 41 | #include "inotify.h" |
42 | #include <fcntl.h> | ||
43 | 42 | ||
44 | namespace Opie { | 43 | namespace Opie { |
@@ -57,20 +56,39 @@ namespace Core { | |||
57 | * <li>Access: The file was accessed (read) | 56 | * <li>Access: The file was accessed (read) |
58 | * <li>Modify The file was modified (write,truncate) | 57 | * <li>Modify The file was modified (write,truncate) |
59 | * <li>Create = The file was created in the directory | ||
60 | * <li>Delete = The file was unlinked from directory | ||
61 | * <li>Rename = The file was renamed | ||
62 | * <li>Attrib = The file had its attributes changed (chmod,chown,chgrp) | 58 | * <li>Attrib = The file had its attributes changed (chmod,chown,chgrp) |
59 | * <li>CloseWrite = Writable file was closed | ||
60 | * <li>CloseNoWrite = Unwritable file was closed | ||
61 | * <li>Open = File was opened | ||
62 | * <li>MovedFrom = File was moved from X | ||
63 | * <li>MovedTo = File was moved to Y | ||
64 | * <li>DeleteSubdir = Subdir was deleted | ||
65 | * <li>DeleteFile = Subfile was deleted | ||
66 | * <li>CreateSubdir = Subdir was created | ||
67 | * <li>CreateFile = Subfile was created | ||
68 | * <li>DeleteSelf = Self was deleted | ||
69 | * <li>Unmount = The backing filesystem was unmounted | ||
63 | * </ul> | 70 | * </ul> |
64 | * | 71 | * |
65 | **/ | 72 | **/ |
66 | 73 | ||
67 | enum OFileNotificationType { Single = 0x0000000, | 74 | enum OFileNotificationType |
68 | Multi = DN_MULTISHOT, | 75 | { |
69 | Access = DN_ACCESS, | 76 | Access = IN_ACCESS, |
70 | Modify = DN_MODIFY, | 77 | Modify = IN_MODIFY, |
71 | Create = DN_CREATE, | 78 | Attrib = IN_ATTRIB, |
72 | Delete = DN_DELETE, | 79 | CloseWrite = IN_CLOSE_WRITE, |
73 | Rename = DN_RENAME, | 80 | CloseNoWrite = IN_CLOSE_NOWRITE, |
74 | Attrib = DN_ATTRIB }; | 81 | Open = IN_OPEN, |
82 | MovedFrom = IN_MOVED_FROM, | ||
83 | MovedTo = IN_MOVED_TO, | ||
84 | DeleteSubdir = IN_DELETE_SUBDIR, | ||
85 | DeleteFile = IN_DELETE_FILE, | ||
86 | CreateSubdir = IN_CREATE_SUBDIR, | ||
87 | CreateFile = IN_CREATE_FILE, | ||
88 | DeleteSelf = IN_DELETE_SELF, | ||
89 | Unmount = IN_UNMOUNT, | ||
90 | _QueueOverflow = IN_Q_OVERFLOW, /* Internal, don't use this in client code */ | ||
91 | _Ignored = IN_IGNORED, /* Internal, don't use this in client code */ | ||
92 | }; | ||
75 | 93 | ||
76 | /*====================================================================================== | 94 | /*====================================================================================== |
@@ -82,7 +100,7 @@ enum OFileNotificationType { Single = 0x0000000, | |||
82 | * | 100 | * |
83 | * This class allows to watch for events happening to files. | 101 | * This class allows to watch for events happening to files. |
84 | * It uses the dnotify kernel interface which is a very efficient signalling interface. | 102 | * It uses the inotify kernel interface |
85 | * | 103 | * |
86 | * @see <file:///usr/src/linux/Documentation/dnotify.txt> | 104 | * @see http://www.kernel.org/pub/linux/kernel/people/rml/inotify/ |
87 | * | 105 | * |
88 | * @author Michael 'Mickey' Lauer <mickey@vanille.de> | 106 | * @author Michael 'Mickey' Lauer <mickey@vanille.de> |
@@ -107,5 +125,5 @@ class OFileNotification : public QObject | |||
107 | * | 125 | * |
108 | * #include <opie2/oapplication.h> | 126 | * #include <opie2/oapplication.h> |
109 | * #include <opie2/onitify.h> | 127 | * #include <opie2/ofilenotify.h> |
110 | * using namespace Opie::Core; | 128 | * using namespace Opie::Core; |
111 | * | 129 | * |
@@ -119,5 +137,5 @@ class OFileNotification : public QObject | |||
119 | * </pre> | 137 | * </pre> |
120 | * | 138 | * |
121 | * This sample program automatically terminates when the file "/tmp/quite" has been created. | 139 | * This sample program automatically terminates when the file "/tmp/quit" has been created. |
122 | * | 140 | * |
123 | * | 141 | * |
@@ -129,5 +147,5 @@ class OFileNotification : public QObject | |||
129 | * Note that in that case it may be more convenient to use @ref OFileNotification::singleShot() then. | 147 | * Note that in that case it may be more convenient to use @ref OFileNotification::singleShot() then. |
130 | **/ | 148 | **/ |
131 | int start( const QString& path, bool sshot = false, OFileNotificationType type = Modify ); | 149 | int watch( const QString& path, bool sshot = false, OFileNotificationType type = Modify ); |
132 | /** | 150 | /** |
133 | * Stop watching for file events. | 151 | * Stop watching for file events. |
@@ -143,8 +161,4 @@ class OFileNotification : public QObject | |||
143 | QString path() const; | 161 | QString path() const; |
144 | /** | 162 | /** |
145 | * @returns the UNIX file descriptor for the file being watched. | ||
146 | **/ | ||
147 | int fileno() const; | ||
148 | /** | ||
149 | * @returns if a file is currently being watched. | 163 | * @returns if a file is currently being watched. |
150 | **/ | 164 | **/ |
@@ -159,29 +173,22 @@ class OFileNotification : public QObject | |||
159 | protected: | 173 | protected: |
160 | bool activate(); | 174 | bool activate(); |
161 | virtual bool hasChanged(); | 175 | |
162 | static bool registerSignalHandler(); | 176 | private slots: |
163 | static void unregisterSignalHandler(); | 177 | void inotifyEventHandler(); |
164 | static void __signalHandler( int sig, siginfo_t *si, void *data ); | ||
165 | 178 | ||
166 | private: | 179 | private: |
180 | bool registerEventHandler(); | ||
181 | void unregisterEventHandler(); | ||
182 | |||
167 | QString _path; | 183 | QString _path; |
168 | OFileNotificationType _type; | 184 | OFileNotificationType _type; |
169 | QSignal _signal; | 185 | QSignal _signal; |
170 | int _fd; | ||
171 | bool _active; | 186 | bool _active; |
172 | struct stat _stat; | 187 | bool _multi; |
173 | }; | 188 | static QSocketNotifier* _sn; |
174 | 189 | int _wd; // inotify watch descriptor | |
175 | #if 0 | 190 | static int _fd; // inotify device descriptor |
176 | |||
177 | class ODirectoryNotification : public OFileNotification | ||
178 | { | ||
179 | |||
180 | public: | ||
181 | virtual bool hasChanged() { return true; }; | ||
182 | }; | 191 | }; |
183 | 192 | ||
184 | #endif | ||
185 | |||
186 | } | 193 | } |
187 | } | 194 | } |