|
|
| version 1.1.1.1.2.12, 2010/06/24 15:23:38 | version 1.1.1.1.2.13, 2010/06/28 15:18:43 |
|---|---|
| Line 364 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s | Line 364 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s |
| rpc_srv_registerCall(srv, NULL, CALL_BLOBSHUTDOWN, 0); | rpc_srv_registerCall(srv, NULL, CALL_BLOBSHUTDOWN, 0); |
| rpc_srv_registerCall(srv, NULL, CALL_BLOBCLIENTS, 0); | rpc_srv_registerCall(srv, NULL, CALL_BLOBCLIENTS, 0); |
| rpc_srv_registerCall(srv, NULL, CALL_BLOBVARS, 0); | rpc_srv_registerCall(srv, NULL, CALL_BLOBVARS, 0); |
| rpc_srv_registerCall(srv, NULL, CALL_BLOBSTATE, 1); | |
| pthread_mutex_unlock(&srv->srv_mtx); | pthread_mutex_unlock(&srv->srv_mtx); |
| srv->srv_blob.state = enable; // enable BLOB | srv->srv_blob.state = enable; // enable BLOB |
| Line 391 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) | Line 392 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) |
| rpc_srv_unregisterCall(srv, NULL, CALL_BLOBSHUTDOWN); | rpc_srv_unregisterCall(srv, NULL, CALL_BLOBSHUTDOWN); |
| rpc_srv_unregisterCall(srv, NULL, CALL_BLOBCLIENTS); | rpc_srv_unregisterCall(srv, NULL, CALL_BLOBCLIENTS); |
| rpc_srv_unregisterCall(srv, NULL, CALL_BLOBVARS); | rpc_srv_unregisterCall(srv, NULL, CALL_BLOBVARS); |
| rpc_srv_unregisterCall(srv, NULL, CALL_BLOBSTATE); | |
| for (i = 0, c = srv->srv_blob.clients; i < srv->srv_numcli && c; i++, c++) | for (i = 0, c = srv->srv_blob.clients; i < srv->srv_numcli && c; i++, c++) |
| if (c->cli_sa.sa_family) | if (c->cli_sa.sa_family) |
| shutdown(c->cli_sock, SHUT_RDWR); | shutdown(c->cli_sock, SHUT_RDWR); |
| close(srv->srv_blob.server.cli_sock); | close(srv->srv_blob.server.cli_sock); |
| if (srv->srv_blob.clients) | if (srv->srv_blob.clients) { |
| free(srv->srv_blob.clients); | free(srv->srv_blob.clients); |
| srv->srv_blob.clients = NULL; | |
| } | |
| pthread_mutex_lock(&srv->srv_blob.mtx); | pthread_mutex_lock(&srv->srv_blob.mtx); |
| while ((f = srv->srv_blob.blobs)) { | while ((f = srv->srv_blob.blobs)) { |
| Line 439 rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv) | Line 443 rpc_srv_execBLOBServer(rpc_srv_t * __restrict srv) |
| for (c = srv->srv_blob.clients, i = 0; i < srv->srv_numcli && c; i++, c++) | for (c = srv->srv_blob.clients, i = 0; i < srv->srv_numcli && c; i++, c++) |
| if (!c->cli_sa.sa_family) | if (!c->cli_sa.sa_family) |
| break; | break; |
| if (c && c->cli_sa.sa_family && c->cli_parent) { | if (i >= srv->srv_numcli) { |
| usleep(1000000); | usleep(1000000); |
| continue; | continue; |
| } | } |
| Line 610 rpc_srv_endServer(rpc_srv_t * __restrict srv) | Line 614 rpc_srv_endServer(rpc_srv_t * __restrict srv) |
| if (srv->srv_clients) { | if (srv->srv_clients) { |
| free(srv->srv_clients); | free(srv->srv_clients); |
| srv->srv_clients = NULL; | |
| srv->srv_numcli = 0; | srv->srv_numcli = 0; |
| } | } |
| Line 655 rpc_srv_execServer(rpc_srv_t * __restrict srv) | Line 660 rpc_srv_execServer(rpc_srv_t * __restrict srv) |
| for (c = srv->srv_clients, i = 0; i < srv->srv_numcli && c; i++, c++) | for (c = srv->srv_clients, i = 0; i < srv->srv_numcli && c; i++, c++) |
| if (!c->cli_sa.sa_family) | if (!c->cli_sa.sa_family) |
| break; | break; |
| if (c && c->cli_sa.sa_family && c->cli_parent) { | if (i >= srv->srv_numcli) { |
| usleep(1000000); | usleep(1000000); |
| continue; | continue; |
| } | } |