From 5bcbc31920007645f8c18895bf9864fc64244ea9 Mon Sep 17 00:00:00 2001
From: Bert Belder <bertbelder@gmail.com>
Date: Wed, 20 Apr 2011 22:28:36 +0200
Subject: [PATCH] Tests / benchmarks use new error handling api

---
 test/benchmark-ping-pongs.c | 21 +++++++++++++--------
 test/echo-server.c          | 30 +++++++++++++++++++-----------
 test/test-callback-stack.c  |  4 ++--
 test/test-connection-fail.c | 10 ++++++----
 test/test-ping-pong.c       | 16 ++++++++++------
 test/test-timeout.c         |  7 +++++--
 6 files changed, 55 insertions(+), 33 deletions(-)

diff --git a/test/benchmark-ping-pongs.c b/test/benchmark-ping-pongs.c
index babc8b3c..e93ea88a 100644
--- a/test/benchmark-ping-pongs.c
+++ b/test/benchmark-ping-pongs.c
@@ -50,20 +50,23 @@ typedef struct {
 void pinger_try_read(pinger_t* pinger);
 
 
-void pinger_on_close(oio_handle* handle, oio_err err) {
-  pinger_t* pinger = (pinger_t*)handle->data;
+void pinger_on_close(oio_handle* handle, int status) {
+  pinger_t* pinger;
 
+  ASSERT(status == 0);
+
+  pinger = (pinger_t*)handle->data;
   printf("%d pings\n", pinger->pongs);
 
-  ASSERT(!err);
-
   free(pinger);
 
   completed_pingers++;
 }
 
 
-void pinger_after_write(oio_req *req) {
+void pinger_after_write(oio_req *req, int status) {
+  ASSERT(status == 0);
+
   free(req);
 }
 
@@ -84,10 +87,12 @@ static void pinger_write_ping(pinger_t* pinger) {
 }
 
 
-static void pinger_after_read(oio_req* req, size_t nread) {
+static void pinger_after_read(oio_req* req, size_t nread, int status) {
   unsigned int i;
   pinger_t* pinger;
 
+  ASSERT(status == 0);
+
   pinger = (pinger_t*)req->handle->data;
 
   if (nread == 0) {
@@ -121,10 +126,10 @@ void pinger_try_read(pinger_t* pinger) {
 }
 
 
-void pinger_on_connect(oio_req *req, oio_err err) {
+void pinger_on_connect(oio_req *req, int status) {
   pinger_t *pinger = (pinger_t*)req->handle->data;
 
-  ASSERT(!err);
+  ASSERT(status == 0);
 
   pinger_try_read(pinger);
   pinger_write_ping(pinger);
diff --git a/test/echo-server.c b/test/echo-server.c
index 48bb5e32..8e83e942 100644
--- a/test/echo-server.c
+++ b/test/echo-server.c
@@ -36,21 +36,29 @@ typedef struct {
 
 oio_handle server;
 
-void after_write(oio_req* req);
-void after_read(oio_req* req, size_t nread);
+void after_write(oio_req* req, int status);
+void after_read(oio_req* req, size_t nread, int status);
 void try_read(peer_t* peer);
-void on_close(oio_handle* peer, oio_err err);
+void on_close(oio_handle* peer, int status);
 void on_accept(oio_handle* handle);
 
 
-void after_write(oio_req* req) {
-  peer_t* peer = (peer_t*) req->data;
+void after_write(oio_req* req, int status) {
+  peer_t* peer;
+
+  ASSERT(status == 0);
+
+  peer = (peer_t*) req->data;
   try_read(peer);
 }
 
 
-void after_read(oio_req* req, size_t nread) {
-  peer_t* peer = req->data;
+void after_read(oio_req* req, size_t nread, int status) {
+  peer_t* peer;
+
+  ASSERT(status == 0);
+
+  peer = req->data;
 
   if (nread == 0) {
     oio_close(req->handle);
@@ -75,8 +83,8 @@ void try_read(peer_t* peer) {
 }
 
 
-void on_close(oio_handle* peer, oio_err err) {
-  if (err) {
+void on_close(oio_handle* peer, int status) {
+  if (status != 0) {
     fprintf(stdout, "Socket error\n");
   }
 }
@@ -95,9 +103,9 @@ void on_accept(oio_handle* server) {
 }
 
 
-void on_server_close(oio_handle* handle, oio_err err) {
+void on_server_close(oio_handle* handle, int status) {
   ASSERT(handle == &server);
-  ASSERT(!err);
+  ASSERT(status == 0);
 }
 
 
diff --git a/test/test-callback-stack.c b/test/test-callback-stack.c
index 7c256945..5ee81384 100644
--- a/test/test-callback-stack.c
+++ b/test/test-callback-stack.c
@@ -32,8 +32,8 @@ int nested = 0;
 int close_cb_called = 0;
 
 
-void close_cb(oio_handle *handle, oio_err err) {
-  ASSERT(!err);
+void close_cb(oio_handle *handle, int status) {
+  ASSERT(status == 0);
   ASSERT(nested == 0 && "oio_close_cb must be called from a fresh stack");
   close_cb_called++;
 }
diff --git a/test/test-connection-fail.c b/test/test-connection-fail.c
index bd8f8b2a..3a268c59 100644
--- a/test/test-connection-fail.c
+++ b/test/test-connection-fail.c
@@ -32,15 +32,17 @@ static int connect_cb_calls;
 static int close_cb_calls;
 
 
-static void on_close(oio_handle* handle, oio_err err) {
-  ASSERT(!err);
+static void on_close(oio_handle* handle, int status) {
+  ASSERT(status == 0);
   close_cb_calls++;
 }
 
 
-static void on_connect(oio_req *req, oio_err err) {
-  ASSERT(err);
+static void on_connect(oio_req *req, int status) {
+  ASSERT(status == -1);
   connect_cb_calls++;
+
+  oio_close(req->handle);
 }
 
 
diff --git a/test/test-ping-pong.c b/test/test-ping-pong.c
index 08598732..c42c4708 100644
--- a/test/test-ping-pong.c
+++ b/test/test-ping-pong.c
@@ -48,10 +48,10 @@ typedef struct {
 void pinger_try_read(pinger_t* pinger);
 
 
-void pinger_on_close(oio_handle* handle, oio_err err) {
+void pinger_on_close(oio_handle* handle, int status) {
   pinger_t* pinger = (pinger_t*)handle->data;
 
-  ASSERT(!err);
+  ASSERT(status == 0);
   ASSERT(NUM_PINGS == pinger->pongs);
 
   free(pinger);
@@ -60,7 +60,9 @@ void pinger_on_close(oio_handle* handle, oio_err err) {
 }
 
 
-void pinger_after_write(oio_req *req) {
+void pinger_after_write(oio_req *req, int status) {
+  ASSERT(status == 0);
+
   free(req);
 }
 
@@ -83,10 +85,12 @@ static void pinger_write_ping(pinger_t* pinger) {
 }
 
 
-static void pinger_after_read(oio_req* req, size_t nread) {
+static void pinger_after_read(oio_req* req, size_t nread, int status) {
   unsigned int i;
   pinger_t* pinger;
 
+  ASSERT(status == 0);
+
   pinger = (pinger_t*)req->handle->data;
 
   if (nread == 0) {
@@ -121,10 +125,10 @@ void pinger_try_read(pinger_t* pinger) {
 }
 
 
-void pinger_on_connect(oio_req *req, oio_err err) {
+void pinger_on_connect(oio_req *req, int status) {
   pinger_t *pinger = (pinger_t*)req->handle->data;
 
-  ASSERT(!err);
+  ASSERT(status == 0);
 
   pinger_try_read(pinger);
   pinger_write_ping(pinger);
diff --git a/test/test-timeout.c b/test/test-timeout.c
index f03bed29..42de90a1 100644
--- a/test/test-timeout.c
+++ b/test/test-timeout.c
@@ -28,8 +28,10 @@ static int timeouts = 0;
 
 static int64_t start_time;
 
-static void timeout_cb(oio_req *req) {
+static void timeout_cb(oio_req *req, int status) {
   ASSERT(req != NULL);
+  ASSERT(status == 0);
+
   free(req);
   timeouts++;
 
@@ -37,9 +39,10 @@ static void timeout_cb(oio_req *req) {
   oio_update_time();
 }
 
-static void exit_timeout_cb(oio_req *req) {
+static void exit_timeout_cb(oio_req *req, int status) {
   int64_t now = oio_now();
   ASSERT(req != NULL);
+  ASSERT(status == 0);
   ASSERT(timeouts == expected);
   ASSERT(start_time < now);
   exit(0);