clock - use system timerfd change event in ecore and fix eio monitor of tz

this now uses the system ecore timedate change event instead of a
local timerfd. centralized implementation now.

also it fixes yhe eio monitor to ALSO monitor /etc as well to detect
changes to timzesone and filter down to the files needed.

diff --git a/src/modules/clock/e_mod_main.c b/src/modules/clock/e_mod_main.c
index b234de103834527b9ad7eab1a36514d89b0cc52b..db5956c87b1710487ceb457722d285b4b9088b47 100644 (file)
--- a/src/modules/clock/e_mod_main.c
+++ b/src/modules/clock/e_mod_main.c
@@ -3,9 +3,6 @@
 
 #include <sys/time.h>
 #include <time.h>
-#ifdef HAVE_SYS_TIMERFD_H
-# include <sys/timerfd.h>
-#endif
 
 /* actual module specifics */
 typedef struct _Instance Instance;
@@ -41,6 +38,7 @@ static void             _clock_popup_free(Instance *inst);
 
 static Eio_Monitor *clock_tz_monitor = NULL;
 static Eio_Monitor *clock_tz2_monitor = NULL;
+static Eio_Monitor *clock_tzetc_monitor = NULL;
 static Eina_List *clock_eio_handlers = NULL;
 Config *clock_config = NULL;
 
@@ -49,9 +47,6 @@ static E_Config_DD *conf_item_edd = NULL;
 static Eina_List *clock_instances = NULL;
 static E_Action *act = NULL;
 static Ecore_Timer *update_today = NULL;
-#ifdef HAVE_SYS_TIMERFD_H
-static Ecore_Fd_Handler *timerfd_handler = NULL;
-#endif
 
 /* and actually define the gadcon class that this module provides (just 1) */
 static const E_Gadcon_Client_Class _gadcon_class =
@@ -808,38 +803,49 @@ _e_mod_action_cb_mouse(E_Object *obj __UNUSED__, const char *params, E_Binding_E
 }
 
 static Eina_Bool
