Skip to content

Merge pull request #1 from gridnow/master #34

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
guotong1988 wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Merge pull request #1 from gridnow/master #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
29bf972
Merge pull request #1 from gridnow/master
guotong1988 Oct 21, 2014
febfcf5
Merge pull request #2 from gridnow/master
guotong1988 Oct 30, 2014
0ce0e7c
Revert "Test ring buffer will not passed"
guotong1988 Nov 1, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file modified build/libs/x86/elf.o
View file
Open in desktop
Binary file not shown.
35 changes: 15 additions & 20 deletions source/programs/baxi/cmd/test_ringbuff.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@ static int test_ring(int argc, char **argv)
if (!buff)
goto err;

buff = ring_buff_head_init(buff, 1024);
buff = ring_buff_head_init(buff, 2048);

printf("Allocating 3 buffers\n");
p = ring_buff_alloc(buff, 256);
if (!p)
goto err;
Expand All @@ -29,42 +28,38 @@ static int test_ring(int argc, char **argv)
p1 = ring_buff_alloc(buff, 300);
if (!p1)
goto err;
memset((void *)p1, 2, 300);
memset((void *)p1, 3, 300);

p2 = ring_buff_alloc(buff, 123);
if (!p2)
goto err;
memset((void *)p2, 3, 123);
memset((void *)p2, 1, 123);

printf("Free the first one\n");
ring_buff_free(buff, p);
p = NULL;

/* DEBUG FOR CURR HEAD INFO */
cache_package_head_info_debug(buff);

printf("Allocate again the size of first one, the address should meet\n");
p3 = ring_buff_alloc(buff, 256);
if (p != p3)
{
printf("Error in first round test p = %p, p3 = %p\n", p, p3);
goto err;
}
memset((void *)p3, 4, 256);

printf("Free the second one\n");
ring_buff_free(buff, p1);
p1 = NULL;

printf("Allocating bigger the 2nd one\n");
p = ring_buff_alloc(buff, 301);
if (p == p1)
printf("Error in p1\n");
printf("2nd p = %p, p1 = %p\n", p, p1);
if (!p3)
goto err;
memset((void *)p3, 1, 256);

cache_package_head_info_debug(buff);

ring_buff_free(buff, p2);
ring_buff_free(buff, p3);
ring_buff_free(buff, p3);
p2 = NULL;
p3 = NULL;

/* Show status */
cache_package_head_info_debug(buff);
err:
cache_package_head_info_debug(buff);
if (buff)
free(buff);

Expand Down