Skip to content
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

Jump to bottom

ci: Make more robust timer_test #3953

Merged
merged 1 commit into from
Aug 21, 2023
Merged

ci: Make more robust timer_test #3953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions src/include/OpenImageIO/unittest.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,18 @@ static OIIO::pvt::UnitTestFailureCounter unit_test_failures;
<< ", diff was " << std::abs((x) - (y)) << "\n"), \
(void)++unit_test_failures))

#define OIIO_CHECK_EQUAL_THRESH_REL(x, y, epsabs, epsrel) \
((std::abs((x) - (y)) <= (epsabs + epsrel * std::max(abs(x), abs(y)))) \
? ((void)0) \
: ((std::cout << OIIO::Sysutil::Term(std::cout).ansi("red,bold") \
<< __FILE__ << ":" << __LINE__ << ":\n" \
<< "FAILED: " \
<< OIIO::Sysutil::Term(std::cout).ansi("normal") << #x \
<< " == " << #y << "\n" \
<< "\tvalues were '" << (x) << "' and '" << (y) << "'" \
<< ", diff was " << std::abs((x) - (y)) << "\n"), \
(void)++unit_test_failures))

#define OIIO_CHECK_EQUAL_APPROX(x, y) \
(OIIO::pvt::equal_approx(x, y) \
? ((void)0) \
Expand Down
35 changes: 18 additions & 17 deletions src/libutil/timer_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ main(int argc, char** argv)

const int interval = 100000; // 1/10 sec
double eps = 0.01; // slop we allow in our timings
double epsrel = 0.1; // Allow an additional 10% relative error
#ifdef __APPLE__
eps = 0.03;
// On some Apple OSX systems (especially >= 10.10 Yosemite), a feature
Expand All @@ -79,41 +80,41 @@ main(int argc, char** argv)
Timer all(Timer::StartNow);
Timer selective(Timer::DontStartNow);
Sysutil::usleep(interval);
OIIO_CHECK_EQUAL_THRESH(selective(), 0.0, eps);
OIIO_CHECK_EQUAL_THRESH(all(), 0.1, eps);
OIIO_CHECK_EQUAL_THRESH_REL(selective(), 0.0, eps, epsrel);
OIIO_CHECK_EQUAL_THRESH_REL(all(), 0.1, eps, epsrel);

// Make sure start/stop work
selective.start();
Sysutil::usleep(interval);
OIIO_CHECK_EQUAL_THRESH(selective(), 0.1, eps);
OIIO_CHECK_EQUAL_THRESH(all(), 0.2, eps);
OIIO_CHECK_EQUAL_THRESH_REL(selective(), 0.1, eps, epsrel);
OIIO_CHECK_EQUAL_THRESH_REL(all(), 0.2, eps, epsrel);
selective.stop();
Sysutil::usleep(interval);
OIIO_CHECK_EQUAL_THRESH(selective(), 0.1, eps);
OIIO_CHECK_EQUAL_THRESH(all(), 0.3, eps);
OIIO_CHECK_EQUAL_THRESH_REL(selective(), 0.1, eps, epsrel);
OIIO_CHECK_EQUAL_THRESH_REL(all(), 0.3, eps, epsrel);
std::cout << "Checkpoint: All " << all() << " selective " << selective()
<< "\n";

// Test reset() -- should set selective to 0 and turn it off
selective.reset();
Sysutil::usleep(interval);
OIIO_CHECK_EQUAL_THRESH(selective(), 0.0, eps);
OIIO_CHECK_EQUAL_THRESH(all(), 0.4, eps);
OIIO_CHECK_EQUAL_THRESH_REL(selective(), 0.0, eps, epsrel);
OIIO_CHECK_EQUAL_THRESH_REL(all(), 0.4, eps, epsrel);
selective.start();
Sysutil::usleep(interval);
OIIO_CHECK_EQUAL_THRESH(selective(), 0.1, eps);
OIIO_CHECK_EQUAL_THRESH(all(), 0.5, eps);
OIIO_CHECK_EQUAL_THRESH_REL(selective(), 0.1, eps, epsrel);
OIIO_CHECK_EQUAL_THRESH_REL(all(), 0.5, eps, epsrel);

// Test lap()
double lap = selective.lap(); // lap=.1, select.time_since_start
OIIO_CHECK_EQUAL_THRESH(lap, 0.1, eps);
OIIO_CHECK_EQUAL_THRESH(selective(), 0.1, eps);
OIIO_CHECK_EQUAL_THRESH(selective.time_since_start(), 0.0, eps);
OIIO_CHECK_EQUAL_THRESH(all(), 0.5, eps);
OIIO_CHECK_EQUAL_THRESH_REL(lap, 0.1, eps, epsrel);
OIIO_CHECK_EQUAL_THRESH_REL(selective(), 0.1, eps, epsrel);
OIIO_CHECK_EQUAL_THRESH_REL(selective.time_since_start(), 0.0, eps, epsrel);
OIIO_CHECK_EQUAL_THRESH_REL(all(), 0.5, eps, epsrel);
Sysutil::usleep(interval);
OIIO_CHECK_EQUAL_THRESH(selective(), 0.2, eps);
OIIO_CHECK_EQUAL_THRESH(selective.time_since_start(), 0.1, eps);
OIIO_CHECK_EQUAL_THRESH(all(), 0.6, eps);
OIIO_CHECK_EQUAL_THRESH_REL(selective(), 0.2, eps, epsrel);
OIIO_CHECK_EQUAL_THRESH_REL(selective.time_since_start(), 0.1, eps, epsrel);
OIIO_CHECK_EQUAL_THRESH_REL(all(), 0.6, eps, epsrel);
std::cout << "Checkpoint2: All " << all() << " selective " << selective()
<< "\n";

Expand Down
Loading