coffee/etl
1
0
Fork 0
mirror of https://github.com/ETLCPP/etl.git synced 2026-11-09 22:59:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into development

Browse Source 
# Conflicts:
#	test/codeblocks/ETL.cbp
#	test/codeblocks/ETL.depend
#	test/test_callback_timer.cpp
#	test/test_message_timer.cpp
This commit is contained in:
John Wellbelove 2017-10-21 08:38:52 +01:00
parent cc26d5e6ba
commit 8c05843b30
5 changed files with 19 additions and 12086 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/codeblocks/ETL.cbp
View File

@ -258,11 +258,7 @@
<Unit filename="../../unittest-cpp/UnitTest++/XmlTestReporter.h" />
<Unit filename="../ExtraCheckMacros.h" />
<Unit filename="../data.h" />
<<<<<<< HEAD
<Unit filename="../etl_user.h" />
=======
<Unit filename="../etl_profile.h" />
>>>>>>> origin/feature/Timer_triggered_messages
<Unit filename="../main.cpp" />
<Unit filename="../murmurhash3.cpp" />
<Unit filename="../murmurhash3.h" />

12063
test/codeblocks/ETL.depend
View File

File diff suppressed because it is too large Load Diff

4
test/codeblocks/ETL.layout
View File

@ -22,9 +22,9 @@
<Cursor1 position="11907" topLine="330" />
</Cursor>
</File>
<File name="..\test_map.cpp" open="0" top="0" tabpos="19" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<File name="..\..\src\type_traits.h" open="0" top="0" tabpos="5" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">
<Cursor>
<Cursor1 position="6368" topLine="164" />
<Cursor1 position="12237" topLine="260" />
</Cursor>
</File>
<File name="..\test_factory.cpp" open="0" top="0" tabpos="4" split="0" active="1" splitpos="0" zoom_1="0" zoom_2="0">

2
test/test_callback_timer.cpp
View File

@ -41,7 +41,7 @@ SOFTWARE.
#include <Windows.h>
#endif
#define REALTIME_TEST 1
#define REALTIME_TEST 0
namespace
{

32
test/test_message_timer.cpp
View File

@ -42,7 +42,7 @@ SOFTWARE.
#include <Windows.h>
#endif
#define REALTIME_TEST 1
#define REALTIME_TEST 0
//***************************************************************************
// The set of messages.
@ -595,21 +595,21 @@ namespace
while (ticks < 1000U)
{
//if ((ticks > 200U) && (ticks < 500U))
//{
// controller.stop(id3);
//}
if ((ticks > 200U) && (ticks < 500U))
{
controller.stop(id3);
}
//if ((ticks > 600U) && (ticks < 800U))
//{
// controller.start(id3);
//}
if ((ticks > 600U) && (ticks < 800U))
{
controller.start(id3);
}
//if ((ticks > 500U) && restart_1)
//{
// controller.start(id1);
// restart_1 = false;
//}
if ((ticks > 500U) && restart_1)
{
controller.start(id1);
restart_1 = false;
}
std::this_thread::sleep_for(std::chrono::milliseconds(1));
}
@ -617,9 +617,9 @@ namespace
//Join the thread with the main thread
t1.join();
//CHECK_EQUAL(2U, router1.message1.size());
CHECK_EQUAL(2U, router1.message1.size());
CHECK_EQUAL(10U, router1.message2.size());
//CHECK(router1.message2.size() < 65U);
CHECK(router1.message2.size() < 65U);
}
#endif
};