version 1.16.2.3, 2013/07/15 14:54:40
|
version 1.16.2.7, 2013/07/16 12:53:54
|
Line 629 rxBLOB(sched_task_t *task)
|
Line 629 rxBLOB(sched_task_t *task)
|
break; |
break; |
case set: |
case set: |
if ((b = rpc_srv_registerBLOB(s, ntohl(blob.hdr_len), |
if ((b = rpc_srv_registerBLOB(s, ntohl(blob.hdr_len), |
ntohl(blob.hdr_ret), task))) { | ntohl(blob.hdr_ret)))) { |
/* set new BLOB variable for reply :) */ |
/* set new BLOB variable for reply :) */ |
blob.hdr_var = htonl(b->blob_var); |
blob.hdr_var = htonl(b->blob_var); |
|
|
Line 646 rxBLOB(sched_task_t *task)
|
Line 646 rxBLOB(sched_task_t *task)
|
blob.hdr_cmd = error; |
blob.hdr_cmd = error; |
blob.hdr_ret = RPC_ERROR(-1); |
blob.hdr_ret = RPC_ERROR(-1); |
} |
} |
|
|
schedCancelby(TASK_ROOT(task), taskTIMER, CRITERIA_DATA, |
|
(void*) (intptr_t) ntohl(blob.hdr_var), NULL); |
|
break; |
break; |
default: |
default: |
rpc_SetErr(EPROCUNAVAIL, "Unsupported BLOB command %d", blob.hdr_cmd); |
rpc_SetErr(EPROCUNAVAIL, "Unsupported BLOB command %d", blob.hdr_cmd); |
Line 664 end:
|
Line 661 end:
|
} |
} |
|
|
static void * |
static void * |
|
flushBLOB(sched_task_t *task) |
|
{ |
|
rpc_srv_t *srv = TASK_ARG(task); |
|
rpc_blob_t *b, *tmp; |
|
|
|
TAILQ_FOREACH_SAFE(b, &srv->srv_blob.blobs, blob_node, tmp) { |
|
TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node); |
|
|
|
rpc_srv_blobFree(srv, b); |
|
e_free(b); |
|
} |
|
|
|
schedSignalSelf(task); |
|
return NULL; |
|
} |
|
|
|
static void * |
acceptBLOBClients(sched_task_t *task) |
acceptBLOBClients(sched_task_t *task) |
{ |
{ |
rpc_srv_t *srv = TASK_ARG(task); |
rpc_srv_t *srv = TASK_ARG(task); |
Line 837 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
Line 851 rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv)
|
return; |
return; |
|
|
srv->srv_blob.kill = 1; |
srv->srv_blob.kill = 1; |
|
|
|
schedEnd(&srv->srv_blob.root); |
} |
} |
|
|
/* |
/* |
Line 863 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
Line 879 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
return -1; |
return -1; |
} |
} |
|
|
|
schedSignal(srv->srv_blob.root, flushBLOB, srv, SIGFBLOB, NULL, 0); |
if (!schedRead(srv->srv_blob.root, acceptBLOBClients, srv, |
if (!schedRead(srv->srv_blob.root, acceptBLOBClients, srv, |
srv->srv_blob.server.cli_sock, NULL, 0)) { |
srv->srv_blob.server.cli_sock, NULL, 0)) { |
rpc_SetErr(sched_GetErrno(), "%s", sched_GetError()); |
rpc_SetErr(sched_GetErrno(), "%s", sched_GetError()); |
Line 873 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
Line 890 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
/* main rpc loop */ |
/* main rpc loop */ |
schedRun(srv->srv_blob.root, &srv->srv_blob.kill); |
schedRun(srv->srv_blob.root, &srv->srv_blob.kill); |
|
|
|
/* detach blobs */ |
|
TAILQ_FOREACH_SAFE(b, &srv->srv_blob.blobs, blob_node, tmp) { |
|
TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node); |
|
|
|
rpc_srv_blobFree(srv, b); |
|
e_free(b); |
|
} |
|
|
/* close all clients connections & server socket */ |
/* close all clients connections & server socket */ |
for (i = 0; i < array_Size(srv->srv_blob.clients); i++) { |
for (i = 0; i < array_Size(srv->srv_blob.clients); i++) { |
c = array(srv->srv_blob.clients, i, rpc_cli_t*); |
c = array(srv->srv_blob.clients, i, rpc_cli_t*); |
Line 889 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
Line 914 rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv)
|
|
|
close(srv->srv_blob.server.cli_sock); |
close(srv->srv_blob.server.cli_sock); |
|
|
/* detach blobs */ |
|
TAILQ_FOREACH_SAFE(b, &srv->srv_blob.blobs, blob_node, tmp) { |
|
TAILQ_REMOVE(&srv->srv_blob.blobs, b, blob_node); |
|
|
|
rpc_srv_blobFree(srv, b); |
|
e_free(b); |
|
} |
|
|
|
schedEnd(&srv->srv_blob.root); |
|
AIT_FREE_VAL(&srv->srv_blob.dir); |
AIT_FREE_VAL(&srv->srv_blob.dir); |
return 0; |
return 0; |
} |
} |
Line 1040 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
Line 1056 rpc_srv_endServer(rpc_srv_t ** __restrict psrv)
|
return; |
return; |
|
|
/* if send kill to blob server */ |
/* if send kill to blob server */ |
if (!(*psrv)->srv_blob.kill) | rpc_srv_endBLOBServer(*psrv); |
rpc_srv_endBLOBServer(*psrv); | |
|
|
(*psrv)->srv_kill = 1; |
(*psrv)->srv_kill = 1; |
sleep(RPC_SCHED_POLLING); |
sleep(RPC_SCHED_POLLING); |
|
|
|
schedEnd(&(*psrv)->srv_root); |
|
|
pthread_mutex_destroy(&(*psrv)->srv_funcs.mtx); |
pthread_mutex_destroy(&(*psrv)->srv_funcs.mtx); |
e_free(*psrv); |
e_free(*psrv); |
*psrv = NULL; |
*psrv = NULL; |
Line 1114 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
|
Line 1131 rpc_srv_loopServer(rpc_srv_t * __restrict srv)
|
srv->srv_funcs.avlh_root = NULL; |
srv->srv_funcs.avlh_root = NULL; |
RPC_FUNCS_UNLOCK(&srv->srv_funcs); |
RPC_FUNCS_UNLOCK(&srv->srv_funcs); |
|
|
schedEnd(&srv->srv_root); |
|
return 0; |
return 0; |
} |
} |
|
|