version 1.9.2.11, 2012/05/16 07:54:49
|
version 1.9.2.12, 2012/05/16 09:02:48
|
Line 285 end:
|
Line 285 end:
|
return NULL; |
return NULL; |
} |
} |
|
|
|
/* ------------------------------------------------------ */ |
|
|
|
static void * |
|
acceptBLOBClients(sched_task_t *task) |
|
{ |
|
rpc_srv_t *srv = TASK_ARG(task); |
|
rpc_cli_t *c = NULL; |
|
register int i; |
|
socklen_t salen = sizeof(io_sockaddr_t); |
|
|
|
/* check free slots for connect */ |
|
for (i = 0; i < io_arraySize(srv->srv_clients) && |
|
(c = io_array(srv->srv_clients, i, rpc_cli_t*)); i++); |
|
if (c) /* no more free slots! */ |
|
goto end; |
|
c = malloc(sizeof(rpc_cli_t)); |
|
if (!c) { |
|
LOGERR; |
|
srv->srv_kill = kill; |
|
return NULL; |
|
} else { |
|
memset(c, 0, sizeof(rpc_cli_t)); |
|
io_arraySet(srv->srv_clients, i, c); |
|
c->cli_id = i; |
|
c->cli_parent = srv; |
|
} |
|
|
|
/* alloc empty buffer */ |
|
AIT_SET_BUF2(&c->cli_buf, 0, srv->srv_netbuf); |
|
|
|
/* accept client */ |
|
c->cli_sock = accept(srv->srv_server.cli_sock, &c->cli_sa.sa, &salen); |
|
if (c->cli_sock == -1) { |
|
LOGERR; |
|
AIT_FREE_VAL(&c->cli_buf); |
|
io_arrayDel(srv->srv_clients, i, 42); |
|
goto end; |
|
} else |
|
fcntl(c->cli_sock, F_SETFL, fcntl(c->cli_sock, F_GETFL) | O_NONBLOCK); |
|
|
|
schedRead(TASK_ROOT(task), rxPacket, c, c->cli_sock, NULL, 0); |
|
end: |
|
schedReadSelf(task); |
|
return NULL; |
|
} |
|
|
#if 0 |
#if 0 |
static void * |
static void * |
txBLOB(sched_task_t *task) |
txBLOB(sched_task_t *task) |
Line 469 rpc_srv_dispatchVars(void *arg)
|
Line 515 rpc_srv_dispatchVars(void *arg)
|
} |
} |
#endif |
#endif |
|
|
|
/* ------------------------------------------------------ */ |
|
|
/* |
/* |
* rpc_srv_initBLOBServer() - Init & create BLOB Server |
* rpc_srv_initBLOBServer() - Init & create BLOB Server |
Line 484 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
|
Line 531 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
|
int n = 1; |
int n = 1; |
io_sockaddr_t sa; |
io_sockaddr_t sa; |
|
|
if (!srv) { | if (!srv || srv->srv_kill) { |
rpc_SetErr(EINVAL, "Invalid parameters can`t init BLOB server"); |
rpc_SetErr(EINVAL, "Invalid parameters can`t init BLOB server"); |
return -1; |
return -1; |
} |
} |
if (srv->srv_blob.state) { |
|
rpc_SetErr(EPERM, "Already started BLOB server!"); |
|
return 0; |
|
} |
|
|
|
memset(&srv->srv_blob, 0, sizeof srv->srv_blob); |
memset(&srv->srv_blob, 0, sizeof srv->srv_blob); |
if (access(diskDir, R_OK | W_OK) == -1) { |
if (access(diskDir, R_OK | W_OK) == -1) { |
Line 564 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
|
Line 607 rpc_srv_initBLOBServer(rpc_srv_t * __restrict srv, u_s
|
return -1; |
return -1; |
} |
} |
|
|
srv->srv_blob.state = enable; /* enable BLOB */ | /* init blob scheduler */ |
| srv->srv_blob.root = schedBegin(); |
| if (!srv->srv_blob.root) { |
| rpc_SetErr(sched_GetErrno(), "%s", sched_GetError()); |
| io_arrayDestroy(&srv->srv_blob.clients); |
| close(srv->srv_blob.server.cli_sock); |
| AIT_FREE_VAL(&srv->srv_blob.dir); |
| return -1; |
| } |
| |
return 0; |
return 0; |
} |
} |
|
|
Line 581 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
Line 633 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
register int i; |
register int i; |
rpc_blob_t *b, *tmp; |
rpc_blob_t *b, *tmp; |
|
|
if (!srv || srv->srv_blob.state == disable) | if (!srv) |
return; |
return; |
else |
|
srv->srv_blob.state = kill; |
|
|
|
/* 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 608 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
Line 658 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
free(b); |
free(b); |
} |
} |
|
|
|
schedEnd(&srv->srv_blob.root); |
AIT_FREE_VAL(&srv->srv_blob.dir); |
AIT_FREE_VAL(&srv->srv_blob.dir); |
|
|
/* at final, save disable BLOB service state */ | srv->srv_blob.kill = 1; |
srv->srv_blob.state = disable; | |
} |
} |
|
|
#if 0 |
|
/* |
/* |
* rpc_srv_loopBLOB() - Execute Main BLOB server loop and wait for clients requests | * rpc_srv_loopBLOBServer() - Execute Main BLOB server loop and wait for clients requests |
* |
* |
* @srv = RPC Server instance |
* @srv = RPC Server instance |
* return: -1 error or 0 ok, infinite loop ... |
* return: -1 error or 0 ok, infinite loop ... |
*/ |
*/ |
int |
int |
rpc_srv_loopBLOB(rpc_srv_t * __restrict srv) | rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv) |
{ |
{ |
socklen_t salen = sizeof(io_sockaddr_t); | if (!srv || srv->srv_kill) { |
register int i; | |
rpc_cli_t *c; | |
int ret; | |
pthread_attr_t attr; | |
struct pollfd pfd; | |
| |
if (!srv || srv->srv_blob.state == kill) { | |
rpc_SetErr(EINVAL, "Invalid parameter can`t start BLOB server"); |
rpc_SetErr(EINVAL, "Invalid parameter can`t start BLOB server"); |
return -1; |
return -1; |
} |
} |
|
|
if (listen(srv->srv_blob.server.cli_sock, SOMAXCONN) == -1) { | fcntl(srv->srv_blob.server.cli_sock, F_SETFL, |
| fcntl(srv->srv_blob.server.cli_sock, F_GETFL) | O_NONBLOCK); |
| |
| if (listen(srv->srv_blob.server.cli_sock, io_arraySize(srv->srv_blob.clients)) == -1) { |
LOGERR; |
LOGERR; |
return -1; |
return -1; |
} else | } |
fcntl(srv->srv_blob.server.cli_sock, F_SETFL, | |
fcntl(srv->srv_blob.server.cli_sock, F_GETFL) | O_NONBLOCK); | |
|
|
pthread_attr_init(&attr); | if (!schedRead(srv->srv_blob.root, acceptBLOBClients, srv, |
pthread_attr_setdetachstate(&attr, PTHREAD_CREATE_DETACHED); | srv->srv_blob.server.cli_sock, NULL, 0)) { |
| rpc_SetErr(sched_GetErrno(), "%s", sched_GetError()); |
| return -1; |
| } |
|
|
pfd.fd = srv->srv_blob.server.cli_sock; | #if 0 |
pfd.events = POLLIN | POLLPRI; | |
/* main BLOB loop */ | |
while (srv->srv_blob.state != kill && srv->srv_kill != kill) { | |
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.sa_family) |
if (!c->cli_sa.sa.sa_family) |
break; |
break; |
Line 661 rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
|
Line 704 rpc_srv_loopBLOB(rpc_srv_t * __restrict srv)
|
continue; |
continue; |
} |
} |
|
|
if ((ret = poll(&pfd, 1, srv->srv_session.sess_timeout * 1000)) == -1 || |
|
pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { |
|
LOGERR; |
|
ret = 1; |
|
break; |
|
} else if (!ret) |
|
continue; |
|
|
|
c->cli_sock = accept(srv->srv_blob.server.cli_sock, &c->cli_sa.sa, &salen); |
c->cli_sock = accept(srv->srv_blob.server.cli_sock, &c->cli_sa.sa, &salen); |
if (c->cli_sock == -1) { |
if (c->cli_sock == -1) { |
LOGERR; |
LOGERR; |
continue; |
continue; |
} else |
} else |
c->cli_parent = srv; |
c->cli_parent = srv; |
|
|
/* spawn dispatch thread for BLOB client */ |
|
c->cli_kill = enable; |
|
if (pthread_create(&c->cli_tid, &attr, rpc_srv_dispatchVars, c)) { |
|
LOGERR; |
|
continue; |
|
} |
|
} |
} |
|
#endif |
|
|
srv->srv_blob.state = kill; | /* main rpc loop */ |
| schedRun(srv->srv_blob.root, &srv->srv_blob.kill); |
pthread_attr_destroy(&attr); | |
return 0; |
return 0; |
} |
} |
#endif |
|
|
|
|
|
/* |
/* |
Line 813 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
Line 840 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
rpc_SetErr(EINVAL, "Can`t destroy server because parameter is null!"); |
rpc_SetErr(EINVAL, "Can`t destroy server because parameter is null!"); |
return; |
return; |
} |
} |
|
|
|
if (!(*psrv)->srv_blob.kill) |
|
rpc_srv_endBLOBServer(*psrv); |
|
|
/* close all clients connections & server socket */ |
/* close all clients connections & server socket */ |
for (i = 0; i < io_arraySize((*psrv)->srv_clients); i++) { |
for (i = 0; i < io_arraySize((*psrv)->srv_clients); i++) { |