diff options
| author | clairexen <claire@symbioticeda.com> | 2020-06-25 18:18:09 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-25 18:18:09 +0200 |
| commit | 21209d632e62983d008e121c6ffcf2815d2ae4d8 (patch) | |
| tree | edf8e293dd468d7625f4da2cf868e7385fd91879 /kernel | |
| parent | fb6441731a03f8156821bdcfa6e08542951ac3f1 (diff) | |
| parent | 28c2dd470b085f0be83ce1c55a687638bb31a75d (diff) | |
| download | yosys-21209d632e62983d008e121c6ffcf2815d2ae4d8.tar.gz yosys-21209d632e62983d008e121c6ffcf2815d2ae4d8.tar.bz2 yosys-21209d632e62983d008e121c6ffcf2815d2ae4d8.zip | |
Merge pull request #2135 from boqwxp/qbfsat-timeinfo
log and qbfsat: Also include child process usage in `PerformanceTimer::query()` and report the time for each call to the QBF-SAT solver
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/log.h | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/kernel/log.h b/kernel/log.h index 501d20c09..5986e0075 100644 --- a/kernel/log.h +++ b/kernel/log.h @@ -308,19 +308,17 @@ struct PerformanceTimer static int64_t query() { # ifdef _WIN32 return 0; -# elif defined(_POSIX_TIMERS) && (_POSIX_TIMERS > 0) - struct timespec ts; - clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &ts); - return int64_t(ts.tv_sec)*1000000000 + ts.tv_nsec; # elif defined(RUSAGE_SELF) struct rusage rusage; - int64_t t; - if (getrusage(RUSAGE_SELF, &rusage) == -1) { - log_cmd_error("getrusage failed!\n"); - log_abort(); + int64_t t = 0; + for (int who : {RUSAGE_SELF, RUSAGE_CHILDREN}) { + if (getrusage(who, &rusage) == -1) { + log_cmd_error("getrusage failed!\n"); + log_abort(); + } + t += 1000000000ULL * (int64_t) rusage.ru_utime.tv_sec + (int64_t) rusage.ru_utime.tv_usec * 1000ULL; + t += 1000000000ULL * (int64_t) rusage.ru_stime.tv_sec + (int64_t) rusage.ru_stime.tv_usec * 1000ULL; } - t = 1000000000ULL * (int64_t) rusage.ru_utime.tv_sec + (int64_t) rusage.ru_utime.tv_usec * 1000ULL; - t += 1000000000ULL * (int64_t) rusage.ru_stime.tv_sec + (int64_t) rusage.ru_stime.tv_usec * 1000ULL; return t; # else # error "Don't know how to measure per-process CPU time. Need alternative method (times()/clocks()/gettimeofday()?)." |