Skip to content

Revert "[libc][POSIX][pthreads] implemented missing pthread_rwlockattr functions" #91966

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
May 13, 2024
Merged

Revert "[libc][POSIX][pthreads] implemented missing pthread_rwlockattr functions" #91966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions libc/config/linux/x86_64/entrypoints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,10 +673,8 @@ if(LLVM_LIBC_FULL_BUILD)
libc.src.pthread.pthread_mutexattr_settype
libc.src.pthread.pthread_once
libc.src.pthread.pthread_rwlockattr_destroy
libc.src.pthread.pthread_rwlockattr_getkind_np
libc.src.pthread.pthread_rwlockattr_getpshared
libc.src.pthread.pthread_rwlockattr_init
libc.src.pthread.pthread_rwlockattr_setkind_np
libc.src.pthread.pthread_rwlockattr_setpshared
libc.src.pthread.pthread_setspecific

Expand Down
5 changes: 0 additions & 5 deletions libc/include/pthread.h.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,11 +38,6 @@ enum {
#define PTHREAD_PROCESS_PRIVATE 0
#define PTHREAD_PROCESS_SHARED 1

#define PTHREAD_RWLOCK_PREFER_READER_NP 0
#define PTHREAD_RWLOCK_PREFER_WRITER_NP 1
#define PTHREAD_RWLOCK_PREFER_WRITER_NONRECURSIVE_NP 2


%%public_api()

#endif // LLVM_LIBC_PTHREAD_H
10 changes: 0 additions & 10 deletions libc/spec/posix.td
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1234,11 +1234,6 @@ def POSIX : StandardSpec<"POSIX"> {
RetValSpec<IntType>,
[ArgSpec<PThreadRWLockAttrTPtr>]
>,
FunctionSpec<
"pthread_rwlockattr_getkind_np",
RetValSpec<IntType>,
[ArgSpec<PThreadRWLockAttrTPtr>, ArgSpec<IntPtr>]
>,
FunctionSpec<
"pthread_rwlockattr_getpshared",
RetValSpec<IntType>,
Expand All @@ -1249,11 +1244,6 @@ def POSIX : StandardSpec<"POSIX"> {
RetValSpec<IntType>,
[ArgSpec<PThreadRWLockAttrTPtr>]
>,
FunctionSpec<
"pthread_rwlockattr_setkind_np",
RetValSpec<IntType>,
[ArgSpec<PThreadRWLockAttrTPtr>, ArgSpec<IntType>]
>,
FunctionSpec<
"pthread_rwlockattr_setpshared",
RetValSpec<IntType>,
Expand Down
21 changes: 0 additions & 21 deletions libc/src/pthread/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -470,16 +470,6 @@ add_entrypoint_object(
libc.include.pthread
)

add_entrypoint_object(
pthread_rwlockattr_getkind_np
SRCS
pthread_rwlockattr_getkind_np.cpp
HDRS
pthread_rwlockattr_getkind_np.h
DEPENDS
libc.include.pthread
)

add_entrypoint_object(
pthread_rwlockattr_getpshared
SRCS
Expand All @@ -500,17 +490,6 @@ add_entrypoint_object(
libc.include.pthread
)

add_entrypoint_object(
pthread_rwlockattr_setkind_np
SRCS
pthread_rwlockattr_setkind_np.cpp
HDRS
pthread_rwlockattr_setkind_np.h
DEPENDS
libc.include.pthread
libc.include.errno
)

add_entrypoint_object(
pthread_rwlockattr_setpshared
SRCS
Expand Down
24 changes: 0 additions & 24 deletions libc/src/pthread/pthread_rwlockattr_getkind_np.cpp
View file
Open in desktop

This file was deleted.

21 changes: 0 additions & 21 deletions libc/src/pthread/pthread_rwlockattr_getkind_np.h
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion libc/src/pthread/pthread_rwlockattr_init.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ namespace LIBC_NAMESPACE {
LLVM_LIBC_FUNCTION(int, pthread_rwlockattr_init,
(pthread_rwlockattr_t * attr)) {
attr->pshared = PTHREAD_PROCESS_PRIVATE;
attr->pref = PTHREAD_RWLOCK_PREFER_READER_NP;
return 0;
}

Expand Down
30 changes: 0 additions & 30 deletions libc/src/pthread/pthread_rwlockattr_setkind_np.cpp
View file
Open in desktop

This file was deleted.

20 changes: 0 additions & 20 deletions libc/src/pthread/pthread_rwlockattr_setkind_np.h
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions libc/test/src/pthread/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,7 @@ add_libc_unittest(
libc.include.errno
libc.include.pthread
libc.src.pthread.pthread_rwlockattr_destroy
libc.src.pthread.pthread_rwlockattr_getkind_np
libc.src.pthread.pthread_rwlockattr_getpshared
libc.src.pthread.pthread_rwlockattr_init
libc.src.pthread.pthread_rwlockattr_setkind_np
libc.src.pthread.pthread_rwlockattr_setpshared
)
29 changes: 3 additions & 26 deletions libc/test/src/pthread/pthread_rwlockattr_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,8 @@

#include "include/llvm-libc-macros/generic-error-number-macros.h" // EINVAL
#include "src/pthread/pthread_rwlockattr_destroy.h"
#include "src/pthread/pthread_rwlockattr_getkind_np.h"
#include "src/pthread/pthread_rwlockattr_getpshared.h"
#include "src/pthread/pthread_rwlockattr_init.h"
#include "src/pthread/pthread_rwlockattr_setkind_np.h"
#include "src/pthread/pthread_rwlockattr_setpshared.h"
#include "test/UnitTest/Test.h"

Expand All @@ -27,61 +25,40 @@ TEST(LlvmLibcPThreadRWLockAttrTest, InitAndDestroy) {
TEST(LlvmLibcPThreadRWLockAttrTest, GetDefaultValues) {
pthread_rwlockattr_t attr;

// Invalid values.
// Invalid value.
int pshared = 42;
int pref = 1337;

ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlockattr_init(&attr), 0);
ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlockattr_getpshared(&attr, &pshared), 0);
ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlockattr_getkind_np(&attr, &pref), 0);

ASSERT_EQ(pshared, PTHREAD_PROCESS_PRIVATE);
ASSERT_EQ(pref, PTHREAD_RWLOCK_PREFER_READER_NP);

ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlockattr_destroy(&attr), 0);
}

TEST(LlvmLibcPThreadRWLockAttrTest, SetGoodValues) {
pthread_rwlockattr_t attr;

// Invalid values.
// Invalid value.
int pshared = 42;
int pref = 1337;

ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlockattr_init(&attr), 0);
ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlockattr_setpshared(
&attr, PTHREAD_PROCESS_SHARED),
0);
ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlockattr_setkind_np(
&attr, PTHREAD_RWLOCK_PREFER_WRITER_NP),
0);

ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlockattr_getpshared(&attr, &pshared), 0);
ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlockattr_getkind_np(&attr, &pref), 0);

ASSERT_EQ(pshared, PTHREAD_PROCESS_SHARED);
ASSERT_EQ(pref, PTHREAD_RWLOCK_PREFER_WRITER_NP);

ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlockattr_destroy(&attr), 0);
}

TEST(LlvmLibcPThreadRWLockAttrTest, SetBadValues) {
pthread_rwlockattr_t attr;

// Invalid values.
// Invalid value.
int pshared = 42;
int pref = 1337;

ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlockattr_init(&attr), 0);
ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlockattr_setpshared(&attr, pshared),
EINVAL);
ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlockattr_setkind_np(&attr, pref), EINVAL);

ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlockattr_getpshared(&attr, &pshared), 0);
ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlockattr_getkind_np(&attr, &pref), 0);

ASSERT_EQ(pshared, PTHREAD_PROCESS_PRIVATE);
ASSERT_EQ(pref, PTHREAD_RWLOCK_PREFER_READER_NP);

ASSERT_EQ(LIBC_NAMESPACE::pthread_rwlockattr_destroy(&attr), 0);
}
Loading