michaelh/zephyr
1
0
Fork 0
Code Releases Activity

Remove task_mem_pool_moveXXX() routines from test_pool project

Browse source 
The task_mem_pool_moveXXX() routines are only relevant to multi-node systems.

Signed-off-by: Peter Mitsis <peter.mitsis@windriver.com>
Change-Id: I575c32a74b158c8b9b6ac6e1baef7b0e4f988270
This commit is contained in:
Peter Mitsis 2015-04-20 15:42:27 -04:00 • committed by Anas Nashif
commit 7f5780a46c
2 changed files with 0 additions and 98 deletions
Download patch file Download diff file Expand all files Collapse all files

1
samples/microkernel/test/test_pool/README.txt
View file

@ -24,7 +24,6 @@ tc_start() - Test Microkernel Memory Pools
Testing task_mem_pool_alloc() ... Testing task_mem_pool_alloc() ...
Testing task_mem_pool_alloc_wait_timeout() ... Testing task_mem_pool_alloc_wait_timeout() ...
Testing task_mem_pool_alloc_wait() ... Testing task_mem_pool_alloc_wait() ...
Testing task_mem_pool_move[_wait[_timeout]]() ...
Testing task_mem_pool_defragment() ... Testing task_mem_pool_defragment() ...
=================================================================== ===================================================================
PASS - RegressionTask. PASS - RegressionTask.

97
samples/microkernel/test/test_pool/src/pool.c
View file

@ -36,10 +36,6 @@ This modules tests the following memory pool routines:
task_mem_pool_alloc(), task_mem_pool_alloc_wait(), task_mem_pool_alloc_wait_timeout(), task_mem_pool_alloc(), task_mem_pool_alloc_wait(), task_mem_pool_alloc_wait_timeout(),
task_mem_pool_free() task_mem_pool_free()
There is also minimal testing for task_mem_pool_move[_wait[_timeout]](). These routines are
designed to work with remote blocks; however, this module only uses local
blocks. Those routines, when used with local blocks, effectively become no-ops.
*/ */
/* includes */ /* includes */
@ -379,93 +375,6 @@ int poolBlockGetWaitTest(void)
return TC_PASS; return TC_PASS;
} }
/*******************************************************************************
*
* poolMoveBlock -
*
* RETURNS: task_mem_pool_move() return value
*/
int poolMoveBlock(struct k_block *block, kmemory_pool_t pool)
{
return task_mem_pool_move(block, pool);
}
/*******************************************************************************
*
* poolMoveBlockW -
*
* RETURNS: task_mem_pool_move_wait() return value
*/
int poolMoveBlockW(struct k_block *block, kmemory_pool_t pool)
{
return task_mem_pool_move_wait(block, pool);
}
/*******************************************************************************
*
* poolMoveBlockWT -
*
* RETURNS: task_mem_pool_move_wait_timeout() return value
*/
int poolMoveBlockWT(struct k_block *block, kmemory_pool_t pool)
{
return task_mem_pool_move_wait_timeout(block, pool, TENTH_SECOND);
}
/*******************************************************************************
*
* poolMoveBlockTests -
*
* RETURNS: TC_PASS on success, TC_FAIL on failure
*/
int poolMoveBlockTests(void)
{
struct k_block tmpBlock[3];
poolMoveBlockFunc_t func[3] = {poolMoveBlockW, poolMoveBlock,
poolMoveBlockWT};
int rv;
int i;
for (i = 0; i < 3; i++) {
rv = task_mem_pool_alloc(&blockList[i], POOL_ID, 512);
if (rv != RC_OK) {
TC_ERROR("Expected task_mem_pool_alloc() to return %d, got %d\n",
RC_OK, rv);
return TC_FAIL;
}
}
for (i = 0; i < 3; i++) {
tmpBlock[i] = blockList[i];
rv = func[i](&blockList[i], POOL_ID);
if (rv != RC_OK) {
TC_ERROR("task_mem_pool_move[_wait[_timeout]](%d) returned %d, not %d\n",
i, rv, RC_OK);
return TC_FAIL;
}
/*
* The blocks are local. As a result, the contents of each block are
* not supposed to change.
*/
if (blockCompare(&tmpBlock[i], &blockList[i]) != 0) {
TC_ERROR("Local block contents unexpectedly changed!\n");
return TC_FAIL;
}
}
for (i = 0; i < 3; i++) {
task_mem_pool_free(&blockList[i]);
}
return TC_PASS;
}
/******************************************************************************* /*******************************************************************************
* *
* DefragTask - task responsible for defragmenting the pool POOL_ID * DefragTask - task responsible for defragmenting the pool POOL_ID
@ -584,12 +493,6 @@ void RegressionTask(void)
goto doneTests; goto doneTests;
} }
TC_PRINT("Testing task_mem_pool_move[_wait[_timeout]]() ...\n");
tcRC = poolMoveBlockTests();
if (tcRC != TC_PASS) {
goto doneTests;
}
TC_PRINT("Testing task_mem_pool_defragment() ...\n"); TC_PRINT("Testing task_mem_pool_defragment() ...\n");
tcRC = poolDefragTest(); tcRC = poolDefragTest();
if (tcRC != TC_PASS) { if (tcRC != TC_PASS) {