From patchwork Tue Mar 10 16:20:01 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Lucas A. M. Magalhaes" X-Patchwork-Id: 38526 Return-Path: X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mx0a-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by sourceware.org (Postfix) with ESMTPS id C3A0E3959E73 for ; Tue, 10 Mar 2020 16:20:04 +0000 (GMT) Received: from pps.filterd (m0098419.ppops.net [127.0.0.1]) by mx0b-001b2d01.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 02AGJqnC125620 for ; Tue, 10 Mar 2020 12:20:04 -0400 Received: from ppma02wdc.us.ibm.com (aa.5b.37a9.ip4.static.sl-reverse.com [169.55.91.170]) by mx0b-001b2d01.pphosted.com with ESMTP id 2ynra4djn7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 10 Mar 2020 12:20:04 -0400 Received: from pps.filterd (ppma02wdc.us.ibm.com [127.0.0.1]) by ppma02wdc.us.ibm.com (8.16.0.27/8.16.0.27) with SMTP id 02AGIFOT027468 for ; Tue, 10 Mar 2020 16:20:03 GMT Received: from b03cxnp08027.gho.boulder.ibm.com (b03cxnp08027.gho.boulder.ibm.com [9.17.130.19]) by ppma02wdc.us.ibm.com with ESMTP id 2ym386kx5m-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Tue, 10 Mar 2020 16:20:03 +0000 Received: from b03ledav006.gho.boulder.ibm.com (b03ledav006.gho.boulder.ibm.com [9.17.130.237]) by b03cxnp08027.gho.boulder.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 02AGK3AI15336088 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 10 Mar 2020 16:20:03 GMT Received: from b03ledav006.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DB84CC6057 for ; Tue, 10 Mar 2020 16:20:02 +0000 (GMT) Received: from b03ledav006.gho.boulder.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6C131C605F for ; Tue, 10 Mar 2020 16:20:02 +0000 (GMT) Received: from localhost (unknown [9.80.232.82]) by b03ledav006.gho.boulder.ibm.com (Postfix) with ESMTP for ; Tue, 10 Mar 2020 16:20:02 +0000 (GMT) From: "Lucas A. M. Magalhaes" To: libc-alpha@sourceware.org Subject: [PATCH v4] Fix time/tst-cpuclock1 intermitent failures Date: Tue, 10 Mar 2020 13:20:01 -0300 Message-Id: <20200310162001.11737-1-lamm@linux.ibm.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200220181747.12898-1-lamm@linux.ibm.com> References: <20200220181747.12898-1-lamm@linux.ibm.com> MIME-Version: 1.0 X-TM-AS-GCONF: 00 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.572 definitions=2020-03-10_10:2020-03-10, 2020-03-10 signatures=0 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 phishscore=0 mlxlogscore=999 mlxscore=0 bulkscore=0 priorityscore=1501 suspectscore=1 malwarescore=0 adultscore=0 lowpriorityscore=0 clxscore=1011 impostorscore=0 spamscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2001150001 definitions=main-2003100102 X-Spam-Status: No, score=-27.6 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 10 Mar 2020 16:20:05 -0000 This test fails intermittently in systems with heavy load as CLOCK_PROCESS_CPUTIME_ID is subject to scheduler pressure. Thus the test boundaries where relaxed to keep it from fail on this systems. A refactor of the spent time checking was made with some support functions. With the advantage to represent time jitter in percent of the target. The values used by the test boundaries are all empirical. --- Hi, changes on V4: - move functions to support/timespec.c - simplify functions changes on V3: - refactor support functions - use existing timespec-sub function changes on V2: - Add support functions --- support/timespec.c | 34 ++++++++++++++++++++++++++++++++ support/timespec.h | 6 ++++++ time/tst-cpuclock1.c | 46 +++++++++++++++----------------------------- 3 files changed, 55 insertions(+), 31 deletions(-) diff --git a/support/timespec.c b/support/timespec.c index ea6b947546..babe7801a2 100644 --- a/support/timespec.c +++ b/support/timespec.c @@ -19,6 +19,7 @@ #include #include #include +#include void test_timespec_before_impl (const char *file, int line, @@ -57,3 +58,36 @@ test_timespec_equal_or_after_impl (const char *file, int line, (intmax_t) diff.tv_sec, (intmax_t) diff.tv_nsec); } } + +/* Returns t normalized timespec with .tv_nsec < TIMESPEC_HZ + and the overflows added to .tv_sec. */ +struct timespec +support_timespec_normalize (struct timespec t) +{ + t.tv_sec += t.tv_nsec / TIMESPEC_HZ; + t.tv_nsec -= t.tv_nsec % TIMESPEC_HZ; + return t; +} + +/* Returns TRUE if deviation to base ratio is within the specified bounds, and +FALSE otherwise. +For example the call + +support_timespec_check_in_range(base, deviation, .5, 1.2); + +will check if + +.5 <= deviation/base <= 1.2 + +In other words it will check if deviation time is within 50% to 120% of +the base time. */ +int +support_timespec_check_in_range (struct timespec base, struct timespec deviation, + double lower_bound, double upper_bound) +{ + assert (upper_bound >= lower_bound); + long base_norm = base.tv_sec * TIMESPEC_HZ + base.tv_nsec; + long deviation_norm = deviation.tv_sec * TIMESPEC_HZ + deviation.tv_nsec; + double ratio = (double)deviation_norm / base_norm; + return (lower_bound <= ratio && ratio <= upper_bound); +} diff --git a/support/timespec.h b/support/timespec.h index c5852dfe75..98d18663d0 100644 --- a/support/timespec.h +++ b/support/timespec.h @@ -48,6 +48,12 @@ void test_timespec_equal_or_after_impl (const char *file, int line, const struct timespec left, const struct timespec right); +struct timespec support_timespec_normalize (struct timespec t); + +int support_timespec_check_in_range (struct timespec base, struct timespec deviation, + double upper_bound, double lower_bound); + + /* Check that the timespec on the left represents a time before the time on the right. */ #define TEST_TIMESPEC_BEFORE(left, right) \ diff --git a/time/tst-cpuclock1.c b/time/tst-cpuclock1.c index 0120906f23..0c67a61e0d 100644 --- a/time/tst-cpuclock1.c +++ b/time/tst-cpuclock1.c @@ -26,6 +26,7 @@ #include #include #include +#include /* This function is intended to rack up both user and system time. */ static void @@ -155,19 +156,13 @@ do_test (void) printf ("live PID %d after sleep => %ju.%.9ju\n", child, (uintmax_t) after.tv_sec, (uintmax_t) after.tv_nsec); - struct timespec diff = { .tv_sec = after.tv_sec - before.tv_sec, - .tv_nsec = after.tv_nsec - before.tv_nsec }; - if (diff.tv_nsec < 0) - { - --diff.tv_sec; - diff.tv_nsec += 1000000000; - } - if (diff.tv_sec != 0 - || diff.tv_nsec > 600000000 - || diff.tv_nsec < 100000000) + support_timespec_normalize(after); + support_timespec_normalize(before); + struct timespec diff = timespec_sub(after, before); + if (!support_timespec_check_in_range(sleeptime, diff, .0025, 1.3)) { printf ("before - after %ju.%.9ju outside reasonable range\n", - (uintmax_t) diff.tv_sec, (uintmax_t) diff.tv_nsec); + (uintmax_t) diff.tv_sec, (uintmax_t) diff.tv_nsec); result = 1; } @@ -194,19 +189,12 @@ do_test (void) } else { - struct timespec d = { .tv_sec = afterns.tv_sec - after.tv_sec, - .tv_nsec = afterns.tv_nsec - after.tv_nsec }; - if (d.tv_nsec < 0) - { - --d.tv_sec; - d.tv_nsec += 1000000000; - } - if (d.tv_sec > 0 - || d.tv_nsec < sleeptime.tv_nsec - || d.tv_nsec > sleeptime.tv_nsec * 2) + support_timespec_normalize(afterns); + diff = timespec_sub(afterns, after); + if (!support_timespec_check_in_range(sleeptime, diff, .71, 1.6)) { printf ("nanosleep time %ju.%.9ju outside reasonable range\n", - (uintmax_t) d.tv_sec, (uintmax_t) d.tv_nsec); + (uintmax_t) diff.tv_sec, (uintmax_t) diff.tv_nsec); result = 1; } } @@ -241,17 +229,13 @@ do_test (void) printf ("dead PID %d => %ju.%.9ju\n", child, (uintmax_t) dead.tv_sec, (uintmax_t) dead.tv_nsec); - diff.tv_sec = dead.tv_sec - after.tv_sec; - diff.tv_nsec = dead.tv_nsec - after.tv_nsec; - if (diff.tv_nsec < 0) - { - --diff.tv_sec; - diff.tv_nsec += 1000000000; - } - if (diff.tv_sec != 0 || diff.tv_nsec > 200000000) + support_timespec_normalize(dead); + diff = timespec_sub(dead, after); + sleeptime.tv_nsec = 100000000; + if (!support_timespec_check_in_range(sleeptime, diff, .7, 1.6)) { printf ("dead - after %ju.%.9ju outside reasonable range\n", - (uintmax_t) diff.tv_sec, (uintmax_t) diff.tv_nsec); + (uintmax_t) diff.tv_sec, (uintmax_t) diff.tv_nsec); result = 1; }