-
Notifications
You must be signed in to change notification settings - Fork 14.6k
[libc][POSIX][unistd] implement getsid #127341
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
Thank you for submitting a Pull Request (PR) to the LLVM Project! This PR will be automatically labeled and the relevant teams will be notified. If you wish to, you can add reviewers by using the "Reviewers" section on this page. If this is not working for you, it is probably because you do not have write permissions for the repository. In which case you can instead tag reviewers by name in a comment by using If you have received no comments on your PR for a week, you can request a review by "ping"ing the PR by adding a comment “Ping”. The common courtesy "ping" rate is once a week. Please remember that you are asking for valuable time from other developers. If you have further questions, they may be answered by the LLVM GitHub User Guide. You can also ask questions in a comment on this PR, on the LLVM Discord or on the forums. |
@llvm/pr-subscribers-libc Author: Zaky Hermawan (ZakyHermawan) ChangesFixes #126603 Full diff: https://github.com/llvm/llvm-project/pull/127341.diff 10 Files Affected:
diff --git a/libc/config/linux/aarch64/entrypoints.txt b/libc/config/linux/aarch64/entrypoints.txt
index efb5e1c7bd698..aac4017a0d845 100644
--- a/libc/config/linux/aarch64/entrypoints.txt
+++ b/libc/config/linux/aarch64/entrypoints.txt
@@ -329,6 +329,7 @@ set(TARGET_LIBC_ENTRYPOINTS
libc.src.unistd.geteuid
libc.src.unistd.getpid
libc.src.unistd.getppid
+ libc.src.unistd.getsid
libc.src.unistd.gettid
libc.src.unistd.getuid
libc.src.unistd.isatty
diff --git a/libc/config/linux/riscv/entrypoints.txt b/libc/config/linux/riscv/entrypoints.txt
index a9ba0c257755b..6b006f0ecca89 100644
--- a/libc/config/linux/riscv/entrypoints.txt
+++ b/libc/config/linux/riscv/entrypoints.txt
@@ -326,6 +326,7 @@ set(TARGET_LIBC_ENTRYPOINTS
libc.src.unistd.geteuid
libc.src.unistd.getpid
libc.src.unistd.getppid
+ libc.src.unistd.getsid
libc.src.unistd.gettid
libc.src.unistd.getuid
libc.src.unistd.isatty
diff --git a/libc/config/linux/x86_64/entrypoints.txt b/libc/config/linux/x86_64/entrypoints.txt
index a4f6671a59789..35661004663c9 100644
--- a/libc/config/linux/x86_64/entrypoints.txt
+++ b/libc/config/linux/x86_64/entrypoints.txt
@@ -328,6 +328,7 @@ set(TARGET_LIBC_ENTRYPOINTS
libc.src.unistd.geteuid
libc.src.unistd.getpid
libc.src.unistd.getppid
+ libc.src.unistd.getsid
libc.src.unistd.gettid
libc.src.unistd.getuid
libc.src.unistd.isatty
diff --git a/libc/include/unistd.yaml b/libc/include/unistd.yaml
index d04d46bd5c002..051e92b006741 100644
--- a/libc/include/unistd.yaml
+++ b/libc/include/unistd.yaml
@@ -161,6 +161,12 @@ functions:
return_type: int
arguments:
- type: void
+ - name: getsid
+ standards:
+ - POSIX
+ return_type: pid_t
+ arguments:
+ - type: pid_t
- name: gettid
standards:
- Linux
diff --git a/libc/src/unistd/CMakeLists.txt b/libc/src/unistd/CMakeLists.txt
index fb563ec4ecfd9..b1a1716aa85c6 100644
--- a/libc/src/unistd/CMakeLists.txt
+++ b/libc/src/unistd/CMakeLists.txt
@@ -125,6 +125,13 @@ add_entrypoint_object(
.${LIBC_TARGET_OS}.getppid
)
+add_entrypoint_object(
+ getsid
+ ALIAS
+ DEPENDS
+ .${LIBC_TARGET_OS}.getsid
+)
+
add_entrypoint_object(
geteuid
ALIAS
diff --git a/libc/src/unistd/getsid.h b/libc/src/unistd/getsid.h
new file mode 100644
index 0000000000000..e788b5dc4fba0
--- /dev/null
+++ b/libc/src/unistd/getsid.h
@@ -0,0 +1,21 @@
+//===-- Implementation header for getsid ------------------------*- 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
+//
+//===----------------------------------------------------------------------===//
+
+#ifndef LLVM_LIBC_SRC_UNISTD_GETSID_H
+#define LLVM_LIBC_SRC_UNISTD_GETSID_H
+
+#include "hdr/types/pid_t.h"
+#include "src/__support/macros/config.h"
+
+namespace LIBC_NAMESPACE_DECL {
+
+pid_t getsid(pid_t);
+
+} // namespace LIBC_NAMESPACE_DECL
+
+#endif // LLVM_LIBC_SRC_UNISTD_GETSID_H
diff --git a/libc/src/unistd/linux/CMakeLists.txt b/libc/src/unistd/linux/CMakeLists.txt
index afdc595d0b26f..9502e2aa60b34 100644
--- a/libc/src/unistd/linux/CMakeLists.txt
+++ b/libc/src/unistd/linux/CMakeLists.txt
@@ -235,6 +235,21 @@ add_entrypoint_object(
libc.src.__support.OSUtil.osutil
)
+add_entrypoint_object(
+ getsid
+ SRCS
+ getsid.cpp
+ HDRS
+ ../getsid.h
+ DEPENDS
+ libc.hdr.types.pid_t
+ libc.hdr.fcntl_macros
+ libc.include.unistd
+ libc.include.sys_syscall
+ libc.src.__support.OSUtil.osutil
+ libc.src.errno.errno
+)
+
add_entrypoint_object(
getuid
SRCS
diff --git a/libc/src/unistd/linux/getsid.cpp b/libc/src/unistd/linux/getsid.cpp
new file mode 100644
index 0000000000000..5977c5bf10e94
--- /dev/null
+++ b/libc/src/unistd/linux/getsid.cpp
@@ -0,0 +1,29 @@
+//===-- Linux implementation of getsid-------------------------------------===//
+//
+// 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/getsid.h"
+
+#include "hdr/types/pid_t.h"
+#include "src/__support/OSUtil/syscall.h" // For internal syscall function.
+#include "src/__support/common.h"
+#include "src/__support/macros/config.h"
+#include "src/errno/libc_errno.h"
+#include <sys/syscall.h> // For syscall numbers.
+
+namespace LIBC_NAMESPACE_DECL {
+
+LLVM_LIBC_FUNCTION(pid_t, getsid, (pid_t pid)) {
+ pid_t ret = LIBC_NAMESPACE::syscall_impl<pid_t>(SYS_getsid, pid);
+ if (ret < 0) {
+ libc_errno = static_cast<int>(-ret);
+ return -1;
+ }
+ return ret;
+}
+
+} // namespace LIBC_NAMESPACE_DECL
diff --git a/libc/test/src/unistd/CMakeLists.txt b/libc/test/src/unistd/CMakeLists.txt
index 665cb367ba4fd..d1f3050e6cccf 100644
--- a/libc/test/src/unistd/CMakeLists.txt
+++ b/libc/test/src/unistd/CMakeLists.txt
@@ -394,6 +394,16 @@ add_libc_unittest(
libc.src.unistd.getppid
)
+add_libc_unittest(
+ getsid_test
+ SUITE
+ libc_unistd_unittests
+ SRCS
+ getsid_test.cpp
+ DEPENDS
+ libc.src.unistd.getsid
+)
+
add_libc_unittest(
getuid_test
SUITE
diff --git a/libc/test/src/unistd/getsid_test.cpp b/libc/test/src/unistd/getsid_test.cpp
new file mode 100644
index 0000000000000..79f9e9fd8c87b
--- /dev/null
+++ b/libc/test/src/unistd/getsid_test.cpp
@@ -0,0 +1,16 @@
+//===-- Unittests for setsid ----------------------------------------------===//
+//
+// 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/getsid.h"
+#include "test/UnitTest/Test.h"
+
+TEST(LlvmLibcGetPidTest, GetCurrSID) {
+ pid_t sid = LIBC_NAMESPACE::getsid(0);
+ ASSERT_NE(sid, -1);
+ ASSERT_ERRNO_SUCCESS();
+}
|
Signed-off-by: ZakyHermawan <[email protected]>
ae65878
to
a762588
Compare
Signed-off-by: ZakyHermawan <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for this patch, it looks really good! There are some minor things to clean up, but after that this should be good to land. Thanks for contributing!
This commit also do cleanup on libc/src/unistd/linux/CMakeLists.txt to remove unnecessary fnctl_macros and unistd from add_entrypoint_object for getsid Signed-off-by: ZakyHermawan <[email protected]>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
just one more small tweak and it should be ready to land
because calling getsid with -1 as the argument will guarantee the getsid syscall fails Signed-off-by: ZakyHermawan <[email protected]>
LGTM, do you need me to merge this for you once the presubmits are done? |
yes, please |
Presubmit failures are unrelated, tests pass on my system. Merging. |
@ZakyHermawan Congratulations on having your first Pull Request (PR) merged into the LLVM Project! Your changes will be combined with recent changes from other authors, then tested by our build bots. If there is a problem with a build, you may receive a report in an email or a comment on this PR. Please check whether problems have been caused by your change specifically, as the builds can include changes from many authors. It is not uncommon for your change to be included in a build that fails due to someone else's changes, or infrastructure issues. How to do this, and the rest of the post-merge process, is covered in detail here. If your change does cause a problem, it may be reverted, or you can revert it yourself. This is a normal part of LLVM development. You can fix your changes and open a new PR to merge them again. If you don't get any reports, no action is required from you. Your changes are working as expected, well done! |
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/73/builds/13302 Here is the relevant piece of the build log for the reference
|
Ignore that ^ |
Fixes #126603