Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
FORMUS3IC_LAS3
/
embb
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
d9a6be5d
authored
Apr 15, 2016
by
lucapegolotti
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
containers_cpp: added tests on blocking queue + minor problems fixes in blocking container tests
parent
1c75c013
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
112 additions
and
7 deletions
+112
-7
containers_cpp/test/blocking_container_test-inl.h
+1
-1
containers_cpp/test/blocking_container_test.h
+5
-6
containers_cpp/test/blocking_queue_test-inl.h
+51
-0
containers_cpp/test/blocking_queue_test.h
+50
-0
containers_cpp/test/main.cc
+5
-0
No files found.
containers_cpp/test/blocking_container_test-inl.h
View file @
d9a6be5d
...
...
@@ -104,7 +104,7 @@ void BlockingContainerTest<Container_t>::BlockingContainerTest1_ThreadMethod() {
for
(
std
::
vector
<
int
>::
iterator
it
=
my_elements
.
begin
();
it
!=
my_elements
.
end
();
++
it
)
{
Specialize
z
dPush
(
*
it
);
SpecializedPush
(
*
it
);
}
my_elements
.
clear
();
...
...
containers_cpp/test/blocking_container_test.h
View file @
d9a6be5d
...
...
@@ -35,7 +35,7 @@ namespace containers {
namespace
test
{
template
<
typename
Container_t
>
class
BlockingContainerTest
:
public
partest
::
TestCase
{
pr
ivate
:
pr
otected
:
int
n_threads
;
int
n_iterations
;
int
n_container_elements_per_thread
;
...
...
@@ -44,6 +44,10 @@ class BlockingContainerTest : public partest::TestCase {
std
::
vector
<
int
>
expected_container_elements
;
std
::
vector
<
int
>*
thread_local_vectors
;
virtual
void
SpecializedPush
(
const
int
&
element
)
=
0
;
virtual
void
SpecializedPop
(
int
&
element
)
=
0
;
public
:
BlockingContainerTest
();
...
...
@@ -53,11 +57,6 @@ class BlockingContainerTest : public partest::TestCase {
void
BlockingContainerTest1_ThreadMethod
();
protected
:
virtual
void
SpecializedPush
(
const
int
&
element
)
=
0
;
virtual
void
SpecializedPop
(
int
&
element
)
=
0
;
};
}
// namespace test
}
// namespace containers
...
...
containers_cpp/test/blocking_queue_test-inl.h
0 → 100755
View file @
d9a6be5d
/*
* Copyright (c) 2014-2016, Siemens AG. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef CONTAINERS_CPP_TEST_BLOCKING_QUEUE_TEST_INL_H_
#define CONTAINERS_CPP_TEST_BLOCKING_QUEUE_TEST_INL_H_
#include <vector>
#include <algorithm>
namespace
embb
{
namespace
containers
{
namespace
test
{
template
<
typename
Container_t
>
void
BlockingQueueTest
<
Container_t
>::
SpecializedPush
(
const
int
&
element
){
container
.
Enqueue
(
element
);
}
template
<
typename
Container_t
>
void
BlockingQueueTest
<
Container_t
>::
SpecializedPop
(
int
&
element
){
container
.
Dequeue
(
element
);
}
}
// namespace test
}
// namespace containers
}
// namespace embb
#endif // CONTAINERS_CPP_TEST_BLOCKING_QUEUE_TEST_INL_H_
containers_cpp/test/blocking_queue_test.h
0 → 100755
View file @
d9a6be5d
/*
* Copyright (c) 2014-2016, Siemens AG. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef CONTAINERS_CPP_TEST_BLOCKING_QUEUE_TEST_H_
#define CONTAINERS_CPP_TEST_BLOCKING_QUEUE_TEST_H_
#include <vector>
#include <partest/partest.h>
#include <embb/base/duration.h>
#include <./blocking_container_test.h>
namespace
embb
{
namespace
containers
{
namespace
test
{
template
<
typename
Container_t
>
class
BlockingQueueTest
:
public
BlockingContainerTest
<
Container_t
>
{
protected
:
virtual
void
SpecializedPush
(
const
int
&
element
);
virtual
void
SpecializedPop
(
int
&
element
);
};
}
// namespace test
}
// namespace containers
}
// namespace embb
#include "./blocking_queue_test-inl.h"
#endif // CONTAINERS_CPP_TEST_BLOCKING_QUEUE_TEST_H_
containers_cpp/test/main.cc
View file @
d9a6be5d
...
...
@@ -30,6 +30,7 @@
#include <embb/containers/object_pool.h>
#include <embb/containers/lock_free_stack.h>
#include <embb/containers/lock_free_mpmc_queue.h>
#include <embb/containers/blocking_queue.h>
#include <embb/base/c/memory_allocation.h>
#include <partest/partest.h>
...
...
@@ -37,6 +38,7 @@
#include "./pool_test.h"
#include "./queue_test.h"
#include "./blocking_queue_test.h"
#include "./stack_test.h"
#include "./hazard_pointer_test.h"
#include "./object_pool_test.h"
...
...
@@ -47,12 +49,14 @@ using embb::containers::WaitFreeArrayValuePool;
using
embb
::
containers
::
LockFreeTreeValuePool
;
using
embb
::
containers
::
WaitFreeSPSCQueue
;
using
embb
::
containers
::
LockFreeMPMCQueue
;
using
embb
::
containers
::
BlockingQueue
;
using
embb
::
containers
::
LockFreeStack
;
using
embb
::
containers
::
LockFreeTreeValuePool
;
using
embb
::
containers
::
WaitFreeArrayValuePool
;
using
embb
::
containers
::
test
::
PoolTest
;
using
embb
::
containers
::
test
::
HazardPointerTest
;
using
embb
::
containers
::
test
::
QueueTest
;
using
embb
::
containers
::
test
::
BlockingQueueTest
;
using
embb
::
containers
::
test
::
StackTest
;
using
embb
::
containers
::
test
::
ObjectPoolTest
;
using
embb
::
containers
::
test
::
HazardPointerTest2
;
...
...
@@ -69,6 +73,7 @@ PT_MAIN("Data Structures C++") {
PT_RUN
(
QueueTest
<
WaitFreeSPSCQueue
<
::
std
::
pair
<
size_t
COMMA
int
>
>
>
);
PT_RUN
(
QueueTest
<
LockFreeMPMCQueue
<
::
std
::
pair
<
size_t
COMMA
int
>
>
COMMA
true
COMMA
true
>
);
PT_RUN
(
BlockingQueueTest
<
BlockingQueue
<
int
>
>
);
PT_RUN
(
StackTest
<
LockFreeStack
<
int
>
>
);
PT_RUN
(
ObjectPoolTest
<
LockFreeTreeValuePool
<
bool
COMMA
false
>
>
);
PT_RUN
(
ObjectPoolTest
<
WaitFreeArrayValuePool
<
bool
COMMA
false
>
>
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment