warren/libiscsi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MEMORY further remove memory reallocations

Browse Source 
added a few tweaks to further remove the need to memory
allocation resizing by preallocating the right buffer size.

Signed-off-by: Peter Lieven <pl@kamp.de>
This commit is contained in:
Peter Lieven
2012-11-17 19:40:46 +01:00
committed by Ronnie Sahlberg
parent 30804507f9
commit 9e05aecadd
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/iscsi-command.c
+15 -9
View File
@@ -85,10 +85,11 @@ iscsi_send_data_out(struct iscsi_context *iscsi, struct iscsi_pdu *cmd_pdu,
len = iscsi->target_max_recv_data_segment_length; len = iscsi->target_max_recv_data_segment_length;
} }
pdu = iscsi_allocate_pdu_with_itt_flags(iscsi, ISCSI_PDU_DATA_OUT, pdu = iscsi_allocate_pdu_with_itt_flags_size(iscsi, ISCSI_PDU_DATA_OUT,
ISCSI_PDU_NO_PDU, ISCSI_PDU_NO_PDU,
cmd_pdu->itt, cmd_pdu->itt,
ISCSI_PDU_DELETE_WHEN_SENT|ISCSI_PDU_NO_CALLBACK); ISCSI_PDU_DELETE_WHEN_SENT|ISCSI_PDU_NO_CALLBACK,
len);
if (pdu == NULL) { if (pdu == NULL) {
iscsi_set_error(iscsi, "Out-of-memory, Failed to allocate " iscsi_set_error(iscsi, "Out-of-memory, Failed to allocate "
"scsi data out pdu."); "scsi data out pdu.");
@@ -199,8 +200,8 @@ iscsi_scsi_command_async(struct iscsi_context *iscsi, int lun,
scsi_set_task_private_ptr(task, scsi_cbdata); scsi_set_task_private_ptr(task, scsi_cbdata);
pdu = iscsi_allocate_pdu(iscsi, ISCSI_PDU_SCSI_REQUEST, pdu = iscsi_allocate_pdu_size(iscsi, ISCSI_PDU_SCSI_REQUEST,
ISCSI_PDU_SCSI_RESPONSE); ISCSI_PDU_SCSI_RESPONSE, data.size);
if (pdu == NULL) { if (pdu == NULL) {
iscsi_set_error(iscsi, "Out-of-memory, Failed to allocate " iscsi_set_error(iscsi, "Out-of-memory, Failed to allocate "
"scsi pdu."); "scsi pdu.");
@@ -451,16 +452,21 @@ iscsi_process_scsi_data_in(struct iscsi_context *iscsi, struct iscsi_pdu *pdu,
/* Dont add to reassembly buffer if we already have a user buffer */ /* Dont add to reassembly buffer if we already have a user buffer */
if (scsi_task_get_data_in_buffer(task, 0, NULL) == NULL) { if (scsi_task_get_data_in_buffer(task, 0, NULL) == NULL) {
if (iscsi_add_data(iscsi, &pdu->indata, if (task->expxferlen > dsl && pdu->indata.data == NULL) {
in->data, dsl, 0) pdu->indata.alloc_size = task->expxferlen;
!= 0) { pdu->indata.data = iscsi_malloc(iscsi, task->expxferlen);
iscsi_set_error(iscsi, "Out-of-memory: failed to add data " if (pdu->indata.data == NULL) {
iscsi_set_error(iscsi, "Out-of-memory: failed to allocate pdu indata buffer");
return -1;
}
}
if (iscsi_add_data(iscsi, &pdu->indata, in->data, dsl, 0) != 0) {
iscsi_set_error(iscsi, "Out-of-memory: failed to add data "
"to pdu in buffer."); "to pdu in buffer.");
return -1; return -1;
} }
} }
if ((flags&ISCSI_PDU_DATA_FINAL) == 0) { if ((flags&ISCSI_PDU_DATA_FINAL) == 0) {
*is_finished = 0; *is_finished = 0;
} }
lib/pdu.c
+5
View File
@@ -44,6 +44,11 @@ iscsi_allocate_pdu_with_itt_flags_size(struct iscsi_context *iscsi, enum iscsi_o
pdu->outdata.size = ISCSI_HEADER_SIZE; pdu->outdata.size = ISCSI_HEADER_SIZE;
pdu->outdata.alloc_size = 64; pdu->outdata.alloc_size = 64;
/* payload_size is limited by negotiated max_recv_data_segment_length */
if (payload_size > iscsi->target_max_recv_data_segment_length)
payload_size = iscsi->target_max_recv_data_segment_length;
while (pdu->outdata.alloc_size < ISCSI_HEADER_SIZE+payload_size) pdu->outdata.alloc_size<<=1; while (pdu->outdata.alloc_size < ISCSI_HEADER_SIZE+payload_size) pdu->outdata.alloc_size<<=1;
pdu->outdata.data = iscsi_malloc(iscsi, pdu->outdata.alloc_size); pdu->outdata.data = iscsi_malloc(iscsi, pdu->outdata.alloc_size);
memset(pdu->outdata.data, 0, ISCSI_HEADER_SIZE); memset(pdu->outdata.data, 0, ISCSI_HEADER_SIZE);