Changeset 5842

Timestamp:

03/17/10 15:12:44 (3 years ago)

Author:

blogic

Message:

uloop update

Location:

luci2/libubox

Files:

• Makefile (modified) (1 diff)
• uloop.c (modified) (6 diffs)
• uloop.h (added)

luci2/libubox/Makefile

@@ -9 +9 @@
 
 libubox.so: ucix.c blob.c hash.c uhtbl.c ulog.c
-    $(CC) $(CFLAGS) -o $@ -shared -Wl,-soname,libubox.so $^ -luci
+    $(CC) $(CFLAGS) -g -o $@ -shared -Wl,-soname,libubox.so $^ -luci
 
 libuloop.so: uloop.c
-    $(CC) $(CFLAGS) -o $@ -shared -Wl,-soname,libuloop.so $^ -lubus -I../ubus/ -I./
+    $(CC) $(CFLAGS) -g -o $@ -shared -Wl,-soname,libuloop.so $^ -lubus -I../ubus/ -I./
 
 clean:

luci2/libubox/uloop.c

@@ -25 +25 @@
 #include <poll.h>
 #include <string.h>
+#include <time.h>
 #include <fcntl.h>
 #include <signal.h>
@@ -32 +33 @@
 
 #include <libubus.h>
+#include "uloop.h"
 #include "ulog.h"
-
-struct uloop_sock;
-typedef void (*_uloop_sock_handler)(struct uloop_sock *u);
 
 struct uloop_sock
@@ -68 +67 @@
     ev.events = EPOLLIN | EPOLLET | EPOLLRDHUP;
     ev.data.fd = sock;
+    ev.data.ptr = u;
     epoll_ctl(epoll_fd, EPOLL_CTL_ADD, sock, &ev);
     return u;
@@ -74 +74 @@
 void uloop_ubus_add(struct ubus_ctx *ctx)
 {
-    int s = ubus_get_sock(ctx);
     if(!uloop_ubus)
         uloop_ubus = ctx;
-    if(s)
-        uloop_sock_add(s, ctx, uloop_ubus_cb);
 }
 
@@ -107 +104 @@
 }
 
-int uloop(void)
+int uloop(void (*cb)(void), int timeout)
 {
     #define MAX_EVENTS  10
     struct epoll_event events[MAX_EVENTS];
     int nfds, n;
+    time_t t = time(0);
     uloop_loop = 1;
     uloop_setup_signals();
@@ -127 +125 @@
                 epoll_ctl(epoll_fd, EPOLL_CTL_DEL, u->sock, 0);
                 uloop_sock_delete(u);
-            } else {
-                u->cb(u);
+            } else if(events[n].events & EPOLLIN)
+            {
+                if(u->cb)
+                    u->cb(u);
             }
+        }
+        if(cb)
+        {
+            if(difftime(time(0), t) < timeout)
+                continue;
+            t = time(0);
+            cb();
         }
     }