version 1.7.2.2, 2012/05/16 08:18:00
|
version 1.7.2.4, 2012/05/16 13:17:51
|
Line 61 rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len
|
Line 61 rpc_srv_blobCreate(rpc_srv_t * __restrict srv, int len
|
int f; |
int f; |
u_int rnd; |
u_int rnd; |
|
|
#ifdef HAVE_SRANDOMDEV |
|
srandomdev(); |
|
#else |
|
time_t tim; |
|
|
|
srandom((time(&tim) ^ getpid())); |
|
#endif |
|
again: |
again: |
rnd = random() % UINT_MAX; |
rnd = random() % UINT_MAX; |
|
|
Line 165 rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t
|
Line 158 rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t
|
inline void |
inline void |
rpc_srv_blobUnmap(rpc_blob_t * __restrict blob) |
rpc_srv_blobUnmap(rpc_blob_t * __restrict blob) |
{ |
{ |
if (blob && blob->blob_data) | if (blob && blob->blob_data) { |
munmap(blob->blob_data, blob->blob_len); |
munmap(blob->blob_data, blob->blob_len); |
blob->blob_data = NULL; |
blob->blob_data = NULL; |
} |
} |
Line 316 rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t
|
Line 309 rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, ait_val_t
|
/* wait for reply */ |
/* wait for reply */ |
pfd.fd = cli->cli_sock; |
pfd.fd = cli->cli_sock; |
pfd.events = POLLIN | POLLPRI; |
pfd.events = POLLIN | POLLPRI; |
if ((ret = poll(&pfd, 1, ((rpc_sess_t*) cli->cli_parent)->sess_timeout * 1000)) < 1 || | if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || |
pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { |
pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { |
if (ret) |
if (ret) |
LOGERR; |
LOGERR; |
Line 397 rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t
|
Line 390 rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t
|
pfd.fd = cli->cli_sock; |
pfd.fd = cli->cli_sock; |
pfd.events = POLLIN | POLLPRI; |
pfd.events = POLLIN | POLLPRI; |
for (ret = AIT_LEN(var), pos = *data; ret > 0; ret -= len, pos += len) { |
for (ret = AIT_LEN(var), pos = *data; ret > 0; ret -= len, pos += len) { |
if ((len = poll(&pfd, 1, ((rpc_sess_t*) cli->cli_parent)->sess_timeout * 1000)) < 1 || | if ((len = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || |
pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { |
pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { |
LOGERR; |
LOGERR; |
free(*data); |
free(*data); |
Line 414 rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t
|
Line 407 rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, ait_val_t
|
} |
} |
|
|
/* wait for reply */ |
/* wait for reply */ |
if ((len = poll(&pfd, 1, ((rpc_sess_t*) cli->cli_parent)->sess_timeout * 1000)) < 1 || | if ((len = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || |
pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { |
pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { |
if (len) |
if (len) |
LOGERR; |
LOGERR; |
Line 488 rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_val_t
|
Line 481 rpc_cli_delBLOB(rpc_cli_t * __restrict cli, ait_val_t
|
/* wait for reply */ |
/* wait for reply */ |
pfd.fd = cli->cli_sock; |
pfd.fd = cli->cli_sock; |
pfd.events = POLLIN | POLLPRI; |
pfd.events = POLLIN | POLLPRI; |
if ((ret = poll(&pfd, 1, ((rpc_sess_t*) cli->cli_parent)->sess_timeout * 1000)) < 1 || | if ((ret = poll(&pfd, 1, DEF_RPC_TIMEOUT * 1000)) < 1 || |
pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { |
pfd.revents & (POLLERR | POLLHUP | POLLNVAL)) { |
if (ret) |
if (ret) |
LOGERR; |
LOGERR; |