Remove the use of system headers, address comments

Author: vinayakdsci

libc/hdr/CMakeLists.txt

@@ -32,6 +32,15 @@ add_proxy_header_library(
     libc.include.math
 )
 
+add_proxy_header_library(
+  fcntl_macros
+  HDRS
+    fcntl_macros.h
+  FULL_BUILD_DEPENDS
+    libc.include.llvm-libc-macros.fcntl_macros
+    libc.include.fcntl
+)
+
 add_proxy_header_library(
   fenv_macros
   HDRS

libc/hdr/fcntl_macros.h

@@ -0,0 +1,22 @@
+//===-- Definition of macros from fcntl/fcntl.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_HDR_FCNTL_MACROS_H
+#define LLVM_LIBC_HDR_FCNTL_MACROS_H
+
+#ifdef LIBC_FULL_BUILD
+
+#include "include/llvm-libc-macros/fcntl-macros.h"
+
+#else // Overlay mode
+
+#include <fcntl.h>
+
+#endif // LLVM_LIBC_FULL_BUILD
+
+#endif // LLVM_LIBC_HDR_FCNTL_MACROS_H

libc/hdr/types/CMakeLists.txt

@@ -14,6 +14,22 @@ add_proxy_header_library(
     libc.include.llvm-libc-types.struct_epoll_event
 )
 
+add_proxy_header_library(
+  struct_flock
+  HDRS
+    struct_flock.h
+  FULL_BUILD_DEPENDS
+    libc.include.llvm-libc-types.struct_flock
+)
+
+add_proxy_header_library(
+  struct_flock64
+  HDRS
+    struct_flock64.h
+  FULL_BUILD_DEPENDS
+    libc.include.llvm-libc-types.struct_flock64
+)
+
 add_proxy_header_library(
   struct_timespec
   HDRS

libc/hdr/types/struct_flock.h

@@ -0,0 +1,21 @@
+//===-- Proxy for struct flock  -------------------------------------------===//
+//
+// 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_HDR_TYPES_STRUCT_FLOCK_H
+#define LLVM_LIBC_HDR_TYPES_STRUCT_FLOCK_H
+
+#ifdef LIBC_FULL_BUILD
+
+#include "include/llvm-libc-types/struct_flock.h"
+
+#else
+
+#include <fcntl.h>
+
+#endif // LIBC_FULL_BUILD
+
+#endif // LLVM_LIBC_HDR_TYPES_STRUCT_FLOCK_H

libc/hdr/types/struct_flock64.h

@@ -0,0 +1,21 @@
+//===-- Proxy for struct flock64  -----------------------------------------===//
+//
+// 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_HDR_TYPES_STRUCT_FLOCK64_H
+#define LLVM_LIBC_HDR_TYPES_STRUCT_FLOCK64_H
+
+#ifdef LIBC_FULL_BUILD
+
+#include "include/llvm-libc-types/struct_flock64.h"
+
+#else
+
+#include <fcntl.h>
+
+#endif // LIBC_FULL_BUILD
+
+#endif // LLVM_LIBC_HDR_TYPES_STRUCT_FLOCK64_H

libc/include/llvm-libc-macros/linux/fcntl-macros.h

@@ -67,5 +67,36 @@
 #define F_SETFD 2
 #define F_GETFL 3
 #define F_SETFL 4
+#define F_GETLK 5
+#define F_SETLK 6
+#define F_SETLKW 7
+#define F_SETOWN 8
+#define F_GETOWN 9
+#define F_SETSIG 10
+#define F_GETSIG 11
+#define F_GETLK64 12
+#define F_SETLK64 13
+#define F_SETLKW64 14
+#define F_SETOWN_EX 15
+#define F_GETOWN_EX 16
+
+// Open File Description Locks.
+#define F_OFD_GETLK 36
+#define F_OFD_SETLK 37
+#define F_OFD_SETLKW 38
+
+// Close on succesful
+#define F_CLOEXEC 1
+
+#define F_RDLCK 0
+#define F_WRLOCK 1
+#define F_UNLCK 2
+
+// For Large File Support
+#if defined(_LARGEFILE64_SOURCE)
+#define F_GETLK F_GETLK64
+#define F_SETLK F_SETLK64
+#define F_SETLKW F_SETLKW64
+#endif
 
 #endif // LLVM_LIBC_MACROS_LINUX_FCNTL_MACROS_H

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

@@ -60,6 +60,8 @@ add_header(rlim_t HDR rlim_t.h)
 add_header(time_t HDR time_t.h)
 add_header(stack_t HDR stack_t.h)
 add_header(suseconds_t HDR suseconds_t.h)
+add_header(struct_flock HDR struct_flock.h DEPENDS .off_t .pid_t)
+add_header(struct_flock64 HDR struct_flock64.h DEPENDS .off64_t .pid_t)
 add_header(struct_timeval HDR struct_timeval.h DEPENDS .suseconds_t .time_t)
 add_header(struct_rlimit HDR struct_rlimit.h DEPENDS .rlim_t)
 add_header(struct_rusage HDR struct_rusage.h DEPENDS .struct_timeval)

libc/include/llvm-libc-types/struct_flock.h

@@ -0,0 +1,23 @@
+//===-- Definition of type struct flock64 ---------------------------------===//
+//
+// 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_TYPES_STRUCT_FLOCK_H
+#define LLVM_LIBC_TYPES_STRUCT_FLOCK_H
+
+#include "llvm-libc-types/off_t.h"
+#include "llvm-libc-types/pid_t.h"
+
+struct flock64 {
+  int16_t l_type;
+  int16_t l_whence;
+  off_t l_start;
+  off_t l_len;
+  pid_t l_pid;
+};
+
+#endif // LLVM_LIBC_TYPES_STRUCT_FLOCK_H

libc/include/llvm-libc-types/struct_flock64.h

@@ -0,0 +1,23 @@
+//===-- Definition of type struct flock64 ---------------------------------===//
+//
+// 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_TYPES_STRUCT_FLOCK64_H
+#define LLVM_LIBC_TYPES_STRUCT_FLOCK64_H
+
+#include "llvm-libc-types/off64_t.h"
+#include "llvm-libc-types/pid_t.h"
+
+struct flock64 {
+  int16_t l_type;
+  int16_t l_whence;
+  off64_t l_start;
+  off64_t l_len;
+  pid_t l_pid;
+};
+
+#endif // LLVM_LIBC_TYPES_STRUCT_FLOCK64_H

libc/spec/posix.td

@@ -230,6 +230,11 @@ def POSIX : StandardSpec<"POSIX"> {
           RetValSpec<IntType>,
           [ArgSpec<ConstCharPtr>, ArgSpec<ModeTType>]
       >,
+      FunctionSpec<
+          "fcntl",
+          RetValSpec<IntType>,
+          [ArgSpec<IntType>, ArgSpec<IntType>, ArgSpec<VarArgType>]
+      >,
       FunctionSpec<
           "open",
           RetValSpec<IntType>,

libc/src/fcntl/fcntl.h

@@ -9,8 +9,6 @@
 #ifndef LLVM_LIBC_SRC_FCNTL_FCNTL_H
 #define LLVM_LIBC_SRC_FCNTL_FCNTL_H
 
-#include <fcntl.h>
-
 namespace LIBC_NAMESPACE {
 
 int fcntl(int fd, int cmd, ...);

libc/src/fcntl/linux/CMakeLists.txt

@@ -18,6 +18,9 @@ add_entrypoint_object(
     ../fcntl.h
   DEPENDS
     libc.include.fcntl
+    libc.include.llvm-libc-types.struct_flock
+    libc.include.llvm-libc-types.struct_flock64
+    libc.hdr.fcntl_macros
     libc.src.__support.OSUtil.osutil
     libc.src.errno.errno
 )

libc/src/fcntl/linux/fcntl.cpp

@@ -8,19 +8,29 @@
 
 #include "src/fcntl/fcntl.h"
 
+#include "hdr/fcntl_macros.h"
+#include "hdr/types/struct_flock.h"
+#include "hdr/types/struct_flock64.h"
 #include "src/__support/OSUtil/syscall.h" // For internal syscall function.
 #include "src/__support/common.h"
 #include "src/errno/libc_errno.h"
 
 #include <stdarg.h>
 #include <sys/syscall.h> // For syscall numbers.
 
-namespace {
+// To avoid conflict with system headers when building
+// in overlay mode.
+namespace helper {
+enum pid_type {
+  F_OWNER_TID = 0,
+  F_OWNER_PID,
+  F_OWNER_PGRP,
+};
 struct fowner_ex {
-  int type;
+  enum pid_type type;
   pid_t pid;
 };
-} // namespace
+} // namespace helper
 
 // The OFD file locks require special handling for LARGEFILES
 namespace LIBC_NAMESPACE {
@@ -35,7 +45,7 @@ LLVM_LIBC_FUNCTION(int, fcntl, (int fd, int cmd, ...)) {
   case F_SETLKW:
     return syscall_impl<int>(SYS_fcntl, fd, cmd, arg);
   case F_OFD_SETLKW: {
-    struct flock *flk = (struct flock *)arg;
+    struct flock *flk = reinterpret_cast<struct flock *>(arg);
     // convert the struct to a flock64
     struct flock64 flk64;
     flk64.l_type = flk->l_type;
@@ -48,7 +58,7 @@ LLVM_LIBC_FUNCTION(int, fcntl, (int fd, int cmd, ...)) {
   }
   case F_OFD_GETLK:
   case F_OFD_SETLK: {
-    struct flock *flk = (struct flock *)arg;
+    struct flock *flk = reinterpret_cast<struct flock *>(arg);
     // convert the struct to a flock64
     struct flock64 flk64;
     flk64.l_type = flk->l_type;
@@ -63,8 +73,8 @@ LLVM_LIBC_FUNCTION(int, fcntl, (int fd, int cmd, ...)) {
       return -1;
     // Check for overflow, i.e. the offsets are not the same when cast
     // to off_t from off64_t.
-    if ((off_t)flk64.l_len != flk64.l_len ||
-        (off_t)flk64.l_start != flk64.l_start) {
+    if (static_cast<off_t>(flk64.l_len) != flk64.l_len ||
+        static_cast<off_t>(flk64.l_start) != flk64.l_start) {
       libc_errno = EOVERFLOW;
       return -1;
     }
@@ -79,17 +89,18 @@ LLVM_LIBC_FUNCTION(int, fcntl, (int fd, int cmd, ...)) {
     // The general case
   default: {
     if (cmd == F_GETOWN) {
-      struct fowner_ex fex;
+      struct helper::fowner_ex fex;
       int retVal = syscall_impl<int>(SYS_fcntl, fd, F_GETOWN_EX, &fex);
       if (retVal == -EINVAL)
-        return syscall_impl<int>(SYS_fcntl, fd, cmd, (void *)arg);
-      if ((uint64_t)retVal <= -4096UL)
-        return fex.type == F_OWNER_PGRP ? -fex.pid : fex.pid;
+        return syscall_impl<int>(SYS_fcntl, fd, cmd,
+                                 reinterpret_cast<void *>(arg));
+      if (static_cast<uint64_t>(retVal) <= -4096UL)
+        return fex.type == helper::F_OWNER_PGRP ? -fex.pid : fex.pid;
 
       libc_errno = -retVal;
       return -1;
     }
-    return syscall_impl<int>(SYS_fcntl, fd, cmd, (void *)arg);
+    return syscall_impl<int>(SYS_fcntl, fd, cmd, reinterpret_cast<void *>(arg));
   }
   }
 }

libc/test/src/fcntl/fcntl_test.cpp

@@ -13,8 +13,6 @@
 #include "test/UnitTest/ErrnoSetterMatcher.h"
 #include "test/UnitTest/Test.h"
 
-#include <sys/stat.h>
-
 TEST(LlvmLibcFcntlTest, FcntlDupfd) {
   using LIBC_NAMESPACE::testing::ErrnoSetterMatcher::Succeeds;
   constexpr const char *TEST_FILE = "testdata/fcntl.test";