luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Attempt to make thread test more reproducible.

This commit is contained in:
Matthias Koefferlein 2018-06-24 15:16:49 +02:00
parent 5322b48193
commit edbe0b2542
1 changed files with 33 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

70
src/tl/unit_tests/tlThreadedWorkers.cc
View File

@ -341,52 +341,48 @@ TEST(12)
EXPECT_EQ (s_sum[0].sum () + s_sum[1].sum() + s_sum[2].sum() + s_sum[3].sum() < 10000000, true);
}
TEST(13)
void run_thread_tests (tl::TestBase *_this, int wait)
{
MyJob job (4);
int tries = 4;
bool stopped_in_action = false;
s_sum[0].reset ();
s_sum[1].reset ();
s_sum[2].reset ();
s_sum[3].reset ();
for (int i = 0; i < tries && !stopped_in_action; ++i) {
MyJob job (4);
s_sum[0].reset ();
s_sum[1].reset ();
s_sum[2].reset ();
s_sum[3].reset ();
for (int i = 0; i < 10000; ++i) {
job.schedule (new MyTask (10000));
}
job.start ();
usleep (wait);
job.terminate ();
EXPECT_EQ (job.is_running (), false);
EXPECT_EQ (s_sum[0].sum () + s_sum[1].sum() + s_sum[2].sum() + s_sum[3].sum() < 400000000, true);
// at least one must be stopped in the perform task - as this is not always the case,
// we retry a few times.
stopped_in_action = (s_sum[0].sum () % 10000) + (s_sum[1].sum () % 10000) + (s_sum[2].sum () % 10000) + (s_sum[3].sum () % 10000) > 0;
for (int i = 0; i < 10000; ++i) {
job.schedule (new MyTask (1000));
}
job.start ();
usleep (20000);
job.terminate ();
EXPECT_EQ (job.is_running (), false);
// at least one must be stopped in the perform task ...
EXPECT_EQ ((s_sum[0].sum () % 1000) + (s_sum[1].sum () % 1000) + (s_sum[2].sum () % 1000) + (s_sum[3].sum () % 1000) > 0, true);
EXPECT_EQ (s_sum[0].sum () + s_sum[1].sum() + s_sum[2].sum() + s_sum[3].sum() < 10000000, true);
EXPECT_EQ (stopped_in_action, true);
}
TEST(14)
TEST(13)
{
MyJob job (4);
run_thread_tests (_this, 20000);
}
s_sum[0].reset ();
s_sum[1].reset ();
s_sum[2].reset ();
s_sum[3].reset ();
for (int i = 0; i < 10000; ++i) {
job.schedule (new MyTask (1000));
}
job.start ();
usleep (200000);
job.stop ();
EXPECT_EQ (job.is_running (), false);
// at least one must be stopped in the perform task ...
EXPECT_EQ (s_sum[0].sum () + s_sum[1].sum() + s_sum[2].sum() + s_sum[3].sum() < 10000000, true);
EXPECT_EQ ((s_sum[0].sum () % 1000) + (s_sum[1].sum () % 1000) + (s_sum[2].sum () % 1000) + (s_sum[3].sum () % 1000) > 0, true);
TEST(14)
{
run_thread_tests (_this, 200000);
}
TEST(20)