Inotify monitoring almost works now. Since inotify seems to be the

future, I changed the interface of monitoring to be more like inotify.


SVN revision: 13984

1 files changed, 37 insertions, 18 deletions

diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_private.h b/legacy/ecore/src/lib/ecore_file/ecore_file_private.h
index c076bf2793..5559c743fb 100644
--- a/legacy/ecore/src/lib/ecore_file/ecore_file_private.h
+++ b/legacy/ecore/src/lib/ecore_file/ecore_file_private.h
@@ -4,12 +4,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include <dirent.h>
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <unistd.h>
-#include <limits.h>
-
 #include "config.h"
 
 #include "Ecore.h"
@@ -18,27 +12,52 @@
 int ecore_file_monitor_init(void);
 int ecore_file_monitor_shutdown(void);
 
+#define ECORE_FILE_MONITOR(x) ((Ecore_File_Monitor *)(x))
+
 struct _Ecore_File_Monitor
 {
    void (*func) (void *data,
                  Ecore_File_Monitor *ecore_file_monitor,
-                 Ecore_File_Type type,
                  Ecore_File_Event event,
                  const char *path);
 
    char               *path;
-   Ecore_File_Type     type;
    void               *data;
    Evas_List          *files;
-#ifdef HAVE_POLL
-   int                 mtime;
-   unsigned char       deleted;
-#endif
 };
 
-/*
-#define HAVE_POLL
-#define HAVE_FAM
-#define HAVE_DNOTIFY
-#define HAVE_INOTIFY
-*/
+#ifdef HAVE_INOTIFY
+EAPI int                 ecore_file_monitor_inotify_init(void);
+EAPI int                 ecore_file_monitor_inotify_shutdown(void);
+EAPI Ecore_File_Monitor *ecore_file_monitor_inotify_add(const char *path,
+                                                        void (*func) (void *data,
+                                                                      Ecore_File_Monitor *ecore_file_monitor,
+                                                                      Ecore_File_Event event,
+                                                                      const char *path),
+                                                        void *data);
+EAPI void                ecore_file_monitor_inotify_del(Ecore_File_Monitor *ecore_file_monitor);
+#endif
+
+#ifdef HAVE_FAM
+EAPI int                 ecore_file_monitor_fam_init(void);
+EAPI int                 ecore_file_monitor_fam_shutdown(void);
+EAPI Ecore_File_Monitor *ecore_file_monitor_fam_add(const char *path,
+                                                    void (*func) (void *data,
+                                                                  Ecore_File_Monitor *ecore_file_monitor,
+                                                                  Ecore_File_Event event,
+                                                                  const char *path),
+                                                    void *data);
+EAPI void                ecore_file_monitor_fam_del(Ecore_File_Monitor *ecore_file_monitor);
+#endif
+
+#ifdef HAVE_POLL
+EAPI int                 ecore_file_monitor_poll_init(void);
+EAPI int                 ecore_file_monitor_poll_shutdown(void);
+EAPI Ecore_File_Monitor *ecore_file_monitor_poll_add(const char *path,
+                                                     void (*func) (void *data,
+                                                                   Ecore_File_Monitor *ecore_file_monitor,
+                                                                   Ecore_File_Event event,
+                                                                   const char *path),
+                                                     void *data);
+EAPI void                ecore_file_monitor_poll_del(Ecore_File_Monitor *ecore_file_monitor);
+#endif