-_clock_eio_update(void *d __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
+_clock_eio_update(void *d __UNUSED__, int type __UNUSED__, void *event)
 {
-   e_int_clock_instances_redo(EINA_TRUE);
-   return ECORE_CALLBACK_RENEW;
-}
+   Eio_Monitor_Event *ev = event;
 
-static Eina_Bool
-_clock_eio_error(void *d __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
-{
-   eio_monitor_del(clock_tz_monitor);
-   clock_tz_monitor = eio_monitor_add("/etc/localtime");
-   eio_monitor_del(clock_tz2_monitor);
-   clock_tz2_monitor = eio_monitor_add("/etc/timezone");
-   return ECORE_CALLBACK_RENEW;
+   if ((ev->monitor == clock_tz_monitor) ||
+       (ev->monitor == clock_tz2_monitor) ||
+       (ev->monitor == clock_tzetc_monitor))
+     {
+        if ((ev->filename) &&
+            ((!strcmp(ev->filename, "/etc/localtime")) ||
+             (!strcmp(ev->filename, "/etc/timezone"))))
+          {
+             e_int_clock_instances_redo(EINA_TRUE);
+          }
+     }
+   return ECORE_CALLBACK_PASS_ON;
 }
 
-#ifdef HAVE_SYS_TIMERFD_H
 static Eina_Bool
-_clock_fd_update(void *d __UNUSED__, Ecore_Fd_Handler *fdh)
+_clock_eio_error(void *d __UNUSED__, int type __UNUSED__, void *event)
 {
-   char buf[64];
+   Eio_Monitor_Event *ev = event;
 
-   if (read(ecore_main_fd_handler_fd_get(fdh), buf, sizeof(buf)) < 0)
+   if ((ev->monitor == clock_tz_monitor) ||
+       (ev->monitor == clock_tz2_monitor) ||
+       (ev->monitor == clock_tzetc_monitor))
      {
-        close(ecore_main_fd_handler_fd_get(fdh));
-        timerfd_handler = ecore_main_fd_handler_del(timerfd_handler);
-        return EINA_FALSE;
+        eio_monitor_del(clock_tz_monitor);
+        clock_tz_monitor = eio_monitor_add("/etc/localtime");
+        eio_monitor_del(clock_tz2_monitor);
+        clock_tz2_monitor = eio_monitor_add("/etc/timezone");
+        eio_monitor_del(clock_tzetc_monitor);
+        clock_tzetc_monitor = eio_monitor_add("/etc");
      }
+   return ECORE_CALLBACK_PASS_ON;
+}
+
+static Eina_Bool
+_clock_time_update(void *d __UNUSED__, int type __UNUSED__, void *event __UNUSED__)
+{
    e_int_clock_instances_redo(EINA_TRUE);
-   return EINA_TRUE;
+   return ECORE_CALLBACK_PASS_ON;
 }
-#endif
 
 /* module setup */
 EAPI E_Module_Api e_modapi =
@@ -891,6 +897,7 @@ e_modapi_init(E_Module *m)
    clock_config->module = m;
    clock_tz_monitor = eio_monitor_add("/etc/localtime");
    clock_tz2_monitor = eio_monitor_add("/etc/timezone");
+   clock_tzetc_monitor = eio_monitor_add("/etc");
    E_LIST_HANDLER_APPEND(clock_eio_handlers, EIO_MONITOR_ERROR, _clock_eio_error, NULL);
    E_LIST_HANDLER_APPEND(clock_eio_handlers, EIO_MONITOR_FILE_CREATED, _clock_eio_update, NULL);
    E_LIST_HANDLER_APPEND(clock_eio_handlers, EIO_MONITOR_FILE_MODIFIED, _clock_eio_update, NULL);
@@ -898,37 +905,10 @@ e_modapi_init(E_Module *m)
    E_LIST_HANDLER_APPEND(clock_eio_handlers, EIO_MONITOR_SELF_DELETED, _clock_eio_update, NULL);
    E_LIST_HANDLER_APPEND(clock_eio_handlers, EIO_MONITOR_SELF_RENAME, _clock_eio_update, NULL);
    E_LIST_HANDLER_APPEND(clock_eio_handlers, E_EVENT_SYS_RESUME, _clock_eio_update, NULL);
+   E_LIST_HANDLER_APPEND(clock_eio_handlers, ECORE_EVENT_SYSTEM_TIMEDATE_CHANGED, _clock_time_update, NULL);
 
    e_gadcon_provider_register(&_gadcon_class);
 
-#ifdef HAVE_SYS_TIMERFD_H
-   
-#ifndef TFD_TIMER_CANCELON_SET
-# define TFD_TIMER_CANCELON_SET (1 << 1)
-#endif
-     {
-        int timer_fd;
-        int flags;
-        struct itimerspec its;
-   
-        // on old systems, flags must be 0, so we'll play nice and do it always
-        timer_fd = timerfd_create(CLOCK_REALTIME, 0);
-        if (timer_fd < 0) return m;
-        fcntl(timer_fd, F_SETFL, O_NONBLOCK);
-
-        flags = fcntl(timer_fd, F_GETFD);
-        flags |= FD_CLOEXEC;   
-        fcntl(timer_fd, F_SETFD, flags);
-        
-        memset(&its, 0, sizeof(its));
-        timerfd_settime(timer_fd, TFD_TIMER_ABSTIME | TFD_TIMER_CANCELON_SET, 
-                        &its, NULL);
-        
-        timerfd_handler = ecore_main_fd_handler_add(timer_fd, ECORE_FD_READ,
-                                                    _clock_fd_update, NULL, 
-                                                    NULL, NULL);
-     }
-#endif
    return m;
 }
 
@@ -971,11 +951,10 @@ e_modapi_shutdown(E_Module *m __UNUSED__)
      }
    eio_monitor_del(clock_tz_monitor);
    eio_monitor_del(clock_tz2_monitor);
+   eio_monitor_del(clock_tzetc_monitor);
    clock_tz_monitor = NULL;
    clock_tz2_monitor = NULL;
-#ifdef HAVE_SYS_TIMERFD_H
-   timerfd_handler = ecore_main_fd_handler_del(timerfd_handler);
-#endif
+   clock_tzetc_monitor = NULL;
 
    return 1;
 }