--- libaitrpc/src/blob.c 2012/03/29 01:23:59 1.5.2.1 +++ libaitrpc/src/blob.c 2015/07/02 17:52:53 1.16.4.1 @@ -3,7 +3,7 @@ * by Michael Pounov * * $Author: misho $ -* $Id: blob.c,v 1.5.2.1 2012/03/29 01:23:59 misho Exp $ +* $Id: blob.c,v 1.16.4.1 2015/07/02 17:52:53 misho Exp $ * ************************************************************************** The ELWIX and AITNET software is distributed under the following @@ -12,7 +12,7 @@ terms: All of the documentation and software included in the ELWIX and AITNET Releases is copyrighted by ELWIX - Sofia/Bulgaria -Copyright 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012 +Copyright 2004 - 2015 by Michael Pounov . All rights reserved. Redistribution and use in source and binary forms, with or without @@ -46,33 +46,37 @@ SUCH DAMAGE. #include "global.h" +static void * +toutBLOB(sched_task_t *task) +{ + rpc_srv_unregisterBLOB(TASK_DATA(task), ((rpc_blob_t*) TASK_ARG(task))->blob_var); + + return NULL; +} + + /* - * rpc_srv_blobCreate() - Create map blob to memory region and return object + * rpc_srv_blobCreate() - Create and map blob to memory region and return object * * @srv = RPC Server instance * @len = BLOB length object + * @tout = BLOB live timeout in seconds * return: NULL error or !=NULL allocated BLOB object */ -inline rpc_blob_t * -rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len) +rpc_blob_t * +rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len, int tout) { rpc_blob_t *blob = NULL; char szFName[MAXPATHLEN]; int f; u_int rnd; + struct timespec ts = { tout ? tout : DEF_RPC_BLOB_TIMEOUT, 0 }; -#ifdef HAVE_SRANDOMDEV - srandomdev(); -#else - time_t tim; - - srandom((time(&tim) ^ getpid())); -#endif again: rnd = random() % UINT_MAX; memset(szFName, 0, sizeof szFName); - snprintf(szFName, sizeof szFName, BLOB_FILE, AIT_GET_STR(&srv->srv_blob.dir), rnd); + snprintf(szFName, sizeof szFName, BLOB_FILE, AIT_GET_STRZ(&srv->srv_blob.dir), rnd); f = open(szFName, O_CREAT | O_EXCL | O_RDWR, 0600); if (f == -1) { if (errno == EEXIST) @@ -81,15 +85,14 @@ again: LOGERR; return NULL; } - if (lseek(f, len - 1, SEEK_SET) == -1) { + if (ftruncate(f, len) == -1) { LOGERR; close(f); unlink(szFName); return NULL; - } else - write(f, "", 1); + } - blob = malloc(sizeof(rpc_blob_t)); + blob = e_malloc(sizeof(rpc_blob_t)); if (!blob) { LOGERR; close(f); @@ -100,15 +103,20 @@ again: blob->blob_data = mmap(NULL, len, PROT_READ | PROT_WRITE, MAP_SHARED, f, 0); if (blob->blob_data == MAP_FAILED) { LOGERR; - free(blob); + e_free(blob); close(f); unlink(szFName); return NULL; - } else + } else { close(f); + madvise(blob->blob_data, len, MADV_SEQUENTIAL); + } + blob->blob_len = len; blob->blob_var = rnd; + + schedTimer(srv->srv_blob.root, toutBLOB, blob, ts, srv, 0); return blob; } @@ -119,7 +127,7 @@ again: * @blob = Map to this BLOB element * return: -1 error or 0 ok */ -inline int +int rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t * __restrict blob) { int f; @@ -135,7 +143,7 @@ rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t } memset(szFName, 0, sizeof szFName); - snprintf(szFName, sizeof szFName, BLOB_FILE, AIT_GET_STR(&srv->srv_blob.dir), blob->blob_var); + snprintf(szFName, sizeof szFName, BLOB_FILE, AIT_GET_STRZ(&srv->srv_blob.dir), blob->blob_var); f = open(szFName, O_RDWR); if (f == -1) { LOGERR; @@ -163,12 +171,10 @@ rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t * @blob = Mapped BLOB element * return: none */ -inline void +void rpc_srv_blobUnmap(rpc_blob_t * __restrict blob) { - if (!blob || !blob->blob_data) - rpc_SetErr(EINVAL, "Invalid arguments"); - else { + if (blob && blob->blob_data) { munmap(blob->blob_data, blob->blob_len); blob->blob_data = NULL; } @@ -181,7 +187,7 @@ rpc_srv_blobUnmap(rpc_blob_t * __restrict blob) * @blob = Mapped BLOB element * return: -1 error or 0 ok */ -inline int +int rpc_srv_blobFree(rpc_srv_t * __restrict srv, rpc_blob_t * __restrict blob) { char szFName[MAXPATHLEN]; @@ -189,13 +195,13 @@ rpc_srv_blobFree(rpc_srv_t * __restrict srv, rpc_blob_ if (!blob) { rpc_SetErr(EINVAL, "Invalid argument BLOB"); return -1; - } - - if (blob->blob_data) + } else rpc_srv_blobUnmap(blob); + schedCancelby(srv->srv_blob.root, taskTIMER, CRITERIA_ARG, blob, NULL); + memset(szFName, 0, sizeof szFName); - snprintf(szFName, sizeof szFName, BLOB_FILE, AIT_GET_STR(&srv->srv_blob.dir), blob->blob_var); + snprintf(szFName, sizeof szFName, BLOB_FILE, AIT_GET_STRZ(&srv->srv_blob.dir), blob->blob_var); if (unlink(szFName) == -1) { LOGERR; return -1; @@ -204,7 +210,7 @@ rpc_srv_blobFree(rpc_srv_t * __restrict srv, rpc_blob_ return 0; } -// ------------------------------------------------------------ +/* ------------------------------------------------------------ */ /* * rpc_srv_sendBLOB() - Send mapped BLOB to client @@ -225,7 +231,7 @@ rpc_srv_sendBLOB(rpc_cli_t * __restrict cli, rpc_blob_ } for (ret = blob->blob_len, pos = blob->blob_data; ret > 0; ret -= len, pos += len) { - len = send(cli->cli_sock, pos, ret, 0); + len = send(cli->cli_sock, pos, ret, MSG_NOSIGNAL); if (len == -1) { LOGERR; return -1; @@ -247,21 +253,22 @@ rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_ { int ret, len; uint8_t *pos; - fd_set fds; - struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; + struct pollfd pfd; if (!cli || !blob || !blob->blob_data) { rpc_SetErr(EINVAL, "Invalid arguments"); return -1; - } else - tv.tv_sec = ((rpc_sess_t*) cli->cli_parent)->sess_timeout; + } + pfd.fd = cli->cli_sock; + pfd.events = POLLIN | POLLPRI; for (ret = blob->blob_len, pos = blob->blob_data; ret > 0; ret -= len, pos += len) { - FD_ZERO(&fds); - FD_SET(cli->cli_sock, &fds); - len = select(cli->cli_sock + 1, &fds, NULL, NULL, &tv); - if (len < 1) { - LOGERR; + if ((len = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || + pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { + if (len) + LOGERR; + else + rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not respond"); return -1; } @@ -271,278 +278,6 @@ rpc_srv_recvBLOB(rpc_cli_t * __restrict cli, rpc_blob_ return -1; } } - - return ret; -} - -// ------------------------------------------------------------ - -/* - * rpc_cli_sendBLOB() - Send BLOB to server - * - * @cli = Client instance - * @var = BLOB variable - * @data = BLOB data - * return: -1 error, 0 ok, 1 remote error - */ -int -rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t * __restrict var, void * __restrict data) -{ - int ret, len; - uint8_t *pos; - struct tagBLOBHdr hdr; - fd_set fds; - struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; - - if (!cli || !var || !data) { - rpc_SetErr(EINVAL, "Invalid arguments"); - return -1; - } else - tv.tv_sec = ((rpc_sess_t*) cli->cli_parent)->sess_timeout; - - rpc_addPktSession(&hdr.hdr_session, cli->cli_parent); - hdr.hdr_cmd = set; - hdr.hdr_var = 0; - hdr.hdr_ret = 0; - hdr.hdr_len = htonl(AIT_LEN(var)); - /* calculate CRC */ - hdr.hdr_crc ^= hdr.hdr_crc; - hdr.hdr_crc = htons(crcFletcher16((u_short*) &hdr, sizeof hdr / 2)); - - /* send SET request */ - if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { - LOGERR; - return -1; - } - - /* send BLOB to server */ - for (ret = AIT_LEN(var), pos = data; ret > 0; ret -= len, pos += len) - if ((len = send(cli->cli_sock, pos, ret, 0)) == -1) { - LOGERR; - return -1; - } - - /* wait for reply */ - FD_ZERO(&fds); - FD_SET(cli->cli_sock, &fds); - switch (select(cli->cli_sock + 1, &fds, NULL, NULL, &tv)) { - case -1: - LOGERR; - return 1; - case 0: - rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not responde"); - return 1; - } - if (recv(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { - LOGERR; - return 1; - } - /* check CRC */ - ret = ntohs(hdr.hdr_crc); - hdr.hdr_crc ^= hdr.hdr_crc; - if (ret != crcFletcher16((u_short*) &hdr, sizeof hdr / 2)) { - rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet"); - return 1; - } - - if (hdr.hdr_cmd != error) { - if (ntohl(hdr.hdr_len) != AIT_LEN(var)) { - rpc_SetErr(ECANCELED, "Bad return length packet"); - return 1; - } - - var->val.blob = ntohl(hdr.hdr_var); - } - - return hdr.hdr_cmd == error; -} - -/* - * rpc_cli_recvBLOB() - Receive BLOB from server - * - * @cli = Client instance - * @var = BLOB variable - * @data = BLOB data, must be free after use! - * return: -1 error, 0 ok, 1 remote error - */ -int -rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t * __restrict var, void ** __restrict data) -{ - int ret, len; - uint8_t *pos; - fd_set fds; - struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; - struct tagBLOBHdr hdr; - - if (!cli || !var || !data) { - rpc_SetErr(EINVAL, "Invalid arguments"); - return -1; - } else - tv.tv_sec = ((rpc_sess_t*) cli->cli_parent)->sess_timeout; - - *data = malloc(AIT_LEN(var)); - if (!*data) { - LOGERR; - return -1; - } else - memset(*data, 0, AIT_LEN(var)); - - rpc_addPktSession(&hdr.hdr_session, cli->cli_parent); - hdr.hdr_cmd = get; - hdr.hdr_var = htonl((uint32_t) AIT_GET_BLOB(var)); - hdr.hdr_ret = 0; - hdr.hdr_len = 0; - /* calculate CRC */ - hdr.hdr_crc ^= hdr.hdr_crc; - hdr.hdr_crc = htons(crcFletcher16((u_short*) &hdr, sizeof hdr / 2)); - - /* send GET request */ - if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { - LOGERR; - free(*data); - *data = NULL; - return -1; - } - - /* receive BLOB from server */ - for (ret = AIT_LEN(var), pos = *data; ret > 0; ret -= len, pos += len) { - FD_ZERO(&fds); - FD_SET(cli->cli_sock, &fds); - len = select(cli->cli_sock + 1, &fds, NULL, NULL, &tv); - if (len < 1) { - LOGERR; - free(*data); - *data = NULL; - return -1; - } - - if ((len = recv(cli->cli_sock, pos, ret, 0)) == -1) { - LOGERR; - free(*data); - *data = NULL; - return -1; - } - } - - /* wait for reply */ - FD_ZERO(&fds); - FD_SET(cli->cli_sock, &fds); - switch (select(cli->cli_sock + 1, &fds, NULL, NULL, &tv)) { - case -1: - LOGERR; - free(*data); - *data = NULL; - return 1; - case 0: - rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not responde"); - free(*data); - *data = NULL; - return 1; - } - if (recv(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { - LOGERR; - free(*data); - *data = NULL; - return 1; - } - /* check CRC */ - ret = ntohs(hdr.hdr_crc); - hdr.hdr_crc ^= hdr.hdr_crc; - if (ret != crcFletcher16((u_short*) &hdr, sizeof hdr / 2)) { - rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet"); - free(*data); - *data = NULL; - return 1; - } - if (hdr.hdr_cmd != error) { - if (ntohl(hdr.hdr_len) != AIT_LEN(var)) { - rpc_SetErr(ECANCELED, "Bad return length packet"); - free(*data); - *data = NULL; - return 1; - } - } - - return hdr.hdr_cmd == error; -} - -/* - * rpc_cli_delBLOB() - Delete BLOB from server - * - * @cli = Client instance - * @var = BLOB variable - * return: -1 error, 0 ok, 1 remote error - */ -int -rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_val_t * __restrict var) -{ - struct tagBLOBHdr hdr; - fd_set fds; - struct timeval tv = { DEF_RPC_TIMEOUT, 0 }; - int ret; - - if (!cli || !var) { - rpc_SetErr(EINVAL, "Invalid arguments"); - return -1; - } else - tv.tv_sec = ((rpc_sess_t*) cli->cli_parent)->sess_timeout; - - rpc_addPktSession(&hdr.hdr_session, cli->cli_parent); - hdr.hdr_cmd = unset; - hdr.hdr_var = htonl((uint32_t) AIT_GET_BLOB(var)); - hdr.hdr_ret = 0; - hdr.hdr_len = 0; - /* calculate CRC */ - hdr.hdr_crc ^= hdr.hdr_crc; - hdr.hdr_crc = htons(crcFletcher16((u_short*) &hdr, sizeof hdr / 2)); - - /* send UNSET request */ - if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { - LOGERR; - return -1; - } - - /* wait for reply */ - FD_ZERO(&fds); - FD_SET(cli->cli_sock, &fds); - switch (select(cli->cli_sock + 1, &fds, NULL, NULL, &tv)) { - case -1: - LOGERR; - return 1; - case 0: - rpc_SetErr(ETIMEDOUT, "Timeout reached! Server not responde"); - return 1; - } - if (recv(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { - LOGERR; - return 1; - } - /* check CRC */ - ret = ntohs(hdr.hdr_crc); - hdr.hdr_crc ^= hdr.hdr_crc; - if (ret != crcFletcher16((u_short*) &hdr, sizeof hdr / 2)) { - rpc_SetErr(ERPCMISMATCH, "Bad CRC BLOB packet"); - return 1; - } - - return hdr.hdr_cmd == error; -} - -/* - * rpc_cli_getBLOB() - Receive BLOB from server and Delete after that - * - * @cli = Client instance - * @var = BLOB variable - * @data = BLOB data, must be free after use! - * return: -1 error, 0 ok, 1 remote error - */ -inline int -rpc_cli_getBLOB(rpc_cli_t * __restrict cli, ait_val_t * __restrict var, void ** __restrict data) -{ - int ret; - - ret = rpc_cli_recvBLOB(cli, var, data); - ret |= rpc_cli_delBLOB(cli, var) > 0 ? 2 : 0; return ret; }