[libc] add headers sys/auxv sys/prctl and sys/time

[michaelrj]

Summary

These headers are uncommonly used, and from extensions, but some basic
support is needed. Macros have been added where available.

[lntue]

libc/include/CMakeLists.txt

266

Why is this commented out?

[sivachandra]

libc/include/llvm-libc-macros/linux/sys-time-macros.h

16

We don't have the type struct timeval defined. So, why do we need these macros?

libc/include/sys/prctl.h.def

20

Remove this commented out include.

[michaelrj]

remove commented out code

libc/include/llvm-libc-macros/linux/sys-time-macros.h

16

struct timeval is defined in libc/include/llvm-libc-types/struct_timeval.h.

[sivachandra]

libc/include/llvm-libc-macros/linux/sys-time-macros.h

16

Sorry, what I mean is that sys/time.h is not defining the type. So, either we remove these macros, or add the definition of struct timeval in sys/time.h (by updating the spec and .td file appropriatley.)

[michaelrj]

include struct timeval in sys/time.h

[sivachandra]

libc/include/llvm-libc-macros/linux/sys-time-macros.h

56

What problem is this complication solving?

[michaelrj]

address comment and simplify before landing.

[michaelrj]

libc/include/llvm-libc-macros/linux/sys-time-macros.h

56

I misread the man page and thought that the simpler implementation didn't work in certain circumstances. I've fixed it now.

libc/config/linux/x86_64/headers.txt

 set(TARGET_PUBLIC_HEADERS
     libc.include.assert_h
     libc.include.ctype
     libc.include.dirent
     libc.include.errno
     libc.include.fcntl
     libc.include.fenv
     libc.include.inttypes
     libc.include.math
     libc.include.pthread
     libc.include.sched
     libc.include.signal
+    libc.include.spawn
     libc.include.stdio
     libc.include.stdlib
     libc.include.string
     libc.include.threads
     libc.include.time
     libc.include.unistd
 
+    libc.include.sys_auxv
     libc.include.sys_ioctl
     libc.include.sys_mman
+    libc.include.sys_prctl
     libc.include.sys_random
     libc.include.sys_resource
     libc.include.sys_stat
     libc.include.sys_syscall
+    libc.include.sys_time
     libc.include.sys_utsname
     libc.include.sys_wait
 )

