Skip to content

[libc][pthread] fix -Wmissing-field-initializers #126314

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 7 commits into from
Feb 12, 2025
Merged

[libc][pthread] fix -Wmissing-field-initializers #126314

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6ef84f2
[libc][pthread] fix -Wmissing-field-initializers
nickdesaulniers Feb 7, 2025
c380f97
switch to aggregate initialization
nickdesaulniers Feb 10, 2025
bfc84ca
s/gnu::unused/maybe_unused/
nickdesaulniers Feb 10, 2025
868122b
reformat
nickdesaulniers Feb 10, 2025
0f16df9
fix include path
nickdesaulniers Feb 10, 2025
ff3e6d9
cmake
nickdesaulniers Feb 11, 2025
2da1ce2
attempt reformat
nickdesaulniers Feb 12, 2025
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
47 changes: 45 additions & 2 deletions libc/include/llvm-libc-macros/pthread-macros.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
#ifndef LLVM_LIBC_MACROS_PTHREAD_MACRO_H
#define LLVM_LIBC_MACROS_PTHREAD_MACRO_H

#include "null-macro.h"

#define PTHREAD_CREATE_JOINABLE 0
#define PTHREAD_CREATE_DETACHED 1

Expand All @@ -25,8 +27,49 @@
#define PTHREAD_PROCESS_PRIVATE 0
#define PTHREAD_PROCESS_SHARED 1

#define PTHREAD_MUTEX_INITIALIZER {0}
#define PTHREAD_RWLOCK_INITIALIZER {0}
#ifdef __linux__
#define PTHREAD_MUTEX_INITIALIZER \
{ \
/* .__timed = */ 0, \
/* .__recursive = */ 0, \
/* .__robust = */ 0, \
/* .__owner = */ NULL, \
/* .__lock_count = */ 0, /* .__futex_word = */ \
{ \
/* .__word = */ 0, \
}, \
}
#else
#define PTHREAD_MUTEX_INITIALIZER \
{ \
/* .__timed = */ 0, /* .__recursive = */ 0, \
/* .__robust = */ 0, /* .__owner = */ NULL, \
/* .__lock_count = */ 0, \
}
#endif

#define PTHREAD_RWLOCK_INITIALIZER \
{ \
/* .__is_pshared = */ 0, \
/* .__preference = */ 0, \
/* .__state = */ 0, \
/* .__write_tid = */ 0, /* .__wait_queue_mutex = */ \
Copy link
Contributor

@michaelrj-google michaelrj-google Feb 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do you want these two comments to be on separate lines?

Copy link
Member Author

@nickdesaulniers nickdesaulniers Feb 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes; but dunno how to fix this quickly with clang-format.

Copy link
Contributor

@lntue lntue Feb 11, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does it work if you make it like:

/* .__wait_queue_mutex = */  {0},            \
/* .__pending_readers = */ {0},               \
...

Copy link
Member Author

@nickdesaulniers nickdesaulniers Feb 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It does. That makes me sad to mix comments that look like designated initializers, but only for top level members, with more aggregate initializers without such comments for nested members, but I lack the will to wrestle with the formatter.

I think we could put a .clang-format file in this dir, and use https://clang.llvm.org/docs/ClangFormatStyleOptions.html#whitespacesensitivemacros to turn off formatting for this macro.

Copy link
Member Author

@nickdesaulniers nickdesaulniers Feb 12, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

2da1ce2 PTAL

{ \
/* .__word = */ 0, \
}, /* .__pending_readers = */ \
{ \
/* .__word = */ 0, \
}, /* .__pending_writers = */ \
{ \
/* .__word = */ 0, \
}, /* .__reader_serialization = */ \
{ \
/* .__word = */ 0, \
}, /* .__writer_serialization = */ \
{ \
/* .__word = */ 0, \
}, \
}

// glibc extensions
#define PTHREAD_STACK_MIN (1 << 14) // 16KB
Expand Down
4 changes: 4 additions & 0 deletions libc/test/integration/src/pthread/pthread_mutex_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,10 @@ void multiple_waiters() {
LIBC_NAMESPACE::pthread_mutex_destroy(&counter_lock);
}

// Test the initializer
[[maybe_unused]]
static pthread_mutex_t test_initializer = PTHREAD_MUTEX_INITIALIZER;

TEST_MAIN() {
relay_counter();
wait_and_step();
Expand Down