* [FFmpeg-devel] [PATCH] lavu/thread: Check HAVE_PTHREAD_SET_?NAME_NP is defined
@ 2024-02-06 10:15 post
2024-02-06 10:23 ` Andreas Rheinhardt
0 siblings, 1 reply; 3+ messages in thread
From: post @ 2024-02-06 10:15 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: Frank Plowman
From: Frank Plowman <post@frankplowman.com>
Check HAVE_PTHREAD_SETNAME_NP and HAVE_PTHREAD_SET_NAME_NP are defined
before using them in macro conditions. Gets rid of lots of -Wundef
warnings present when building on MacOS since
fd16d8c68cd7b820eda76c407b0645b7cf470efd.
Signed-off-by: Frank Plowman <post@frankplowman.com>
---
libavutil/thread.h | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/libavutil/thread.h b/libavutil/thread.h
index 2c00c7cc35..0200b7b511 100644
--- a/libavutil/thread.h
+++ b/libavutil/thread.h
@@ -26,7 +26,9 @@
#if HAVE_PRCTL
#include <sys/prctl.h>
-#elif (HAVE_PTHREAD_SETNAME_NP || HAVE_PTHREAD_SET_NAME_NP) && HAVE_PTHREAD_NP_H
+#elif ((defined(HAVE_PTHREAD_SETNAME_NP) && HAVE_PTHREAD_SETNAME_NP) \
+ || (defined(HAVE_PTHREAD_SET_NAME_NP) && HAVE_PTHREAD_SET_NAME_NP)) \
+ && HAVE_PTHREAD_NP_H
#include <pthread_np.h>
#endif
@@ -219,7 +221,7 @@ static inline int ff_thread_setname(const char *name)
#if HAVE_PRCTL
ret = AVERROR(prctl(PR_SET_NAME, name));
-#elif HAVE_PTHREAD_SETNAME_NP
+#elif defined(HAVE_PTHREAD_SETNAME_NP) && HAVE_PTHREAD_SETNAME_NP
#if defined(__APPLE__)
ret = AVERROR(pthread_setname_np(name));
#elif defined(__NetBSD__)
@@ -227,7 +229,7 @@ static inline int ff_thread_setname(const char *name)
#else
ret = AVERROR(pthread_setname_np(pthread_self(), name));
#endif
-#elif HAVE_PTHREAD_SET_NAME_NP
+#elif defined(HAVE_PTHREAD_SET_NAME_NP) && HAVE_PTHREAD_SET_NAME_NP
pthread_set_name_np(pthread_self(), name);
#else
ret = AVERROR(ENOSYS);
--
2.43.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [FFmpeg-devel] [PATCH] lavu/thread: Check HAVE_PTHREAD_SET_?NAME_NP is defined
2024-02-06 10:15 [FFmpeg-devel] [PATCH] lavu/thread: Check HAVE_PTHREAD_SET_?NAME_NP is defined post
@ 2024-02-06 10:23 ` Andreas Rheinhardt
2024-02-06 10:24 ` Frank Plowman
0 siblings, 1 reply; 3+ messages in thread
From: Andreas Rheinhardt @ 2024-02-06 10:23 UTC (permalink / raw)
To: ffmpeg-devel
post@frankplowman.com:
> From: Frank Plowman <post@frankplowman.com>
>
> Check HAVE_PTHREAD_SETNAME_NP and HAVE_PTHREAD_SET_NAME_NP are defined
> before using them in macro conditions. Gets rid of lots of -Wundef
> warnings present when building on MacOS since
> fd16d8c68cd7b820eda76c407b0645b7cf470efd.
>
> Signed-off-by: Frank Plowman <post@frankplowman.com>
> ---
> libavutil/thread.h | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/libavutil/thread.h b/libavutil/thread.h
> index 2c00c7cc35..0200b7b511 100644
> --- a/libavutil/thread.h
> +++ b/libavutil/thread.h
> @@ -26,7 +26,9 @@
>
> #if HAVE_PRCTL
> #include <sys/prctl.h>
> -#elif (HAVE_PTHREAD_SETNAME_NP || HAVE_PTHREAD_SET_NAME_NP) && HAVE_PTHREAD_NP_H
> +#elif ((defined(HAVE_PTHREAD_SETNAME_NP) && HAVE_PTHREAD_SETNAME_NP) \
> + || (defined(HAVE_PTHREAD_SET_NAME_NP) && HAVE_PTHREAD_SET_NAME_NP)) \
> + && HAVE_PTHREAD_NP_H
> #include <pthread_np.h>
> #endif
>
> @@ -219,7 +221,7 @@ static inline int ff_thread_setname(const char *name)
>
> #if HAVE_PRCTL
> ret = AVERROR(prctl(PR_SET_NAME, name));
> -#elif HAVE_PTHREAD_SETNAME_NP
> +#elif defined(HAVE_PTHREAD_SETNAME_NP) && HAVE_PTHREAD_SETNAME_NP
> #if defined(__APPLE__)
> ret = AVERROR(pthread_setname_np(name));
> #elif defined(__NetBSD__)
> @@ -227,7 +229,7 @@ static inline int ff_thread_setname(const char *name)
> #else
> ret = AVERROR(pthread_setname_np(pthread_self(), name));
> #endif
> -#elif HAVE_PTHREAD_SET_NAME_NP
> +#elif defined(HAVE_PTHREAD_SET_NAME_NP) && HAVE_PTHREAD_SET_NAME_NP
> pthread_set_name_np(pthread_self(), name);
> #else
> ret = AVERROR(ENOSYS);
You need to rerun configure. Since
fd16d8c68cd7b820eda76c407b0645b7cf470efd running configure will add
HAVE_PTHREAD_SET_NAME_NP and HAVE_PTHREAD_SETNAME_NP to your config.h file.
- Andreas
PS: There is actually a different problem with this:
In file included from ./libavutil/common.h:88,
from ./libavutil/avutil.h:301,
from ./libavutil/opt.h:31,
from libavdevice/sdl2.c:31:
./config.h:340: warning: "HAVE_PTHREAD_SETNAME_NP" redefined
340 | #define HAVE_PTHREAD_SETNAME_NP 0
|
In file included from /usr/include/SDL2/SDL_config.h:4,
from /usr/include/SDL2/SDL_stdinc.h:31,
from /usr/include/SDL2/SDL_main.h:25,
from /usr/include/SDL2/SDL.h:32,
from libavdevice/sdl2.c:26:
/usr/include/x86_64-linux-gnu/SDL2/_real_SDL_config.h:205: note: this is
the location of the previous definition
205 | #define HAVE_PTHREAD_SETNAME_NP 1
|
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [FFmpeg-devel] [PATCH] lavu/thread: Check HAVE_PTHREAD_SET_?NAME_NP is defined
2024-02-06 10:23 ` Andreas Rheinhardt
@ 2024-02-06 10:24 ` Frank Plowman
0 siblings, 0 replies; 3+ messages in thread
From: Frank Plowman @ 2024-02-06 10:24 UTC (permalink / raw)
To: ffmpeg-devel
On 06/02/2024 11:23, Andreas Rheinhardt wrote:
> post@frankplowman.com:
>> From: Frank Plowman <post@frankplowman.com>
>>
>> Check HAVE_PTHREAD_SETNAME_NP and HAVE_PTHREAD_SET_NAME_NP are defined
>> before using them in macro conditions. Gets rid of lots of -Wundef
>> warnings present when building on MacOS since
>> fd16d8c68cd7b820eda76c407b0645b7cf470efd.
>>
>> Signed-off-by: Frank Plowman <post@frankplowman.com>
>> ---
>> libavutil/thread.h | 8 +++++---
>> 1 file changed, 5 insertions(+), 3 deletions(-)
>>
>> diff --git a/libavutil/thread.h b/libavutil/thread.h
>> index 2c00c7cc35..0200b7b511 100644
>> --- a/libavutil/thread.h
>> +++ b/libavutil/thread.h
>> @@ -26,7 +26,9 @@
>>
>> #if HAVE_PRCTL
>> #include <sys/prctl.h>
>> -#elif (HAVE_PTHREAD_SETNAME_NP || HAVE_PTHREAD_SET_NAME_NP) && HAVE_PTHREAD_NP_H
>> +#elif ((defined(HAVE_PTHREAD_SETNAME_NP) && HAVE_PTHREAD_SETNAME_NP) \
>> + || (defined(HAVE_PTHREAD_SET_NAME_NP) && HAVE_PTHREAD_SET_NAME_NP)) \
>> + && HAVE_PTHREAD_NP_H
>> #include <pthread_np.h>
>> #endif
>>
>> @@ -219,7 +221,7 @@ static inline int ff_thread_setname(const char *name)
>>
>> #if HAVE_PRCTL
>> ret = AVERROR(prctl(PR_SET_NAME, name));
>> -#elif HAVE_PTHREAD_SETNAME_NP
>> +#elif defined(HAVE_PTHREAD_SETNAME_NP) && HAVE_PTHREAD_SETNAME_NP
>> #if defined(__APPLE__)
>> ret = AVERROR(pthread_setname_np(name));
>> #elif defined(__NetBSD__)
>> @@ -227,7 +229,7 @@ static inline int ff_thread_setname(const char *name)
>> #else
>> ret = AVERROR(pthread_setname_np(pthread_self(), name));
>> #endif
>> -#elif HAVE_PTHREAD_SET_NAME_NP
>> +#elif defined(HAVE_PTHREAD_SET_NAME_NP) && HAVE_PTHREAD_SET_NAME_NP
>> pthread_set_name_np(pthread_self(), name);
>> #else
>> ret = AVERROR(ENOSYS);
>
> You need to rerun configure. Since
> fd16d8c68cd7b820eda76c407b0645b7cf470efd running configure will add
> HAVE_PTHREAD_SET_NAME_NP and HAVE_PTHREAD_SETNAME_NP to your config.h file.
Ah, I see thanks. Sorry for the noise!
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2024-02-06 10:25 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-02-06 10:15 [FFmpeg-devel] [PATCH] lavu/thread: Check HAVE_PTHREAD_SET_?NAME_NP is defined post
2024-02-06 10:23 ` Andreas Rheinhardt
2024-02-06 10:24 ` Frank Plowman
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git