X-Git-Url: http://git.archive.openwrt.org/?p=project%2Flibubox.git;a=blobdiff_plain;f=uloop.c;h=f0ccb0c2e6344400853bd8548355328f19feb06f;hp=ecf26ec185db87fadb0d2aa2cadacf6b1b4a0ae0;hb=cdb9f71971062bfeaf4352621249f9d3d2408f1b;hpb=b7930023ee0d1b66b4bda9273639f4813e3b7043

diff --git a/uloop.c b/uloop.c
index ecf26ec..f0ccb0c 100644
--- a/uloop.c
+++ b/uloop.c
@@ -1,24 +1,20 @@
 /*
- *   Copyright (C) 2010 Felix Fietkau <nbd@openwrt.org>
- *   Copyright (C) 2010 John Crispin <blogic@openwrt.org>
- *   Copyright (C) 2010 Steven Barth <steven@midlink.org>
+ * uloop - event loop implementation
  *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
+ * Copyright (C) 2010-2013 Felix Fietkau <nbd@openwrt.org>
  *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the Free Software
- *   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
  *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
-
 #include <sys/time.h>
 #include <sys/types.h>
 
@@ -250,6 +246,9 @@ int uloop_fd_delete(struct uloop_fd *sock)
 {
 	int i;
 
+	if (!sock->registered)
+		return 0;
+
 	for (i = cur_fd + 1; i < cur_nfds; i++) {
 		if (events[i].data.ptr != sock)
 			continue;
@@ -306,6 +305,9 @@ int uloop_fd_add(struct uloop_fd *sock, unsigned int flags)
 	unsigned int fl;
 	int ret;
 
+	if (!(flags & (ULOOP_READ | ULOOP_WRITE)))
+		return uloop_fd_delete(sock);
+
 	if (!sock->registered && !(flags & ULOOP_BLOCKING)) {
 		fl = fcntl(sock->fd, F_GETFL, 0);
 		fl |= O_NONBLOCK;
@@ -351,6 +353,15 @@ int uloop_timeout_add(struct uloop_timeout *timeout)
 	return 0;
 }
 
+static void uloop_gettime(struct timeval *tv)
+{
+	struct timespec ts;
+
+	clock_gettime(CLOCK_MONOTONIC, &ts);
+	tv->tv_sec = ts.tv_sec;
+	tv->tv_usec = ts.tv_nsec / 1000;
+}
+
 int uloop_timeout_set(struct uloop_timeout *timeout, int msecs)
 {
 	struct timeval *time = &timeout->time;
@@ -358,7 +369,7 @@ int uloop_timeout_set(struct uloop_timeout *timeout, int msecs)
 	if (timeout->pending)
 		uloop_timeout_cancel(timeout);
 
-	gettimeofday(&timeout->time, NULL);
+	uloop_gettime(&timeout->time);
 
 	time->tv_sec += msecs / 1000;
 	time->tv_usec += (msecs % 1000) * 1000;
@@ -382,6 +393,18 @@ int uloop_timeout_cancel(struct uloop_timeout *timeout)
 	return 0;
 }
 
+int uloop_timeout_remaining(struct uloop_timeout *timeout)
+{
+	struct timeval now;
+
+	if (!timeout->pending)
+		return -1;
+
+	uloop_gettime(&now);
+
+	return tv_diff(&timeout->time, &now);
+}
+
 int uloop_process_add(struct uloop_process *p)
 {
 	struct uloop_process *tmp;
@@ -521,7 +544,7 @@ void uloop_run(void)
 	uloop_setup_signals();
 	while(!uloop_cancelled)
 	{
-		gettimeofday(&tv, NULL);
+		uloop_gettime(&tv);
 		uloop_process_timeouts(&tv);
 		if (uloop_cancelled)
 			break;