xCAT/xNBA
2
0
Fork 0
mirror of https://github.com/xcat2/xNBA.git synced 2024-12-14 15:21:32 +00:00
Code Issues Projects Releases Wiki Activity

Fix bug in buffer.c, add buffer mini-unit test.

Browse Source
This commit is contained in:
Michael Brown 2007-01-11 04:46:41 +00:00
parent 83fa318b86
commit c0ef730ec4
2 changed files with 57 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/buffer.c
View File

@ -80,21 +80,21 @@ struct buffer_free_block {
* @ret block Next free block descriptor
* @ret rc Return status code
*
* Set @c block->next=buffer->free before first call to
* Set @c block->next=buffer->fill before first call to
* get_next_free_block().
*/
static int get_next_free_block ( struct buffer *buffer,
struct buffer_free_block *block ) {
/* Check for end of buffer */
if ( block->end >= buffer->len )
if ( block->next >= buffer->len )
return -ENOENT;
/* Move to next block */
block->start = block->next;
if ( block->start >= buffer->free ) {
/* Final block; no in-band descriptor */
block->end = buffer->len;
block->next = block->end = buffer->len;
} else {
/* Retrieve block descriptor */
copy_from_phys ( block, ( buffer->addr + block->start ),

54
src/tests/buffertest.c Normal file
View File

@ -0,0 +1,54 @@
#include <assert.h>
#include <gpxe/buffer.h>
struct buffer_test {
struct buffer buffer;
const char *source;
size_t source_len;
char *dest;
size_t dest_len;
};
static int test_fill_buffer ( struct buffer_test *test,
size_t start, size_t end ) {
const void *data = ( test->source + start );
size_t len = ( end - start );
assert ( end <= test->source_len );
assert ( end <= test->dest_len );
fill_buffer ( &test->buffer, data, start, len );
assert ( memcmp ( ( test->dest + start ), data, len ) == 0 );
assert ( test->buffer.free >= end );
return 0;
}
int test_buffer ( void ) {
char source[123];
char dest[123];
struct buffer_test test;
memset ( &test, 0, sizeof ( test ) );
test.source = source;
test.source_len = sizeof ( source );
test.dest = dest;
test.dest_len = sizeof ( dest );
test.buffer.addr = virt_to_phys ( dest );
test.buffer.len = sizeof ( dest );
test_fill_buffer ( &test, 20, 38 );
test_fill_buffer ( &test, 60, 61 );
test_fill_buffer ( &test, 38, 42 );
test_fill_buffer ( &test, 42, 60 );
test_fill_buffer ( &test, 16, 80 );
test_fill_buffer ( &test, 0, 16 );
test_fill_buffer ( &test, 99, 123 );
test_fill_buffer ( &test, 80, 99 );
assert ( test.buffer.fill == sizeof ( source ) );
assert ( test.buffer.free == sizeof ( source ) );
assert ( memcmp ( source, dest, sizeof ( source ) ) == 0 );
return 0;
}