libc/include/CMakeLists.txt

 )
 
 # TODO: Not all platforms will have a include/sys directory. Add the sys
 # directory and the targets for sys/*.h files conditional to the OS requiring
 # them.
 file(MAKE_DIRECTORY "sys")
 
 add_gen_header(
+  sys_auxv
+  DEF_FILE sys/auxv.h.def
+  GEN_HDR sys/auxv.h
+  DEPENDS
+    .llvm_libc_common_h
+    .llvm-libc-macros.sys_auxv_macros
+)
+
+add_gen_header(
   sys_ioctl
   DEF_FILE sys/ioctl.h.def
   GEN_HDR sys/ioctl.h
   DEPENDS
     .llvm_libc_common_h
     .llvm-libc-macros.sys_ioctl_macros
 )
 
 add_gen_header(
   sys_mman
   DEF_FILE sys/mman.h.def
   GEN_HDR sys/mman.h
   DEPENDS
     .llvm_libc_common_h
     .llvm-libc-types.off_t
     .llvm-libc-types.ssize_t
     .llvm-libc-macros.sys_mman_macros
 )
 
 add_gen_header(
+  sys_prctl
+  DEF_FILE sys/prctl.h.def
+  GEN_HDR sys/prctl.h
+  DEPENDS
+    .llvm_libc_common_h
+)
+
+add_gen_header(
   sys_random
   DEF_FILE sys/random.h.def
   GEN_HDR sys/random.h
   DEPENDS
     .llvm_libc_common_h
     .llvm-libc-macros.sys_random_macros
     .llvm-libc-types.ssize_t
     .llvm-libc-types.size_t
add_gen_header(
   GEN_HDR sys/syscall.h
   PARAMS
     syscall_numbers=../config/${LIBC_TARGET_OS}/syscall_numbers.h.inc
   DATA_FILES
     ../config/${LIBC_TARGET_OS}/syscall_numbers.h.inc
 )
 
 add_gen_header(
+  sys_time
+  DEF_FILE sys/time.h.def
+  GEN_HDR sys/time.h
+  DEPENDS
+    .llvm_libc_common_h
+    .llvm-libc-types.struct_timeval
+    .llvm-libc-macros.sys_time_macros
+)
+
+add_gen_header(
   sys_utsname
   DEF_FILE sys/utsname.h.def
   GEN_HDR sys/utsname.h
   DEPENDS
     .llvm_libc_common_h
     .llvm-libc-types.struct_utsname
 )
 

libc/include/llvm-libc-macros/CMakeLists.txt

 
 add_header(
   stdlib_macros
   HDR
     stdlib-macros.h
 )
 
 add_header(
+  sys_auxv_macros
+  HDR
+    sys-auxv-macros.h
+)
+
+add_header(
   sys_ioctl_macros
   HDR
     sys-ioctl-macros.h
   DEPENDS
     .linux.sys_ioctl_macros
 )
 
 
add_header(
   sys_resource_macros
   HDR
     sys-resource-macros.h
   DEPENDS
     .linux.sys_resource_macros
 )
 
 add_header(
+  sys_time_macros
+  HDR
+    sys-time-macros.h
+  DEPENDS
+    .linux.sys_time_macros
+)
+
+add_header(
   sys_wait_macros
   HDR
     sys-wait-macros.h
   DEPENDS
     .linux.sys_wait_macros
 )
 
 add_header(

libc/include/llvm-libc-macros/linux/CMakeLists.txt

 
 add_header(
   sys_stat_macros
   HDR
     sys-stat-macros.h
 )
 
 add_header(
+  sys_time_macros
+  HDR
+    sys-time-macros.h
+)
+
+add_header(
   unistd_macros
   HDR
     unistd-macros.h
 )
 
 add_header(
   signal_macros
   HDR
     signal-macros.h
 )

libc/include/llvm-libc-macros/linux/sys-time-macros.h

+//===-- Definition of macros from sys/time.h ------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef __LLVM_LIBC_MACROS_LINUX_SYS_TIME_MACROS_H
+#define __LLVM_LIBC_MACROS_LINUX_SYS_TIME_MACROS_H
+
+// Add two timevals and put the result in timeval_ptr_result. If the resulting
+// usec value is greater than 999,999 then the microseconds are turned into full
+// seconds (1,000,000 is subtracted from usec and 1 is added to sec).
+#define timeradd(timeval_ptr_a, timeval_ptr_b, timeval_ptr_result)             \
+  (timeval_ptr_result)->tv_sec =                                               \
+      (timeval_ptr_a)->tv_sec + (timeval_ptr_b)->tv_sec +                      \
+      (((timeval_ptr_a)->tv_usec + (timeval_ptr_b)->tv_usec) >= 1000000 ? 1    \
+                                                                        : 0);  \
+  (timeval_ptr_result)->tv_usec =                                              \
+      (timeval_ptr_a)->tv_usec + (timeval_ptr_b)->tv_usec -                    \
+      (((timeval_ptr_a)->tv_usec + (timeval_ptr_b)->tv_usec) >= 1000000        \
+           ? 1000000                                                           \
+           : 0);
+
+// Subtract two timevals and put the result in timeval_ptr_result. If the
+// resulting usec value is less than 0 then 1,000,000 is added to usec and 1 is
+// subtracted from sec.
+#define timersub(timeval_ptr_a, timeval_ptr_b, timeval_ptr_result)             \
+  (timeval_ptr_result)->tv_sec =                                               \
+      (timeval_ptr_a)->tv_sec - (timeval_ptr_b)->tv_sec -                      \
+      (((timeval_ptr_a)->tv_usec - (timeval_ptr_b)->tv_usec) < 0 ? 1 : 0);     \
+  (timeval_ptr_result)->tv_usec =                                              \
+      (timeval_ptr_a)->tv_usec - (timeval_ptr_b)->tv_usec +                    \
+      (((timeval_ptr_a)->tv_usec - (timeval_ptr_b)->tv_usec) < 0 ? 1000000     \
+                                                                 : 0);
+
+// Reset a timeval to the epoch.
+#define timerclear(timeval_ptr)                                                \
+  (timeval_ptr)->tv_sec = 0;                                                   \
+  (timeval_ptr)->tv_usec = 0;
+
+// Determine if a timeval is set to the epoch.
+#define timerisset(timeval_ptr)                                                \
+  (timeval_ptr)->tv_sec != 0 || (timeval_ptr)->tv_usec != 0;
+
+// Compare two timevals using CMP.
+#define timercmp(timeval_ptr_a, timeval_ptr_b, CMP)                            \
+  (((timeval_ptr_a)->tv_sec == (timeval_ptr_b)->tv_sec)                        \
+       ? ((timeval_ptr_a)->tv_usec CMP(timeval_ptr_b)->tv_usec)                \
+       : ((timeval_ptr_a)->tv_sec CMP(timeval_ptr_b)->tv_sec))
+
+#endif // __LLVM_LIBC_MACROS_LINUX_SYS_TIME_MACROS_H

libc/include/llvm-libc-macros/sys-auxv-macros.h

+//===-- Macros defined in sys/auxv.h header file --------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef __LLVM_LIBC_MACROS_AUXV_MACROS_H
+#define __LLVM_LIBC_MACROS_AUXV_MACROS_H
+
+// Macros defining the aux vector indexes.
+#define AT_NULL 0
+#define AT_IGNORE 1
+#define AT_EXECFD 2
+#define AT_PHDR 3
+#define AT_PHENT 4
+#define AT_PHNUM 5
+#define AT_PAGESZ 6
+#define AT_BASE 7
+#define AT_FLAGS 8
+#define AT_ENTRY 9
+#define AT_NOTELF 10
+#define AT_UID 11
+#define AT_EUID 12
+#define AT_GID 13
+#define AT_EGID 14
+#define AT_PLATFORM 15
+#define AT_HWCAP 16
+#define AT_CLKTCK 17
+
+#define AT_SECURE 23
+#define AT_BASE_PLATFORM 24
+#define AT_RANDOM 25
+#define AT_HWCAP2 26
+
+#define AT_EXECFN 31
+
+#ifndef AT_MINSIGSTKSZ
+#define AT_MINSIGSTKSZ 51
+#endif
+
+#endif // __LLVM_LIBC_MACROS_AUXV_MACROS_H

libc/include/llvm-libc-macros/sys-time-macros.h

+//===-- Macros defined in sys/time.h header file --------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef __LLVM_LIBC_MACROS_SYS_TIME_MACROS_H
+#define __LLVM_LIBC_MACROS_SYS_TIME_MACROS_H
+
+#ifdef __unix__
+#include "linux/sys-time-macros.h"
+#endif
+
+#endif // __LLVM_LIBC_MACROS_SYS_TIME_MACROS_H

libc/include/sys/auxv.h.def

+//===-- GNU header auxv.h -------------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SYS_AUXV_H
+#define LLVM_LIBC_SYS_AUXV_H
+
+#include <__llvm-libc-common.h>
+
+#include <llvm-libc-macros/sys-auxv-macros.h>
+
+%%public_api()
+
+#endif // LLVM_LIBC_SYS_AUXV_H

libc/include/sys/prctl.h.def

+//===-- Linux header prctl.h ----------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SYS_PRCTL_H
+#define LLVM_LIBC_SYS_PRCTL_H
+
+#include <__llvm-libc-common.h>
+
+// Process control is highly platform specific, so the platform usually defines
+// the macros itself.
+#include <linux/prctl.h>
+
+// TODO: Define the prctl macros.
+
+%%public_api()
+
+#endif // LLVM_LIBC_SYS_PRCTL_H

libc/include/sys/time.h.def

+//===-- Linux header time.h -----------------------------------------------===//
+//
+// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
+// See https://llvm.org/LICENSE.txt for license information.
+// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SYS_TIME_H
+#define LLVM_LIBC_SYS_TIME_H
+
+#include <__llvm-libc-common.h>
+
+#include <llvm-libc-types/struct_timeval.h>
+
+#include <llvm-libc-macros/sys-time-macros.h>
+
+%%public_api()
+
+#endif // LLVM_LIBC_SYS_TIME_H

libc/spec/gnu_ext.td

HeaderSpec PThread = HeaderSpec<
           FunctionSpec<
               "pthread_getname_np",
               RetValSpec<IntType>,
               [ArgSpec<PThreadTType>, ArgSpec<CharPtr>, ArgSpec<SizeTType>]
           >,
       ]
   >;
 
+  HeaderSpec SysAuxv = HeaderSpec<
+      "sys/auxv.h",
+      [], // Macros
+      [], // Types
+      [], // Enumerations
+      []  // Functions
+  >;
+
   HeaderSpec SendFile = HeaderSpec<
       "sys/sendfile.h",
       [], // Macros
       [OffTType, SizeTType, SSizeTType,], // Types
       [], // Enumerations
       [
           FunctionSpec<
               "sendfile",
def GnuExtensions : StandardSpec<"GNUExtensions"> {
 
   let Headers = [
     CType,
     FEnv,
     Math,
     PThread,
     Sched,
     SendFile,
+    SysAuxv,
     StdIO,
     String,
     UniStd,
   ];
 }

libc/spec/linux.td

+def StructTimevalType : NamedType<"struct timeval">;
+
 def Linux : StandardSpec<"Linux"> {
   HeaderSpec Errno = HeaderSpec<
       "errno.h",
       [
         Macro<"ENOMEDIUM">,
         Macro<"ENOTBLK">,
         Macro<"EMEDIUMTYPE">,
         Macro<"EBADSLT">,
HeaderSpec Errno = HeaderSpec<
       ]
   >;
 
   HeaderSpec SysMMan = HeaderSpec<
       "sys/mman.h",
       [Macro<"MAP_ANONYMOUS">]
   >;
 
+
+  HeaderSpec SysPrctl = HeaderSpec<
+      "sys/prctl.h",
+      [], // Macros
+      [], // Types
+      [], // Enumerations
+      []  // Functions
+  >;
+
   HeaderSpec SysRandom = HeaderSpec<
       "sys/random.h",
       [
         Macro<"GRND_RANDOM">,
         Macro<"GRND_NONBLOCK">,
         Macro<"GRND_INSECURE">,
       ],
       [], // Types
       [], // Enumerations
       [
         FunctionSpec<
           "getrandom",
           RetValSpec<SSizeTType>,
           [
             ArgSpec<VoidPtr>,
             ArgSpec<SizeTType>,
             ArgSpec<UnsignedIntType>
           ]
         >,
       ]
   >;
 
+  HeaderSpec SysTime = HeaderSpec<
+      "sys/time.h",
+      [
+        Macro<"timeradd">,
+        Macro<"timersub">,
+        Macro<"timerclear">,
+        Macro<"timerisset">,
+        Macro<"timercmp">,
+      ],
+      [StructTimevalType], // Types
+      [], // Enumerations
+      []  // Functions
+  >;
+
   HeaderSpec Signal = HeaderSpec<
       "signal.h",
       [
         Macro<"NSIG">,
 
         Macro<"SIGHUP">,
         Macro<"SIGINT">,
         Macro<"SIGQUIT">,
HeaderSpec Signal = HeaderSpec<
         Macro<"SIGSYS">,
         Macro<"SIGUNUSED">,
       ]
   >;
 
   let Headers = [
     Errno,
     SysMMan,
+    SysPrctl,
     SysRandom,
+    SysTime,
     Signal,
   ];
 }