summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-05-02 13:49:14 (UTC)
committer mickeyl <mickeyl>2005-05-02 13:49:14 (UTC)
commit8cbb0586482ec650d7ff4fa9b6a7390b8b050793 (patch) (unidiff)
tree926c2fedf0f62a965362178620625e3ddc5171de
parent3a86e1464fb00d3d9b9962bcabc1041d8a3d9343 (diff)
downloadopie-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 (more/less context) (ignore whitespace changes)
-rw-r--r--ChangeLog7
-rw-r--r--examples/opiecore/onotifydemo/onotifydemo.cpp42
-rw-r--r--libopie2/opiecore/ofilenotify.cpp272
-rw-r--r--libopie2/opiecore/ofilenotify.h93
4 files changed, 168 insertions, 246 deletions
diff --git a/ChangeLog b/ChangeLog
index 2d5c886..7e81b7e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,2 +9,3 @@
9 ---------- 9 ----------
10 * #1476 - Wrong order of application entries in the O-menu (skyhusker)
10 * #1535- Missing line break and unnecessary location shown with Today-Calendar plugin (deller) 11 * #1535- Missing line break and unnecessary location shown with Today-Calendar plugin (deller)
@@ -16,5 +17,4 @@
16 * n.a.- Wellenreiter: relax WE version matching test a bit (mickeyl) 17 * n.a.- Wellenreiter: relax WE version matching test a bit (mickeyl)
17 * n.a.- scale BluezApplet appropriately (mickeyl) 18 * n.a.- scale BluezApplet appropriately and use larger icons (mickeyl)
18 * n.a.- memoryapplet: fix crash in memoryapplet on kernels without swap support (seneca cunningham) 19 * n.a.- memoryapplet: fix crash in memoryapplet on kernels without swap support (seneca cunningham)
19 * #1476 - Wrong order of application entries in the O-menu (skyhusker)
20 20
@@ -22,3 +22,4 @@
22 -------- 22 --------
23 * make BluezApplet use OTaskbarApplet (mickeyl) 23 * Make BluezApplet use OTaskbarApplet (mickeyl)
24 * Rewrite OFileNotification to use the upcoming inotify interface instead of the deprecated dnotify (mickeyl)
24 25
diff --git a/examples/opiecore/onotifydemo/onotifydemo.cpp b/examples/opiecore/onotifydemo/onotifydemo.cpp
index a38ffee..0e84d80 100644
--- a/examples/opiecore/onotifydemo/onotifydemo.cpp
+++ b/examples/opiecore/onotifydemo/onotifydemo.cpp
@@ -34,17 +34,27 @@ DemoApp::DemoApp( int argc, char** argv ) : OApplication( argc, argv, "libopie2
34 QHBox* hbox = new QHBox( vbox ); 34 QHBox* hbox = new QHBox( vbox );
35
36 g2 = new QVButtonGroup( "Specify Trigger Type", hbox ); 35 g2 = new QVButtonGroup( "Specify Trigger Type", hbox );
37 //QCheckBox* c1 = new QCheckBox( "Multi", g2 ); 36 QCheckBox* c1 = new QCheckBox( "Access", g2 );
38 QCheckBox* c2 = new QCheckBox( "Access", g2 ); 37 QCheckBox* c2 = new QCheckBox( "Modify", g2 );
39 QCheckBox* c3 = new QCheckBox( "Modify", g2 ); 38 QCheckBox* c3 = new QCheckBox( "Attrib", g2 );
40 QCheckBox* c4 = new QCheckBox( "Create", g2 ); 39 QCheckBox* c4 = new QCheckBox( "CloseWrite", g2 );
41 QCheckBox* c5 = new QCheckBox( "Delete", g2 ); 40 QCheckBox* c5 = new QCheckBox( "CloseNoWrite", g2 );
42 QCheckBox* c6 = new QCheckBox( "Rename", g2 ); 41 QCheckBox* c6 = new QCheckBox( "MovedFrom", g2 );
43 QCheckBox* c7 = new QCheckBox( "Attrib", g2 ); 42 QCheckBox* c7 = new QCheckBox( "MovedTo", g2 );
44 g2->insert( c2, Access ); 43 QCheckBox* c8 = new QCheckBox( "DeleteSubdir", g2 );
45 g2->insert( c3, Modify ); 44 QCheckBox* c9 = new QCheckBox( "DeleteFile", g2 );
46 g2->insert( c4, Create ); 45 QCheckBox* c10 = new QCheckBox( "CreateSubdir", g2 );
47 g2->insert( c5, Delete ); 46 QCheckBox* c11 = new QCheckBox( "CreateFile", g2 );
48 g2->insert( c6, Rename ); 47 QCheckBox* c12 = new QCheckBox( "Unmount", g2 );
49 g2->insert( c7, Attrib ); 48 g2->insert( c1, Access );
49 g2->insert( c2, Modify );
50 g2->insert( c3, Attrib );
51 g2->insert( c4, CloseWrite );
52 g2->insert( c5, CloseNoWrite );
53 g2->insert( c6, MovedFrom );
54 g2->insert( c7, MovedTo );
55 g2->insert( c8, DeleteSubdir );
56 g2->insert( c9, DeleteFile );
57 g2->insert( c10, CreateSubdir );
58 g2->insert( c11, CreateFile );
59 g2->insert( c12, Unmount );
50 connect( g2, SIGNAL( pressed(int) ), this, SLOT( modifierClicked(int) ) ); 60 connect( g2, SIGNAL( pressed(int) ), this, SLOT( modifierClicked(int) ) );
@@ -84,4 +94,2 @@ DemoApp::DemoApp( int argc, char** argv ) : OApplication( argc, argv, "libopie2
84 int fntype = m; 94 int fntype = m;
85 if ( multi ) fntype |=(int) Multi;
86
87 QString modifier = QString().sprintf( " = 0x%08x", fntype ); 95 QString modifier = QString().sprintf( " = 0x%08x", fntype );
@@ -91,3 +99,3 @@ DemoApp::DemoApp( int argc, char** argv ) : OApplication( argc, argv, "libopie2
91 else 99 else
92 OFileNotification::singleShot( filename, this, SLOT( trigger() ), (OFileNotificationType) fntype ); 100 odebug << "not yet implemented..." << oendl;
93 } 101 }
diff --git a/libopie2/opiecore/ofilenotify.cpp b/libopie2/opiecore/ofilenotify.cpp
index 2a9bb8c..c221e58 100644
--- a/libopie2/opiecore/ofilenotify.cpp
+++ b/libopie2/opiecore/ofilenotify.cpp
@@ -2,3 +2,3 @@
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>
@@ -9,4 +9,4 @@ _;:,     .>    :=|. This program is free software; you can
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>       _;_.
@@ -35,2 +35,3 @@ using namespace Opie::Core;
35#include <qobject.h> 35#include <qobject.h>
36#include <qsocketnotifier.h>
36#include <qsignal.h> 37#include <qsignal.h>
@@ -42,4 +43,5 @@ using namespace Opie::Core;
42#include <sys/stat.h> 43#include <sys/stat.h>
43#include <assert.h> 44#include <sys/ioctl.h>
44#include <fcntl.h> 45#include <fcntl.h>
46#include <assert.h>
45#include <string.h> 47#include <string.h>
@@ -50,2 +52,7 @@ static QIntDict<OFileNotification> notification_list;
50 52
53QSocketNotifier* OFileNotification::_sn;
54int OFileNotification::_fd = -1;
55
56#define INOTIFY_DEVICE "/dev/inotify"
57
51namespace Opie { 58namespace Opie {
@@ -54,3 +61,3 @@ namespace Core {
54OFileNotification::OFileNotification( QObject* parent, const char* name ) 61OFileNotification::OFileNotification( QObject* parent, const char* name )
55 :QObject( parent, name ), _active( false ) 62 :QObject( parent, name ), _active( false ), _multi( true )
56{ 63{
@@ -62,2 +69,3 @@ OFileNotification::~OFileNotification()
62{ 69{
70 stop();
63 qDebug( "OFileNotification::~OFileNotification()" ); 71 qDebug( "OFileNotification::~OFileNotification()" );
@@ -72,39 +80,5 @@ bool OFileNotification::isActive() const
72 80
73int OFileNotification::start( const QString& path, bool sshot, OFileNotificationType type ) 81int OFileNotification::watch( const QString& path, bool sshot, OFileNotificationType type )
74{ 82{
75 _path = QString::null; 83 if ( QFile::exists( path ) )
76 _fd = 0;
77 if ( _active ) stop();
78 QString dirpath;
79
80 // check if path exists and whether it is a file or a directory, if it exists at all
81 int result = ::stat( (const char*) path, &_stat );
82 if ( !(type & Create) && result == -1 )
83 {
84 qWarning( "OFileNotification::start(): Can't stat '%s': %s.", (const char*) path, strerror( errno ) );
85 return -1;
86 }
87
88 // if it is not a directory, we need to find out in which directory the file is
89 bool isDirectory = S_ISDIR( _stat.st_mode );
90 if ( !isDirectory )
91 {
92 int slashpos;
93 slashpos = path.findRev( '/' );
94 if ( slashpos > 0 )
95 {
96 _path = path;
97 dirpath = path.left( slashpos );
98 }
99 }
100 else /* isDirectory */
101 {
102 qWarning( "FIXME FIXME FIXME = Directory Notification Not Yet Implemented!" );
103 _path = path;
104 dirpath = path;
105 assert( 0 );
106 }
107
108 int fd = ::open( (const char*) dirpath, O_RDONLY );
109 if ( fd != -1 )
110 { 84 {
@@ -112,26 +86,24 @@ int OFileNotification::start( const QString& path, bool sshot, OFileNotification
112 { 86 {
113 OFileNotification::registerSignalHandler(); 87 OFileNotification::registerEventHandler();
114 } 88 }
115 89
116 result = ::fcntl( fd, F_SETSIG, SIGRTMIN ); 90 struct inotify_watch_request iwr;
117 if ( result == -1 ) 91 ::memset( &iwr, 0, sizeof iwr );
118 { 92 iwr.name = const_cast<char*>( (const char*) path );
119 qWarning( "OFileNotification::start(): Can't subscribe to '%s': %s.", (const char*) dirpath, strerror( errno ) ); 93 iwr.mask = type;
120 return -1; 94
121 } 95 _wd = ::ioctl( OFileNotification::_fd, INOTIFY_WATCH, &iwr );
122 if ( !sshot ) type = static_cast<OFileNotificationType>( (int) type | (int) Multi ); 96
123 result = ::fcntl( fd, F_NOTIFY, type ); 97 if ( _wd < 0 )
124 if ( result == -1 )
125 { 98 {
126 qWarning( "OFileNotification::start(): Can't subscribe to '%s': %s.", (const char*) dirpath, strerror( errno ) ); 99 qWarning( "OFileNotification::watch(): inotify can't watch '%s': %s.", (const char*) path, strerror( errno ) );
127 return -1; 100 return -1;
128 } 101 }
129 qDebug( "OFileNotification::start(): Subscribed for changes to %s (fd = %d, mask = 0x%0x)", (const char*) dirpath, fd, type ); 102
130 notification_list.insert( fd, this ); 103 notification_list.insert( _wd, this );
104 _multi = !sshot;
131 _type = type; 105 _type = type;
132 _fd = fd;
133 _active = true; 106 _active = true;
134 ::memset( &_stat, 0, sizeof _stat ); 107 qDebug( "OFileNotification::watch(): watching '%s' [wd=%d].", (const char*) path, _wd );
135 ::stat( _path, &_stat ); 108 return _wd;
136 return fd;
137 } 109 }
@@ -139,3 +111,3 @@ int OFileNotification::start( const QString& path, bool sshot, OFileNotification
139 { 111 {
140 qWarning( "OFileNotification::start(): Error with path '%s': %s.", (const char*) dirpath, strerror( errno ) ); 112 qWarning( "OFileNotification::watch(): Can't watch '%s': %s.", (const char*) path, strerror( errno ) );
141 return -1; 113 return -1;
@@ -147,16 +119,9 @@ void OFileNotification::stop()
147{ 119{
148 if ( !_active ) return; 120 notification_list.remove( _wd );
149 121 _path = QString::null;
150 int result = ::fcntl( _fd, F_NOTIFY, 0 ); 122 _wd = 0;
151 if ( result == -1 ) 123 _active = false;
152 { 124 if ( notification_list.isEmpty() )
153 qWarning( "OFileNotification::stop(): Can't remove subscription to '%s': %s.", (const char*) _path, strerror( errno ) );
154 }
155 else
156 { 125 {
157 ::close( _fd ); 126 OFileNotification::unregisterEventHandler();
158 _type = Single;
159 _path = QString::null;
160 _fd = 0;
161 _active = false;
162 } 127 }
@@ -177,5 +142,8 @@ QString OFileNotification::path() const
177 142
178int OFileNotification::fileno() const 143bool OFileNotification::activate()
179{ 144{
180 return _fd; 145 emit triggered();
146 _signal.activate();
147 if ( !_multi ) stop();
148 return true;
181} 149}
@@ -183,12 +151,7 @@ int OFileNotification::fileno() const
183 151
184bool OFileNotification::activate() 152void OFileNotification::singleShot( const QString& path, QObject* receiver, const char* member, OFileNotificationType type )
185{ 153{
186 if ( hasChanged() ) 154 OFileNotification* ofn = new OFileNotification();
187 { 155 ofn->_signal.connect( receiver, member );
188 emit triggered(); 156 ofn->watch( path, true, type );
189 _signal.activate();
190 return true;
191 }
192 else
193 return false;
194} 157}
@@ -196,52 +159,41 @@ bool OFileNotification::activate()
196 159
197bool OFileNotification::hasChanged() 160void OFileNotification::inotifyEventHandler()
198{ 161{
199 bool c = false; 162 qWarning( "OFileNotification::__eventHandler(): reached." );
200 163
201 struct stat newstat; 164 char buffer[16384];
202 ::memset( &newstat, 0, sizeof newstat ); 165 size_t buffer_i;
203 int result = ::stat( _path, &newstat ); // may fail if file has been renamed or deleted. that doesn't matter :) 166 struct inotify_event *pevent, *event;
167 ssize_t r;
168 size_t event_size;
169 int count = 0;
204 170
205 qDebug( "result of newstat call is %d (%s=%d)", result, result == -1 ? strerror( errno ) : "success", errno ); 171 r = ::read(_fd, buffer, 16384);
206 qDebug( "stat.atime = %0lx, newstat.atime = %0lx", (long)_stat.st_atime, (long)newstat.st_atime );
207 qDebug( "stat.mtime = %0lx, newstat.mtime = %0lx", (long)_stat.st_mtime, (long)newstat.st_mtime );
208 qDebug( "stat.ctime = %0lx, newstat.ctime = %0lx", (long)_stat.st_ctime, (long)newstat.st_ctime );
209 172
210 if ( !c && (_type & Create) && 173 if ( r <= 0 )
211 (long)_stat.st_atime == 0 && (long)_stat.st_mtime == 0 && (long)_stat.st_ctime == 0 && 174 return;
212 (long)newstat.st_atime > 0 && (long)newstat.st_mtime > 0 && (long)newstat.st_ctime > 0) 175
213 { 176 buffer_i = 0;
214 qDebug( "OFileNotification::hasChanged(): file has been created" ); 177 while ( buffer_i < r )
215 c = true;
216 }
217 if ( !c && (_type & (Delete|Rename)) && (long)newstat.st_atime == 0 && (long)newstat.st_mtime == 0 && (long)newstat.st_ctime == 0)
218 {
219 qDebug( "OFileNotification::hasChanged(): file has been deleted or renamed" );
220 c = true;
221 }
222 if ( !c && (_type & Access) && (long)_stat.st_atime < (long)newstat.st_atime )
223 {
224 qDebug( "OFileNotification::hasChanged(): atime changed" );
225 c = true;
226 }
227 if ( !c && (_type & Modify) && (long)_stat.st_mtime < (long)newstat.st_mtime )
228 {
229 qDebug( "OFileNotification::hasChanged(): mtime changed" );
230 c = true;
231 }
232 if ( !c && (_type & Attrib) && (long)_stat.st_ctime < (long)newstat.st_ctime )
233 { 178 {
234 qDebug( "OFileNotification::hasChanged(): ctime changed" ); 179 /* Parse events and queue them ! */
235 c = true; 180 pevent = (struct inotify_event *)&buffer[buffer_i];
236 } 181 event_size = sizeof(struct inotify_event) + pevent->len;
182 qDebug( "pevent->len = %d\n", pevent->len);
237 183
238 return c; 184 OFileNotification* fn = notification_list[ pevent->wd ];
239} 185 if ( fn )
186 fn->activate();
187 else
188 assert( false );
240 189
190 //event = malloc(event_size);
191 //memmove(event, pevent, event_size);
192 //queue_enqueue(event, q);
193 buffer_i += event_size;
194 count++;
195 }
241 196
242void OFileNotification::singleShot( const QString& path, QObject* receiver, const char* member, OFileNotificationType type ) 197 qDebug( "received %d events...", count );
243{ 198 return;
244 OFileNotification* ofn = new OFileNotification();
245 ofn->_signal.connect( receiver, member );
246 ofn->start( path, true, type );
247} 199}
@@ -249,56 +201,15 @@ void OFileNotification::singleShot( const QString& path, QObject* receiver, cons
249 201
250void OFileNotification::__signalHandler( int sig, siginfo_t *si, void *data ) 202bool OFileNotification::registerEventHandler()
251{ 203{
252 Q_UNUSED( sig ) 204 OFileNotification::_fd = ::open( INOTIFY_DEVICE, O_RDONLY );
253 Q_UNUSED( data ) 205 if ( OFileNotification::_fd < 0 )
254 qWarning( "OFileNotification::__signalHandler(): reached." );
255 int fd = si->si_fd;
256 OFileNotification* fn = notification_list[fd];
257 if ( fn )
258 {
259 // check if it really was the file (dnotify triggers on directory granularity, not file granularity)
260 if ( !fn->activate() )
261 {
262 qDebug( "OFileNotification::__signalHandler(): false alarm ;) Restarting the trigger (if it was single)..." );
263 if ( !(fn->type() & Multi ) )
264 {
265 int result = ::fcntl( fn->fileno(), F_NOTIFY, fn->type() );
266 if ( result == -1 )
267 {
268 qWarning( "OFileNotification::__signalHandler(): Can't restart the trigger: %s.", strerror( errno ) );
269 }
270 }
271 return;
272 }
273 #if 1
274 if ( !(fn->type() & Multi) )
275 {
276 qDebug( "OFileNotification::__signalHandler(): '%d' was singleShot. Removing from list.", fd );
277 notification_list.remove( fd );
278 if ( notification_list.isEmpty() )
279 {
280 OFileNotification::unregisterSignalHandler();
281 }
282 }
283 #endif
284 }
285 else
286 { 206 {
287 qWarning( "OFileNotification::__signalHandler(): D'oh! Called without fd in notification_list. Race condition?" ); 207 qWarning( "OFileNotification::registerEventHandler(): couldn't register event handler: %s", strerror( errno ) );
208 return false;
288 } 209 }
289}
290 210
211 OFileNotification::_sn = new QSocketNotifier( _fd, QSocketNotifier::Read, this, "inotify event" );
212 connect( OFileNotification::_sn, SIGNAL( activated(int) ), this, SLOT( inotifyEventHandler() ) );
291 213
292bool OFileNotification::registerSignalHandler() 214 qDebug( "OFileNotification::registerEventHandler(): done" );
293{
294 struct sigaction act;
295 act.sa_sigaction = OFileNotification::__signalHandler;
296 ::sigemptyset( &act.sa_mask );
297 act.sa_flags = SA_SIGINFO;
298 if ( ::sigaction( SIGRTMIN, &act, NULL ) == -1 )
299 {
300 qWarning( "OFileNotification::registerSignalHandler(): couldn't register signal handler: %s", strerror( errno ) );
301 return false;
302 }
303 qDebug( "OFileNotification::registerSignalHandler(): done" );
304 return true; 215 return true;
@@ -307,12 +218,7 @@ bool OFileNotification::registerSignalHandler()
307 218
308void OFileNotification::unregisterSignalHandler() 219void OFileNotification::unregisterEventHandler()
309{ 220{
310 struct sigaction act; 221 if ( OFileNotification::_fd )
311 act.sa_sigaction = ( void (*)(int, siginfo_t*, void*) ) SIG_DFL; 222 ::close( OFileNotification::_fd );
312 ::sigemptyset( &act.sa_mask ); 223 qDebug( "OFileNotification::unregisterEventHandler(): done" );
313 if ( ::sigaction( SIGRTMIN, &act, NULL ) == -1 )
314 {
315 qWarning( "OFileNotification::unregisterSignalHandler(): couldn't deregister signal handler: %s", strerror( errno ) );
316 }
317 qDebug( "OFileNotification::unregisterSignalHandler(): done" );
318} 224}
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
@@ -2,3 +2,3 @@
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>
@@ -9,4 +9,4 @@ _;:,     .>    :=|. This program is free software; you can
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>       _;_.
@@ -35,3 +35,3 @@ _;:,     .>    :=|. This program is free software; you can
35/* QT */ 35/* QT */
36#include <qobject.h> 36#include <qsocketnotifier.h>
37#include <qsignal.h> 37#include <qsignal.h>
@@ -40,4 +40,3 @@ _;:,     .>    :=|. This program is free software; you can
40/* STD */ 40/* STD */
41#include <signal.h> 41#include "inotify.h"
42#include <fcntl.h>
43 42
@@ -58,6 +57,14 @@ namespace Core {
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>
@@ -66,10 +73,21 @@ namespace Core {
66 73
67enum OFileNotificationType { Single = 0x0000000, 74enum 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
@@ -83,5 +101,5 @@ enum OFileNotificationType { Single = 0x0000000,
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 *
@@ -108,3 +126,3 @@ class OFileNotification : public QObject
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;
@@ -120,3 +138,3 @@ class OFileNotification : public QObject
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 *
@@ -130,3 +148,3 @@ class OFileNotification : public QObject
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 /**
@@ -144,6 +162,2 @@ class OFileNotification : public QObject
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.
@@ -160,8 +174,10 @@ class OFileNotification : public QObject
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;
@@ -169,18 +185,9 @@ class OFileNotification : public QObject
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
177class ODirectoryNotification : public OFileNotification
178{
179
180 public:
181 virtual bool hasChanged() { return true; };
182}; 191};
183 192
184#endif
185
186} 193}