version 1.9.2.19, 2012/05/17 09:32:51
|
version 1.9.2.21, 2012/05/17 11:16:20
|
Line 592 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
Line 592 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
if (!srv) |
if (!srv) |
return; |
return; |
|
|
pthread_cancel(srv->srv_blob.tid); | if (srv->srv_blob.tid) { |
pthread_join(srv->srv_blob.tid, NULL); | pthread_cancel(srv->srv_blob.tid); |
| pthread_join(srv->srv_blob.tid, NULL); |
| } |
|
|
/* close all clients connections & server socket */ |
/* close all clients connections & server socket */ |
for (i = 0; i < io_arraySize(srv->srv_blob.clients); i++) { |
for (i = 0; i < io_arraySize(srv->srv_blob.clients); i++) { |
Line 602 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
Line 604 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
shutdown(c->cli_sock, SHUT_RDWR); |
shutdown(c->cli_sock, SHUT_RDWR); |
close(c->cli_sock); |
close(c->cli_sock); |
|
|
|
schedCancelby(srv->srv_blob.root, taskMAX, CRITERIA_ARG, c, NULL); |
AIT_FREE_VAL(&c->cli_buf); |
AIT_FREE_VAL(&c->cli_buf); |
} |
} |
io_arrayDel(srv->srv_blob.clients, i, 42); |
io_arrayDel(srv->srv_blob.clients, i, 42); |
Line 796 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
Line 799 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
shutdown(c->cli_sock, SHUT_RDWR); |
shutdown(c->cli_sock, SHUT_RDWR); |
close(c->cli_sock); |
close(c->cli_sock); |
|
|
|
schedCancelby((*psrv)->srv_root, taskMAX, CRITERIA_ARG, c, NULL); |
AIT_FREE_VAL(&c->cli_buf); |
AIT_FREE_VAL(&c->cli_buf); |
} |
} |
io_arrayDel((*psrv)->srv_clients, i, 42); |
io_arrayDel((*psrv)->srv_clients, i, 42); |