--- libaitrpc/src/blob.c 2010/07/07 15:18:22 1.1.2.10 +++ libaitrpc/src/blob.c 2010/07/08 08:02:02 1.1.2.12 @@ -71,7 +71,6 @@ inline int rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t * __restrict blob) { int f; - struct stat sb; char szFName[MAXPATHLEN]; if (!blob) { @@ -86,23 +85,17 @@ rpc_srv_blobMap(rpc_srv_t * __restrict srv, rpc_blob_t LOGERR; return -1; } - if (fstat(f, &sb) == -1) { - LOGERR; - close(f); - return -1; - } - blob->blob_data = mmap(NULL, sb.st_size, PROT_READ | PROT_WRITE, MAP_SHARED, f, 0); + blob->blob_data = mmap(NULL, blob->blob_len, PROT_READ | PROT_WRITE, MAP_SHARED, f, 0); if (blob->blob_data == MAP_FAILED) { LOGERR; close(f); blob->blob_data = NULL; return -1; } else { - blob->blob_len = sb.st_size; close(f); - madvise(blob->blob_data, sb.st_size, MADV_SEQUENTIAL); + madvise(blob->blob_data, blob->blob_len, MADV_SEQUENTIAL); } return 0; @@ -121,7 +114,6 @@ rpc_srv_blobUnmap(rpc_blob_t * __restrict blob) else { munmap(blob->blob_data, blob->blob_len); blob->blob_data = NULL; - blob->blob_len = 0; } } @@ -245,7 +237,7 @@ rpc_cli_sendBLOB(rpc_cli_t * __restrict cli, rpc_val_t memcpy(&hdr.hdr_session, cli->cli_parent, sizeof(rpc_sess_t)); hdr.hdr_cmd = set; hdr.hdr_var = 0; - hdr.hdr_seq = 0; + hdr.hdr_ret = 0; hdr.hdr_len = var->val_len; if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { LOGERR; @@ -315,7 +307,7 @@ rpc_cli_recvBLOB(rpc_cli_t * __restrict cli, rpc_val_t memcpy(&hdr.hdr_session, cli->cli_parent, sizeof(rpc_sess_t)); hdr.hdr_cmd = get; hdr.hdr_var = (uint32_t) RPC_GET_BLOB(var); - hdr.hdr_seq = 0; + hdr.hdr_ret = 0; hdr.hdr_len = 0; if (send(cli->cli_sock, &hdr, sizeof hdr, 0) == -1) { LOGERR;