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

Windows: cleanups, minor fixes

Browse Source
This commit is contained in:
Bert Belder 2011-05-09 02:12:25 +02:00
parent 0144ab9ca7
commit 09b9d39d14
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
oio-win.c
View File

@ -117,7 +117,7 @@ static LPFN_TRANSMITFILE pTransmitFile;
/*
* Private oio_handle_t flags
* Private oio_handle flags
*/
#define OIO_HANDLE_CLOSING 0x0001
#define OIO_HANDLE_CLOSED 0x0002
@ -134,7 +134,7 @@ static LPFN_TRANSMITFILE pTransmitFile;
#define OIO_HANDLE_BIND_ERROR 0x1000
/*
* Private oio_req_t flags.
* Private oio_req flags.
*/
/* The request is currently queued. */
#define OIO_REQ_PENDING 0x01
@ -568,24 +568,29 @@ static int oio_close_error(oio_handle_t* handle, oio_err e) {
handle->error = e;
handle->flags |= OIO_HANDLE_CLOSING;
oio_want_endgame(handle);
/* Handle-specific close actions */
switch (handle->type) {
case OIO_TCP:
closesocket(handle->socket);
if (handle->reqs_pending == 0) {
oio_want_endgame(handle);
}
return 0;
case OIO_PREPARE:
oio_prepare_stop(handle);
oio_want_endgame(handle);
return 0;
case OIO_CHECK:
oio_check_stop(handle);
oio_want_endgame(handle);
return 0;
case OIO_IDLE:
oio_idle_stop(handle);
oio_want_endgame(handle);
return 0;
return 0;
default:
@ -658,7 +663,7 @@ static void oio_queue_accept(oio_handle_t* handle) {
return;
}
/* Prepare the oio_req_t and OVERLAPPED structures. */
/* Prepare the oio_req and OVERLAPPED structures. */
req = &handle->accept_req;
assert(!(req->flags & OIO_REQ_PENDING));
req->type = OIO_ACCEPT;
@ -1321,8 +1326,8 @@ static void oio_poll() {
/* Call idle callbacks */
while (oio_idle_handles_) {
oio_loop_invoke(oio_idle_handles_);
oio_call_endgames();
oio_loop_invoke(oio_idle_handles_);
}
}

6
oio-win.h
View File

@ -77,12 +77,12 @@ typedef struct oio_buf {
};
#define oio_loop_fields \
oio_handle_t* loop_prev; \
oio_handle_t* loop_next; \
oio_handle_t* loop_prev; \
oio_handle_t* loop_next; \
void* loop_cb;
#define oio_handle_private_fields \
oio_handle_t* endgame_next; \
oio_handle_t* endgame_next; \
unsigned int flags; \
oio_err error; \
union { \