libtf: stackable timeouts

instead of having per-function argument, use a push/pop mechanism:
- multiple timers inside fiber use only one heap entry
- easy to chain multiple possibly blocking operations inside one
  timeout block

2 files changed, 9 insertions, 6 deletions

diff --git a/test/httpget.c b/test/httpget.c
index c1e37a3..fed6c06 100644
--- a/test/httpget.c
+++ b/test/httpget.c
@@ -15,7 +15,7 @@ static void ping_fiber(void *ptr)
 	struct tf_sockaddr host;
 	struct tf_fd fd;
 	char buf[128];
-	int bytes = 0, r = 0;
+	int bytes = 0, r;
 	const char *req = "GET / HTTP/1.0\r\n\r\n";
 
 	printf("Lookup %s\n", ctx->hostname);
@@ -23,16 +23,19 @@ static void ping_fiber(void *ptr)
 	host.u.in.sin_addr.s_addr = inet_addr(ctx->hostname);
 	host.u.in.sin_port = htons(80);
 
-	if (tf_socket(&fd, AF_INET, SOCK_STREAM, 0) < 0)
+	r = tf_socket(&fd, AF_INET, SOCK_STREAM, 0);
+	if (r < 0)
 		goto err;
 
-	if ((r = tf_connect(&fd, &host, 10000)) < 0)
+	r = tf_timed(tf_connect(&fd, &host), 10000);
+	if (r < 0)
 		goto err_close;
 
-	if ((r = tf_write_fully(&fd, req, strlen(req), 10000)) < 0)
+	r = tf_write_fully(&fd, req, strlen(req));
+	if (r < 0)
 		goto err_close;
 
-	while ((r = tf_read(&fd, buf, sizeof(buf), 10000)) > 0)
+	while ((r = tf_read(&fd, buf, sizeof(buf))) > 0)
 		bytes += r;
 err_close:
 	tf_close(&fd);
diff --git a/test/read.c b/test/read.c
index 97f25fd..6d8306b 100644
--- a/test/read.c
+++ b/test/read.c
@@ -24,7 +24,7 @@ static void io_fiber(void *ptr)
 
 	tf_open_fd(&fin, STDIN_FILENO, TF_FD_STREAM_ORIENTED);
 	while (1) {
-		if (tf_read(&fin, data, sizeof(data), TF_NO_TIMEOUT) < 0)
+		if (tf_read_fully(&fin, data, sizeof(data)) < 0)
 			break;
 		printf("Read: %8.8s\n", data);
 	}