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, 119 insertions, 3 deletions

diff --git a/legacy/ecore/src/lib/ecore_file/ecore_file_monitor.c b/legacy/ecore/src/lib/ecore_file/ecore_file_monitor.c
index 0573b630fc..e270e01a63 100644
--- a/legacy/ecore/src/lib/ecore_file/ecore_file_monitor.c
+++ b/legacy/ecore/src/lib/ecore_file/ecore_file_monitor.c
@@ -3,8 +3,124 @@
  */
 #include "ecore_file_private.h"
 
-Ecore_File_Type
-ecore_file_monitor_type_get(Ecore_File_Monitor *em)
+typedef enum {
+     ECORE_FILE_MONITOR_TYPE_NONE,
+#ifdef HAVE_INOTIFY
+     ECORE_FILE_MONITOR_TYPE_INOTIFY,
+#endif
+#ifdef HAVE_FAM
+     ECORE_FILE_MONITOR_TYPE_FAM,
+#endif
+#ifdef HAVE_POLL
+     ECORE_FILE_MONITOR_TYPE_POLL
+#endif
+} Ecore_File_Monitor_Type;
+
+static Ecore_File_Monitor_Type monitor_type = ECORE_FILE_MONITOR_TYPE_NONE;
+
+int
+ecore_file_monitor_init(void)
+{
+#ifdef HAVE_INOTIFY
+#if 0
+   monitor_type = ECORE_FILE_MONITOR_TYPE_INOTIFY;
+   if (ecore_file_monitor_inotify_init())
+     return 1;
+#endif
+#endif
+#ifdef HAVE_FAM
+#if 0
+   monitor_type = ECORE_FILE_MONITOR_TYPE_FAM;
+   if (ecore_file_monitor_fam_init())
+     return 1;
+#endif
+#endif
+#ifdef HAVE_POLL
+   monitor_type = ECORE_FILE_MONITOR_TYPE_POLL;
+   if (ecore_file_monitor_poll_init())
+     return 1;
+#endif
+   monitor_type = ECORE_FILE_MONITOR_TYPE_NONE;
+   return 0;
+}
+
+int
+ecore_file_monitor_shutdown(void)
+{
+   switch (monitor_type)
+     {
+      case ECORE_FILE_MONITOR_TYPE_NONE:
+         return 1;
+#ifdef HAVE_INOTIFY
+      case ECORE_FILE_MONITOR_TYPE_INOTIFY:
+         return ecore_file_monitor_inotify_shutdown();
+#endif
+#ifdef HAVE_FAM
+      case ECORE_FILE_MONITOR_TYPE_FAM:
+         return ecore_file_monitor_fam_shutdown();
+#endif
+#ifdef HAVE_POLL
+      case ECORE_FILE_MONITOR_TYPE_POLL:
+         return ecore_file_monitor_poll_shutdown();
+#endif
+     }
+   return 0;
+}
+
+Ecore_File_Monitor *
+ecore_file_monitor_add(const char *path,
+                            void (*func) (void *data, Ecore_File_Monitor *em,
+                                          Ecore_File_Event event,
+                                          const char *path),
+                            void *data)
+{
+   switch (monitor_type)
+     {
+      case ECORE_FILE_MONITOR_TYPE_NONE:
+         return NULL;
+#ifdef HAVE_INOTIFY
+      case ECORE_FILE_MONITOR_TYPE_INOTIFY:
+         return ecore_file_monitor_inotify_add(path, func, data);
+#endif
+#ifdef HAVE_FAM
+      case ECORE_FILE_MONITOR_TYPE_FAM:
+         return ecore_file_monitor_fam_add(path, func, data);
+#endif
+#ifdef HAVE_POLL
+      case ECORE_FILE_MONITOR_TYPE_POLL:
+         return ecore_file_monitor_poll_add(path, func, data);
+#endif
+     }
+   return NULL;
+}
+
+void
+ecore_file_monitor_del(Ecore_File_Monitor *em)
+{
+   switch (monitor_type)
+     {
+      case ECORE_FILE_MONITOR_TYPE_NONE:
+         break;
+#ifdef HAVE_INOTIFY
+      case ECORE_FILE_MONITOR_TYPE_INOTIFY:
+         ecore_file_monitor_inotify_del(em);
+         break;
+#endif
+#ifdef HAVE_FAM
+      case ECORE_FILE_MONITOR_TYPE_FAM:
+         ecore_file_monitor_fam_del(em);
+         break;
+#endif
+#ifdef HAVE_POLL
+      case ECORE_FILE_MONITOR_TYPE_POLL:
+         ecore_file_monitor_poll_del(em);
+         break;
+#endif
+     }
+}
+
+const char *
+ecore_file_monitor_path_get(Ecore_File_Monitor *em)
 {
-   return em->type;
+   return em->path;
 }