[MAJOR] replaced all timeouts with struct timeval
The timeout functions were difficult to manipulate because they were
rounding results to the millisecond. Thus, it was difficult to compare
and to check what expired and what did not. Also, the comparison
functions were heavy with multiplies and divides by 1000. Now, all
timeouts are stored in timevals, reducing the number of operations
for updates and leading to cleaner and more efficient code.
diff --git a/include/proto/checks.h b/include/proto/checks.h
index 6ac32a1..839af55 100644
--- a/include/proto/checks.h
+++ b/include/proto/checks.h
@@ -2,7 +2,7 @@
include/proto/checks.h
Functions prototypes for the checks.
- Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
+ Copyright (C) 2000-2007 Willy Tarreau - w@1wt.eu
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -25,7 +25,7 @@
#include <types/task.h>
#include <common/config.h>
-int process_chk(struct task *t);
+void process_chk(struct task *t, struct timeval *next);
#endif /* _PROTO_CHECKS_H */
diff --git a/include/proto/proto_http.h b/include/proto/proto_http.h
index 298d30d..da4ea0e 100644
--- a/include/proto/proto_http.h
+++ b/include/proto/proto_http.h
@@ -58,7 +58,7 @@
#define HTTP_IS_VER_TOKEN(x) (http_is_ver_token[(unsigned char)(x)])
int event_accept(int fd);
-int process_session(struct task *t);
+void process_session(struct task *t, struct timeval *next);
int process_cli(struct session *t);
int process_srv(struct session *t);
diff --git a/include/proto/proxy.h b/include/proto/proxy.h
index 3fa541a..38d7325 100644
--- a/include/proto/proxy.h
+++ b/include/proto/proxy.h
@@ -2,7 +2,7 @@
include/proto/proxy.h
This file defines function prototypes for proxy management.
- Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
+ Copyright (C) 2000-2007 Willy Tarreau - w@1wt.eu
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -23,10 +23,11 @@
#define _PROTO_PROXY_H
#include <common/config.h>
+#include <common/time.h>
#include <types/proxy.h>
int start_proxies(int verbose);
-int maintain_proxies(void);
+void maintain_proxies(struct timeval *next);
void soft_stop(void);
void pause_proxy(struct proxy *p);
void pause_proxies(void);
diff --git a/include/proto/queue.h b/include/proto/queue.h
index c113f03..4370cb3 100644
--- a/include/proto/queue.h
+++ b/include/proto/queue.h
@@ -2,7 +2,7 @@
include/proto/queue.h
This file defines everything related to queues.
- Copyright (C) 2000-2006 Willy Tarreau - w@1wt.eu
+ Copyright (C) 2000-2007 Willy Tarreau - w@1wt.eu
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -35,7 +35,7 @@
struct session *pendconn_get_next_sess(struct server *srv, struct proxy *px);
struct pendconn *pendconn_add(struct session *sess);
void pendconn_free(struct pendconn *p);
-int process_srv_queue(struct task *t);
+void process_srv_queue(struct task *t, struct timeval *next);
unsigned int srv_dynamic_maxconn(const struct server *s);
diff --git a/include/proto/task.h b/include/proto/task.h
index 2c724ad..c594d52 100644
--- a/include/proto/task.h
+++ b/include/proto/task.h
@@ -111,12 +111,10 @@
* - wake up all expired tasks
* - call all runnable tasks
* - call maintain_proxies() to enable/disable the listeners
- * - return the delay till next event in ms, -1 = wait indefinitely
- * Note: this part should be rewritten with the O(ln(n)) scheduler.
- *
+ * - return the date of next event in <next> or eternity.
*/
-int process_runnable_tasks();
+void process_runnable_tasks(struct timeval *next);
#endif /* _PROTO_TASK_H */