--- libaitrpc/inc/aitrpc.h 2012/05/16 08:10:39 1.8.2.9 +++ libaitrpc/inc/aitrpc.h 2012/05/16 09:02:47 1.8.2.10 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: aitrpc.h,v 1.8.2.9 2012/05/16 08:10:39 misho Exp $ +* $Id: aitrpc.h,v 1.8.2.10 2012/05/16 09:02:47 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -213,7 +213,9 @@ typedef struct { TAILQ_HEAD(, tagRPCFunc) srv_funcs; /* RPC functions list */ struct { - cmd_type_t state; /* BLOB server state: ==0 disable | !=0 enable */ + sched_root_task_t *root; /* BLOB server scheduler */ + intptr_t kill; /* BLOB server state: ==0 disable | !=0 enable */ + ait_val_t dir; /* BLOB states directory */ rpc_cli_t server; /* BLOB server socket */ @@ -308,13 +310,14 @@ void rpc_srv_endServer(rpc_srv_t ** __restrict psrv); */ int rpc_srv_loopServer(rpc_srv_t * __restrict srv); #define rpc_srv_execServer(_srv, _sync) do { assert((_srv)); pthread_t __tid; \ - pthread_create(&__tid, NULL, (void*(*)(void*)) \ - rpc_srv_loopServer, (_srv)); \ - if ((_sync)) \ - pthread_join(__tid, (void**) (_sync)); \ - else \ - pthread_detach(__tid); \ - } while (0) + if (!(_srv)->srv_kill) { \ + pthread_create(&__tid, NULL, (void*(*)(void*)) \ + rpc_srv_loopServer, (_srv)); \ + if ((_sync)) \ + pthread_join(__tid, (void**) (_sync)); \ + else \ + pthread_detach(__tid); \ + } } while (0) /* * rpc_srv_initBLOBServer() - Init & create BLOB Server @@ -338,13 +341,12 @@ void rpc_srv_endBLOBServer(rpc_srv_t * __restrict srv) * @srv = RPC Server instance * return: -1 error or 0 ok, infinite loop ... */ -int rpc_srv_loopBLOB(rpc_srv_t * __restrict srv); +int rpc_srv_loopBLOBServer(rpc_srv_t * __restrict srv); #define rpc_srv_execBLOBServer(_srv) do { assert((_srv)); pthread_t __tid; \ - if ((_srv)->srv_blob.state == enable) { \ + if (!(_srv)->srv_kill && !(_srv)->srv_blob.kill) { \ pthread_create(&__tid, NULL, (void*(*)(void*)) \ - rpc_srv_loopBLOB, (_srv)); \ + rpc_srv_loopBLOBServer, (_srv)); \ pthread_detach(__tid); \ - (_srv)->srv_blob.state = running; \ } \ } while (0)