[libc] Unify lseek implementations

[mikhail.ramalho]

Summary

In patch D157792, the calls to SYS_llseek/SYS_llseek for 32-bit systems
were fixed in lseek.cpp but there was another implementation in file.cpp
that was missed.

To reduce the code duplication, this patch unifies both call sites to
use a new lseekimpl function.

[mikhail.ramalho]

• Added assertion to make sure the new code is only used in 32-bit systems
• rebased

[mikhail.ramalho]

ping

[sivachandra]

libc/src/__support/File/lseekImpl.h

1 ↗

(On Diff #555349)

This is a Linux implementation so should live in the linux directory.

[mikhail.ramalho]

Moved implementation to linux dir

libc/src/__support/File/linux/file.cpp

 //===--- Implementation of the Linux specialization of 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
 //
 //===----------------------------------------------------------------------===//
 
 #include "file.h"
 
 #include "src/__support/File/file.h"
 
 #include "src/__support/CPP/new.h"
+#include "src/__support/File/linux/lseekImpl.h"
 #include "src/__support/OSUtil/syscall.h" // For internal syscall function.
 #include "src/errno/libc_errno.h"         // For error macros
 
 #include <fcntl.h> // For mode_t and other flags to the open syscall
 #include <stdio.h>
 #include <sys/syscall.h> // For syscall numbers
 
 namespace __llvm_libc {
FileIOResult linux_file_read(File *f, void *buf, size_t size) {
   if (ret < 0) {
     return {0, -ret};
   }
   return ret;
 }
 
 ErrorOr<long> linux_file_seek(File *f, long offset, int whence) {
   auto *lf = reinterpret_cast<LinuxFile *>(f);
-  long result;
-#ifdef SYS_lseek
-  int ret =
-      __llvm_libc::syscall_impl<int>(SYS_lseek, lf->get_fd(), offset, whence);
-  result = ret;
-#elif defined(SYS_llseek)
-  int ret = __llvm_libc::syscall_impl<int>(SYS_llseek, lf->get_fd(),
-                                           (long)(((uint64_t)(offset)) >> 32),
-                                           (long)offset, &result, whence);
-  result = ret;
-#elif defined(SYS_llseek)
-  int ret = __llvm_libc::syscall_impl<int>(SYS_llseek, lf->get_fd(),
-                                           (long)(((uint64_t)(offset)) >> 32),
-                                           (long)offset, &result, whence);
-  result = ret;
-#elif defined(SYS__llseek)
-  int ret = __llvm_libc::syscall_impl<int>(
-      SYS__llseek, lf->get_fd(), offset >> 32, offset, &result, whence);
-#else
-#error "lseek, llseek and _llseek syscalls not available."
-#endif
-
-  if (ret < 0)
-    return Error(-ret);
-
-  return result;
+  auto result = internal::lseekimpl(lf->get_fd(), offset, whence);
+  if (!result.has_value())
+    return result.error();
+  return result.value();
 }
 
 int linux_file_close(File *f) {
   auto *lf = reinterpret_cast<LinuxFile *>(f);
   int ret = __llvm_libc::syscall_impl<int>(SYS_close, lf->get_fd());
   if (ret < 0) {
     return -ret;
   }

libc/src/__support/File/linux/lseekImpl.h

-//===-- Linux implementation of lseek -------------------------------------===//
+//===-- lseek conversion utils ----------------------------------*- C++ -*-===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 
-#include "src/unistd/lseek.h"
-#include "src/errno/libc_errno.h"
+#ifndef LLVM_LIBC_SRC_SYS_WAIT_LSEEKIMPL_H
+#define LLVM_LIBC_SRC_SYS_WAIT_LSEEKIMPL_H
 
 #include "src/__support/OSUtil/syscall.h" // For internal syscall function.
 #include "src/__support/common.h"
+#include "src/__support/error_or.h"
+#include "src/errno/libc_errno.h"
 
-#include <stdint.h>
+#include <stdint.h>      // For uint64_t.
 #include <sys/syscall.h> // For syscall numbers.
-#include <unistd.h>
+#include <unistd.h>      // For off_t.
 
 namespace __llvm_libc {
+namespace internal {
 
-LLVM_LIBC_FUNCTION(off_t, lseek, (int fd, off_t offset, int whence)) {
+LIBC_INLINE ErrorOr<off_t> lseekimpl(int fd, off_t offset, int whence) {
   off_t result;
 #ifdef SYS_lseek
   int ret = __llvm_libc::syscall_impl<int>(SYS_lseek, fd, offset, whence);
   result = ret;
 #elif defined(SYS_llseek) || defined(SYS__llseek)
+  static_assert(sizeof(size_t) == 4, "size_t must be 32 bits.");
 #ifdef SYS_llseek
   constexpr long LLSEEK_SYSCALL_NO = SYS_llseek;
 #elif defined(SYS__llseek)
   constexpr long LLSEEK_SYSCALL_NO = SYS__llseek;
 #endif
-  uint64_t offset_64 = static_cast<uint64_t>(offset);
+  off_t offset_64 = offset;
   int ret = __llvm_libc::syscall_impl<int>(
       LLSEEK_SYSCALL_NO, fd, offset_64 >> 32, offset_64, &result, whence);
 #else
 #error "lseek, llseek and _llseek syscalls not available."
 #endif
-
-  if (ret < 0) {
-    libc_errno = -ret;
-    return -1;
-  }
+  if (ret < 0)
+    return Error(-ret);
   return result;
 }
 
+} // namespace internal
 } // namespace __llvm_libc
+
+#endif // LLVM_LIBC_SRC_SYS_WAIT_LSEEKIMPL_H

libc/src/unistd/linux/lseek.cpp

 //===-- Linux implementation of lseek -------------------------------------===//
 //
 // 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
 //
 //===----------------------------------------------------------------------===//
 
 #include "src/unistd/lseek.h"
 #include "src/errno/libc_errno.h"
 
+#include "src/__support/File/linux/lseekImpl.h"
 #include "src/__support/OSUtil/syscall.h" // For internal syscall function.
 #include "src/__support/common.h"
 
-#include <stdint.h>
 #include <sys/syscall.h> // For syscall numbers.
-#include <unistd.h>
+#include <unistd.h>      // For off_t.
 
 namespace __llvm_libc {
 
 LLVM_LIBC_FUNCTION(off_t, lseek, (int fd, off_t offset, int whence)) {
-  off_t result;
-#ifdef SYS_lseek
-  int ret = __llvm_libc::syscall_impl<int>(SYS_lseek, fd, offset, whence);
-  result = ret;
-#elif defined(SYS_llseek) || defined(SYS__llseek)
-#ifdef SYS_llseek
-  constexpr long LLSEEK_SYSCALL_NO = SYS_llseek;
-#elif defined(SYS__llseek)
-  constexpr long LLSEEK_SYSCALL_NO = SYS__llseek;
-#endif
-  uint64_t offset_64 = static_cast<uint64_t>(offset);
-  int ret = __llvm_libc::syscall_impl<int>(
-      LLSEEK_SYSCALL_NO, fd, offset_64 >> 32, offset_64, &result, whence);
-#else
-#error "lseek, llseek and _llseek syscalls not available."
-#endif
-
-  if (ret < 0) {
-    libc_errno = -ret;
+  auto result = internal::lseekimpl(fd, offset, whence);
+  if (!result.has_value()) {
+    libc_errno = result.error();
     return -1;
   }
-  return result;
+  return result.value();
 }
 
 } // namespace __llvm_libc