luo980/libuv
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove oio_err - use ints

Browse Source
This commit is contained in:
Ryan Dahl 2011-04-19 02:29:36 -07:00
parent 595756048c
commit 111536c9e5
10 changed files with 23 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
oio-unix.c
View File

@ -75,13 +75,13 @@ int oio_flag_is_set(oio_handle* handle, int flag) {
} }
static oio_err oio_err_new(oio_handle* handle, int e) { static int oio_err_new(oio_handle* handle, int e) {
handle->err = e; handle->err = e;
return e; return e;
} }
oio_err oio_err_last(oio_handle *handle) { int oio_err_last(oio_handle *handle) {
return handle->err; return handle->err;
} }
@ -389,7 +389,7 @@ void oio__read(oio_handle* handle) {
assert(ev_is_active(&handle->read_watcher)); assert(ev_is_active(&handle->read_watcher));
ev_io_start(EV_DEFAULT_ &handle->read_watcher); ev_io_start(EV_DEFAULT_ &handle->read_watcher);
} else { } else {
oio_err err = oio_err_new(handle, errorno); int err = oio_err_new(handle, errorno);
if (cb) { if (cb) {
cb(req, 0); cb(req, 0);
} }
@ -471,7 +471,7 @@ void oio_tcp_connect(oio_handle* handle) {
return; return;
} else { } else {
oio_err err = oio_err_new(handle, error); int err = oio_err_new(handle, error);
oio_connect_cb connect_cb = req->cb; oio_connect_cb connect_cb = req->cb;
if (connect_cb) { if (connect_cb) {
@ -618,7 +618,7 @@ int oio_read(oio_req *req, oio_buf* bufs, int bufcnt) {
if (nread < 0 && errorno != EAGAIN) { if (nread < 0 && errorno != EAGAIN) {
/* Real error. */ /* Real error. */
oio_err err = oio_err_new(handle, errorno); int err = oio_err_new(handle, errorno);
if (cb) { if (cb) {
cb(req, nread); cb(req, nread);

2
oio-unix.h
View File

@ -49,7 +49,7 @@ typedef struct {
#define oio_handle_private_fields \ #define oio_handle_private_fields \
int fd; \ int fd; \
int flags; \ int flags; \
oio_err err; \ int err; \
oio_read_cb read_cb; \ oio_read_cb read_cb; \
oio_accept_cb accept_cb; \ oio_accept_cb accept_cb; \
int accepted_fd; \ int accepted_fd; \

4
oio-win.c
View File

@ -394,7 +394,7 @@ int oio_accept(oio_handle* server, oio_handle* client,
} }
static int oio_close_error(oio_handle* handle, oio_err e) { static int oio_close_error(oio_handle* handle, int e) {
oio_req *req; oio_req *req;
if (handle->flags & OIO_HANDLE_CLOSING) if (handle->flags & OIO_HANDLE_CLOSING)
@ -670,7 +670,7 @@ int oio_write2(oio_req *req, const char* msg) {
} }
oio_err oio_last_error() { int oio_last_error() {
return oio_errno_; return oio_errno_;
} }

2
oio-win.h
View File

@ -62,4 +62,4 @@ typedef struct oio_buf {
struct oio_accept_req_s* accept_reqs; \ struct oio_accept_req_s* accept_reqs; \
unsigned int flags; \ unsigned int flags; \
unsigned int reqs_pending; \ unsigned int reqs_pending; \
oio_err error; int error;

10
oio.h
View File

@ -29,8 +29,6 @@
#include <stddef.h> /* size_t */ #include <stddef.h> /* size_t */
typedef int oio_err; /* FIXME */
typedef struct oio_req_s oio_req; typedef struct oio_req_s oio_req;
typedef struct oio_handle_s oio_handle; typedef struct oio_handle_s oio_handle;
@ -38,8 +36,8 @@ typedef struct oio_handle_s oio_handle;
typedef void (*oio_read_cb)(oio_req* req, size_t nread); typedef void (*oio_read_cb)(oio_req* req, size_t nread);
typedef void (*oio_write_cb)(oio_req* req); typedef void (*oio_write_cb)(oio_req* req);
typedef void (*oio_accept_cb)(oio_handle* handle); typedef void (*oio_accept_cb)(oio_handle* handle);
typedef void (*oio_close_cb)(oio_handle* handle, oio_err e); typedef void (*oio_close_cb)(oio_handle* handle, int e);
typedef void (*oio_connect_cb)(oio_req* req, oio_err e); typedef void (*oio_connect_cb)(oio_req* req, int e);
typedef void (*oio_shutdown_cb)(oio_req* req); typedef void (*oio_shutdown_cb)(oio_req* req);
typedef void (*oio_timer_cb)(oio_req* req, int64_t skew); typedef void (*oio_timer_cb)(oio_req* req, int64_t skew);
@ -99,8 +97,8 @@ struct oio_req_s {
* On error the user should then call oio_last_error() to determine * On error the user should then call oio_last_error() to determine
* the error code. * the error code.
*/ */
oio_err oio_last_error(); int oio_last_error();
const char* oio_err_str(oio_err err); const char* oio_err_str(int err);
void oio_init(); void oio_init();

4
test/benchmark-ping-pongs.c
View File

@ -50,7 +50,7 @@ typedef struct {
void pinger_try_read(pinger_t* pinger); 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 err) {
pinger_t* pinger = (pinger_t*)handle->data; pinger_t* pinger = (pinger_t*)handle->data;
printf("%d pings\n", pinger->pongs); printf("%d pings\n", pinger->pongs);
@ -117,7 +117,7 @@ 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 err) {
pinger_t *pinger = (pinger_t*)req->handle->data; pinger_t *pinger = (pinger_t*)req->handle->data;
ASSERT(!err); ASSERT(!err);

6
test/echo-server.c
View File

@ -39,7 +39,7 @@ oio_handle server;
void after_write(oio_req* req); void after_write(oio_req* req);
void after_read(oio_req* req, size_t nread); void after_read(oio_req* req, size_t nread);
void try_read(peer_t* peer); void try_read(peer_t* peer);
void on_close(oio_handle* peer, oio_err err); void on_close(oio_handle* peer, int err);
void on_accept(oio_handle* handle); void on_accept(oio_handle* handle);
@ -75,7 +75,7 @@ void try_read(peer_t* peer) {
} }
void on_close(oio_handle* peer, oio_err err) { void on_close(oio_handle* peer, int err) {
if (err) { if (err) {
fprintf(stdout, "Socket error\n"); fprintf(stdout, "Socket error\n");
} }
@ -95,7 +95,7 @@ void on_accept(oio_handle* server) {
} }
void on_server_close(oio_handle* handle, oio_err err) { void on_server_close(oio_handle* handle, int err) {
ASSERT(handle == &server); ASSERT(handle == &server);
ASSERT(!err); ASSERT(!err);
} }

2
test/test-callback-stack.c
View File

@ -32,7 +32,7 @@ int nested = 0;
int close_cb_called = 0; int close_cb_called = 0;
void close_cb(oio_handle *handle, oio_err err) { void close_cb(oio_handle *handle, int err) {
ASSERT(!err); ASSERT(!err);
ASSERT(nested == 0 && "oio_close_cb must be called from a fresh stack"); ASSERT(nested == 0 && "oio_close_cb must be called from a fresh stack");
close_cb_called++; close_cb_called++;

4
test/test-connection-fail.c
View File

@ -32,13 +32,13 @@ static int connect_cb_calls;
static int close_cb_calls; static int close_cb_calls;
static void on_close(oio_handle* handle, oio_err err) { static void on_close(oio_handle* handle, int err) {
ASSERT(!err); ASSERT(!err);
close_cb_calls++; close_cb_calls++;
} }
static void on_connect(oio_req *req, oio_err err) { static void on_connect(oio_req *req, int err) {
ASSERT(err); ASSERT(err);
connect_cb_calls++; connect_cb_calls++;
} }

4
test/test-ping-pong.c
View File

@ -48,7 +48,7 @@ typedef struct {
void pinger_try_read(pinger_t* pinger); 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 err) {
pinger_t* pinger = (pinger_t*)handle->data; pinger_t* pinger = (pinger_t*)handle->data;
ASSERT(!err); ASSERT(!err);
@ -117,7 +117,7 @@ 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 err) {
pinger_t *pinger = (pinger_t*)req->handle->data; pinger_t *pinger = (pinger_t*)req->handle->data;
ASSERT(!err); ASSERT(!err);