From d5c652756bb1a52959cd5c62447b62462f90f983 Mon Sep 17 00:00:00 2001 From: Yabin Cui Date: Wed, 26 Nov 2014 14:04:26 -0800 Subject: [PATCH] support _POSIX_CPUTIME Bug: 18490039 Change-Id: I01fa83b48e1b908de1f227b6e4f98e280bcd50ee --- libc/Android.mk | 1 + libc/bionic/clock_getcpuclockid.cpp | 50 +++++++++++++++++++++++++++++++++++++ libc/include/machine/posix_limits.h | 2 +- libc/include/time.h | 2 ++ tests/time_test.cpp | 29 +++++++++++++++++++++ tests/unistd_test.cpp | 4 +-- 6 files changed, 85 insertions(+), 3 deletions(-) create mode 100644 libc/bionic/clock_getcpuclockid.cpp diff --git a/libc/Android.mk b/libc/Android.mk index ef1fb9be6..13fc2975a 100644 --- a/libc/Android.mk +++ b/libc/Android.mk @@ -98,6 +98,7 @@ libc_bionic_src_files := \ bionic/chown.cpp \ bionic/clearenv.cpp \ bionic/clock.cpp \ + bionic/clock_getcpuclockid.cpp \ bionic/clock_nanosleep.cpp \ bionic/clone.cpp \ bionic/__cmsg_nxthdr.cpp \ diff --git a/libc/bionic/clock_getcpuclockid.cpp b/libc/bionic/clock_getcpuclockid.cpp new file mode 100644 index 000000000..5511eb485 --- /dev/null +++ b/libc/bionic/clock_getcpuclockid.cpp @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2014 The Android Open Source Project + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * * Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#include +#include + +#include "private/ErrnoRestorer.h" + +int clock_getcpuclockid(pid_t pid, clockid_t* clockid) { + ErrnoRestorer errno_restorer; + + // The tid is stored in the top bits, but negated. + clockid_t result = ~static_cast(pid) << 3; + // Bits 0 and 1: clock type (0 = CPUCLOCK_PROF, 1 = CPUCLOCK_VIRT, 2 = CPUCLOCK_SCHED). + result |= 2; + // Bit 2: thread (set) or process (clear). Bit 2 already 0. + + timespec ts; + if (clock_getres(result, &ts) == -1) { + return ESRCH; + } + + *clockid = result; + return 0; +} diff --git a/libc/include/machine/posix_limits.h b/libc/include/machine/posix_limits.h index e5a299bc6..939a1de5b 100644 --- a/libc/include/machine/posix_limits.h +++ b/libc/include/machine/posix_limits.h @@ -41,7 +41,7 @@ #define _POSIX_CHILD_MAX 25 #define _POSIX_CHOWN_RESTRICTED 1 /* yes, chown requires appropriate privileges */ #define _POSIX_CLOCK_SELECTION 200809L -#define _POSIX_CPUTIME -1 /* clock_getcpuclockid() not implemented */ +#define _POSIX_CPUTIME 200809L #define _POSIX_DELAYTIMER_MAX 32 #define _POSIX_FSYNC 200809L /* fdatasync() supported */ #define _POSIX_HOST_NAME_MAX 255 diff --git a/libc/include/time.h b/libc/include/time.h index e34eb344e..1b0f6a11e 100644 --- a/libc/include/time.h +++ b/libc/include/time.h @@ -85,6 +85,8 @@ extern void tzset(void) __LIBC_ABI_PUBLIC__; extern clock_t clock(void) __LIBC_ABI_PUBLIC__; +extern int clock_getcpuclockid(pid_t, clockid_t*) __LIBC_ABI_PUBLIC__; + extern int clock_getres(clockid_t, struct timespec*) __LIBC_ABI_PUBLIC__; extern int clock_gettime(clockid_t, struct timespec*) __LIBC_ABI_PUBLIC__; extern int clock_nanosleep(clockid_t, int, const struct timespec*, struct timespec*) __LIBC_ABI_PUBLIC__; diff --git a/tests/time_test.cpp b/tests/time_test.cpp index e0231b1ca..691d8ff9c 100644 --- a/tests/time_test.cpp +++ b/tests/time_test.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include "ScopedSignalHandler.h" @@ -458,6 +459,34 @@ TEST(time, clock) { ASSERT_LT(t1 - t0, CLOCKS_PER_SEC / 1000); } +pid_t GetInvalidPid() { + FILE* fp = fopen("/proc/sys/kernel/pid_max", "r"); + long pid_max; + fscanf(fp, "%ld", &pid_max); + pid_t invalid_pid = static_cast(pid_max + 1); + fclose(fp); + return invalid_pid; +} + +TEST(time, clock_getcpuclockid) { + // For current process. + clockid_t clockid; + ASSERT_EQ(0, clock_getcpuclockid(getpid(), &clockid)); + + timespec ts; + ASSERT_EQ(0, clock_gettime(clockid, &ts)); + + // For parent process. + ASSERT_EQ(0, clock_getcpuclockid(getppid(), &clockid)); + ASSERT_EQ(0, clock_gettime(clockid, &ts)); + + // For invalid process. + // We can't use -1 for invalid pid here, because clock_getcpuclockid() can't detect it. + errno = 0; + ASSERT_EQ(ESRCH, clock_getcpuclockid(GetInvalidPid(), &clockid)); + ASSERT_EQ(0, errno); +} + TEST(time, clock_settime) { errno = 0; timespec ts; diff --git a/tests/unistd_test.cpp b/tests/unistd_test.cpp index f0aeb09c9..34b7bf342 100644 --- a/tests/unistd_test.cpp +++ b/tests/unistd_test.cpp @@ -529,6 +529,7 @@ TEST(unistd, _POSIX_macros_smoke) { EXPECT_GT(_POSIX_CHILD_MAX, 0); EXPECT_NE(_POSIX_CHOWN_RESTRICTED, -1); EXPECT_EQ(_POSIX_VERSION, _POSIX_CLOCK_SELECTION); + EXPECT_EQ(_POSIX_VERSION, _POSIX_CPUTIME); EXPECT_GT(_POSIX_DELAYTIMER_MAX, 0); EXPECT_EQ(_POSIX_VERSION, _POSIX_FSYNC); EXPECT_GT(_POSIX_HOST_NAME_MAX, 0); @@ -614,7 +615,6 @@ TEST(unistd, _POSIX_macros_smoke) { EXPECT_EQ(-1, _POSIX_ADVISORY_INFO); EXPECT_EQ(-1, _POSIX_ASYNCHRONOUS_IO); EXPECT_EQ(-1, _POSIX_BARRIERS); - EXPECT_EQ(-1, _POSIX_CPUTIME); EXPECT_EQ(-1, _POSIX_MESSAGE_PASSING); EXPECT_EQ(-1, _POSIX_PRIORITIZED_IO); EXPECT_EQ(-1, _POSIX_REALTIME_SIGNALS); @@ -665,6 +665,7 @@ TEST(unistd, sysconf) { VERIFY_SYSCONF_POSITIVE(_SC_CHILD_MAX); VERIFY_SYSCONF_POSITIVE(_SC_CLK_TCK); VERIFY_SYSCONF_POSITIVE(_SC_COLL_WEIGHTS_MAX); + VERIFY_SYSCONF_POSIX_VERSION(_SC_CPUTIME); VERIFY_SYSCONF_POSITIVE(_SC_EXPR_NEST_MAX); VERIFY_SYSCONF_POSITIVE(_SC_LINE_MAX); VERIFY_SYSCONF_POSITIVE(_SC_NGROUPS_MAX); @@ -775,7 +776,6 @@ TEST(unistd, sysconf) { VERIFY_SYSCONF_NOT_SUPPORT(_SC_ADVISORY_INFO); VERIFY_SYSCONF_NOT_SUPPORT(_SC_ASYNCHRONOUS_IO); VERIFY_SYSCONF_NOT_SUPPORT(_SC_BARRIERS); - VERIFY_SYSCONF_NOT_SUPPORT(_SC_CPUTIME); VERIFY_SYSCONF_NOT_SUPPORT(_SC_MESSAGE_PASSING); VERIFY_SYSCONF_NOT_SUPPORT(_SC_PRIORITIZED_IO); VERIFY_SYSCONF_NOT_SUPPORT(_SC_REALTIME_SIGNALS); -- 2.11.0