Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed allocate_cbuf_mem() after Ingo's hints. The CBUF_FLAG_CHAIN_HEAD flag is

Browse Source 
now no longer set in the loop, the total_length calculation should now be correct.
The CBUF_FLAG_CHAIN_TAIL is now set for the lastBuffer instead of buffer.
Removed some superfluous lines in cbuf_get_ptr(), and cbuf_ones_cksum16().
Fixed the buffer->length calculation in cbuf_truncate_tail() and added some
comments about the correctness of the code - should be investigated and fixed.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@4083 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2003-07-26 13:58:20 +00:00
parent 010b9fa36b
commit 1baf26bc47
1 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/kernel/core/cbuf.c
View File

@ -135,25 +135,26 @@ allocate_cbuf_mem(size_t size)
// dprintf("allocate_cbuf_mem: returned %d of memory, %d left\n", found_size, size); // dprintf("allocate_cbuf_mem: returned %d of memory, %d left\n", found_size, size);
buffer = (cbuf *)_buffer; buffer = (cbuf *)_buffer;
if (!headBuffer) if (headBuffer == NULL) {
headBuffer = buffer; headBuffer = buffer;
headBuffer->flags |= CBUF_FLAG_CHAIN_HEAD;
}
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
initialize_cbuf(buffer); initialize_cbuf(buffer);
if (lastBuffer) if (lastBuffer)
lastBuffer->next = buffer; lastBuffer->next = buffer;
if (buffer == headBuffer) { if (headBuffer)
buffer->flags |= CBUF_FLAG_CHAIN_HEAD; buffer->total_length += buffer->length;
buffer->total_length = (size / CBUF_LENGTH) * sizeof(buffer->dat);
}
lastBuffer = buffer; lastBuffer = buffer;
buffer++; buffer++;
} }
} }
if (buffer) { if (lastBuffer) {
buffer->next = NULL; lastBuffer->next = NULL;
buffer->flags |= CBUF_FLAG_CHAIN_TAIL; lastBuffer->flags |= CBUF_FLAG_CHAIN_TAIL;
} }
return headBuffer; return headBuffer;
@ -722,9 +723,6 @@ cbuf_get_ptr(cbuf *buffer, size_t offset)
if (buffer->length > offset) if (buffer->length > offset)
return (void *)((int)buffer->data + offset); return (void *)((int)buffer->data + offset);
if (buffer->length > offset)
return NULL;
offset -= buffer->length; offset -= buffer->length;
buffer = buffer->next; buffer = buffer->next;
} }
@ -766,9 +764,6 @@ cbuf_ones_cksum16(cbuf *buffer, size_t offset, size_t length)
if (buffer->length > offset) if (buffer->length > offset)
break; break;
if (buffer->length > offset)
return 0;
offset -= buffer->length; offset -= buffer->length;
buffer = buffer->next; buffer = buffer->next;
} }
@ -840,6 +835,7 @@ cbuf_truncate_tail(cbuf *buffer, size_t truncBytes)
return B_BAD_VALUE; return B_BAD_VALUE;
offset = buffer->total_length - truncBytes; offset = buffer->total_length - truncBytes;
// ToDo: what happens if truncBytes >= total_length??
bufferOffset = 0; bufferOffset = 0;
while (buffer && offset > 0) { while (buffer && offset > 0) {
if (offset < buffer->length) { if (offset < buffer->length) {
@ -854,14 +850,15 @@ cbuf_truncate_tail(cbuf *buffer, size_t truncBytes)
return B_ERROR; return B_ERROR;
head->total_length -= buffer->length - bufferOffset; head->total_length -= buffer->length - bufferOffset;
buffer->length -= buffer->length - bufferOffset; buffer->length -= bufferOffset;
// ToDo: is this correct?
// Isn't bufferOffset the part that has to stay in the buffer?
// can't we just have head->total_length -= truncBytes?
// clear out the rest of the buffers in this chain // clear out the rest of the buffers in this chain
buffer = buffer->next; while ((buffer = buffer->next) != NULL) {
while (buffer) {
head->total_length -= buffer->length; head->total_length -= buffer->length;
buffer->length = 0; buffer->length = 0;
buffer = buffer->next;
} }
return B_OK; return B_OK;