1 files changed, 28 insertions, 29 deletions

diff --git a/libglusterfs/src/event.c b/libglusterfs/src/event.c
index ddba9810b0b..402c253ca25 100644
--- a/libglusterfs/src/event.c
+++ b/libglusterfs/src/event.c
@@ -16,15 +16,14 @@
 #include <errno.h>
 #include <string.h>
 
-#include "logging.h"
-#include "gf-event.h"
-#include "mem-pool.h"
-#include "common-utils.h"
-#include "libglusterfs-messages.h"
-#include "syscall.h"
+#include "glusterfs/gf-event.h"
+#include "glusterfs/timespec.h"
+#include "glusterfs/common-utils.h"
+#include "glusterfs/libglusterfs-messages.h"
+#include "glusterfs/syscall.h"
 
 struct event_pool *
-event_pool_new(int count, int eventthreadcount)
+gf_event_pool_new(int count, int eventthreadcount)
 {
     struct event_pool *event_pool = NULL;
     extern struct event_ops event_ops_poll;
@@ -53,8 +52,9 @@ event_pool_new(int count, int eventthreadcount)
 }
 
 int
-event_register(struct event_pool *event_pool, int fd, event_handler_t handler,
-               void *data, int poll_in, int poll_out, char notify_poller_death)
+gf_event_register(struct event_pool *event_pool, int fd,
+                  event_handler_t handler, void *data, int poll_in,
+                  int poll_out, char notify_poller_death)
 {
     int ret = -1;
 
@@ -67,7 +67,7 @@ out:
 }
 
 int
-event_unregister(struct event_pool *event_pool, int fd, int idx)
+gf_event_unregister(struct event_pool *event_pool, int fd, int idx)
 {
     int ret = -1;
 
@@ -80,7 +80,7 @@ out:
 }
 
 int
-event_unregister_close(struct event_pool *event_pool, int fd, int idx)
+gf_event_unregister_close(struct event_pool *event_pool, int fd, int idx)
 {
     int ret = -1;
 
@@ -93,8 +93,8 @@ out:
 }
 
 int
-event_select_on(struct event_pool *event_pool, int fd, int idx_hint,
-                int poll_in, int poll_out)
+gf_event_select_on(struct event_pool *event_pool, int fd, int idx_hint,
+                   int poll_in, int poll_out)
 {
     int ret = -1;
 
@@ -107,7 +107,7 @@ out:
 }
 
 int
-event_dispatch(struct event_pool *event_pool)
+gf_event_dispatch(struct event_pool *event_pool)
 {
     int ret = -1;
 
@@ -122,7 +122,7 @@ out:
 }
 
 int
-event_reconfigure_threads(struct event_pool *event_pool, int value)
+gf_event_reconfigure_threads(struct event_pool *event_pool, int value)
 {
     int ret = -1;
 
@@ -136,7 +136,7 @@ out:
 }
 
 int
-event_pool_destroy(struct event_pool *event_pool)
+gf_event_pool_destroy(struct event_pool *event_pool)
 {
     int ret = -1;
     int destroy = 0, activethreadcount = 0;
@@ -159,12 +159,12 @@ out:
     return ret;
 }
 
-int
+void
 poller_destroy_handler(int fd, int idx, int gen, void *data, int poll_out,
                        int poll_in, int poll_err, char event_thread_exit)
 {
     struct event_destroy_data *destroy = NULL;
-    int readfd = -1, ret = -1;
+    int readfd = -1;
     char buf = '\0';
 
     destroy = data;
@@ -176,15 +176,14 @@ poller_destroy_handler(int fd, int idx, int gen, void *data, int poll_out,
     while (sys_read(readfd, &buf, 1) > 0) {
     }
 
-    ret = 0;
 out:
-    event_handled(destroy->pool, fd, idx, gen);
+    gf_event_handled(destroy->pool, fd, idx, gen);
 
-    return ret;
+    return;
 }
 
 /* This function destroys all the poller threads.
- * Note: to be called before event_pool_destroy is called.
+ * Note: to be called before gf_event_pool_destroy is called.
  * The order in which cleaning is performed:
  * - Register a pipe fd(this is for waking threads in poll()/epoll_wait())
  * - Set the destroy mode, which this no new event registration will succeed
@@ -195,7 +194,7 @@ out:
  *   threads are destroyed)
  */
 int
-event_dispatch_destroy(struct event_pool *event_pool)
+gf_event_dispatch_destroy(struct event_pool *event_pool)
 {
     int ret = -1, threadcount = 0;
     int fd[2] = {-1};
@@ -233,8 +232,8 @@ event_dispatch_destroy(struct event_pool *event_pool)
 
     /* From the main thread register an event on the pipe fd[0],
      */
-    idx = event_register(event_pool, fd[0], poller_destroy_handler, &data, 1, 0,
-                         0);
+    idx = gf_event_register(event_pool, fd[0], poller_destroy_handler, &data, 1,
+                            0, 0);
     if (idx < 0)
         goto out;
 
@@ -248,7 +247,7 @@ event_dispatch_destroy(struct event_pool *event_pool)
     }
     pthread_mutex_unlock(&event_pool->mutex);
 
-    ret = event_reconfigure_threads(event_pool, 0);
+    ret = gf_event_reconfigure_threads(event_pool, 0);
     if (ret < 0)
         goto out;
 
@@ -268,7 +267,7 @@ event_dispatch_destroy(struct event_pool *event_pool)
             if (sys_write(fd[1], "dummy", 6) == -1) {
                 break;
             }
-            clock_gettime(CLOCK_REALTIME, &sleep_till);
+            timespec_now_realtime(&sleep_till);
             sleep_till.tv_sec += 1;
             ret = pthread_cond_timedwait(&event_pool->cond, &event_pool->mutex,
                                          &sleep_till);
@@ -283,7 +282,7 @@ event_dispatch_destroy(struct event_pool *event_pool)
     }
     pthread_mutex_unlock(&event_pool->mutex);
 
-    ret = event_unregister(event_pool, fd[0], idx);
+    ret = gf_event_unregister(event_pool, fd[0], idx);
 
 out:
     if (fd[0] != -1)
@@ -295,7 +294,7 @@ out:
 }
 
 int
-event_handled(struct event_pool *event_pool, int fd, int idx, int gen)
+gf_event_handled(struct event_pool *event_pool, int fd, int idx, int gen)
 {
     int ret = 0;