Re: [Intel-gfx] [igt-dev] [PATCH i-g-t 3/6] igt/core: Fix build warning

2021-11-22 Thread Tvrtko Ursulin 



On 19/11/2021 15:54, Petri Latvala wrote:

On Fri, Nov 19, 2021 at 05:41:08PM +0200, Petri Latvala wrote:

On Fri, Nov 19, 2021 at 03:34:54PM +, Tvrtko Ursulin wrote:

On 19/11/2021 13:53, Petri Latvala wrote:

On Fri, Nov 19, 2021 at 12:59:42PM +, Tvrtko Ursulin wrote:

Okay I wasn't sufficiently focused while trying to fix this. No idea then
apart for playing with pragmas.



How's this:

diff --git a/lib/igt_core.c b/lib/igt_core.c
index ec05535c..6a4d0270 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -2727,6 +2727,8 @@ void igt_log(const char *domain, enum igt_log_level 
level, const char *format, .
  }
  
  static pthread_key_t __vlog_line_continuation;

+static const bool __dummy_true = true;
+static const bool __dummy_false = false;
  
  igt_constructor {

pthread_key_create(&__vlog_line_continuation, NULL);
@@ -2751,6 +2753,7 @@ void igt_vlog(const char *domain, enum igt_log_level 
level, const char *format,
FILE *file;
char *line, *formatted_line;
char *thread_id;
+   void *line_continuation;
const char *program_name;
const char *igt_log_level_str[] = {
"DEBUG",
@@ -2785,7 +2788,8 @@ void igt_vlog(const char *domain, enum igt_log_level 
level, const char *format,
if (vasprintf(, format, args) == -1)
return;
  
-	if (pthread_getspecific(__vlog_line_continuation)) {

+   line_continuation = pthread_getspecific(__vlog_line_continuation);
+   if (line_continuation != NULL && *(bool *)line_continuation) {
formatted_line = strdup(line);
if (!formatted_line)
goto out;
@@ -2796,9 +2800,9 @@ void igt_vlog(const char *domain, enum igt_log_level 
level, const char *format,
}
  
  	if (line[strlen(line) - 1] == '\n')

-   pthread_setspecific(__vlog_line_continuation, (void*) false);
+   pthread_setspecific(__vlog_line_continuation, &__dummy_false);
else
-   pthread_setspecific(__vlog_line_continuation, (void*) true);
+   pthread_setspecific(__vlog_line_continuation, &__dummy_true);
  
  	/* append log buffer */

_igt_log_buffer_append(formatted_line);
diff --git a/lib/igt_thread.c b/lib/igt_thread.c
index 5bdda410..0d7bce80 100644
--- a/lib/igt_thread.c
+++ b/lib/igt_thread.c
@@ -29,6 +29,7 @@
  #include "igt_thread.h"
  
  static pthread_key_t __igt_is_main_thread;

+static const bool __dummy_true = true;
  
  static _Atomic(bool) __thread_failed = false;
  
@@ -65,5 +66,5 @@ bool igt_thread_is_main(void)
  
  igt_constructor {

pthread_key_create(&__igt_is_main_thread, NULL);
-   pthread_setspecific(__igt_is_main_thread, (void*) 0x1);
+   pthread_setspecific(__igt_is_main_thread, &__dummy_true);


LGTM.

Regards,

Tvrtko

Re: [Intel-gfx] [igt-dev] [PATCH i-g-t 3/6] igt/core: Fix build warning

2021-11-19 Thread Petri Latvala 
On Fri, Nov 19, 2021 at 05:41:08PM +0200, Petri Latvala wrote:
> On Fri, Nov 19, 2021 at 03:34:54PM +, Tvrtko Ursulin wrote:
> > On 19/11/2021 13:53, Petri Latvala wrote:
> > > On Fri, Nov 19, 2021 at 12:59:42PM +, Tvrtko Ursulin wrote:
> > Okay I wasn't sufficiently focused while trying to fix this. No idea then
> > apart for playing with pragmas.


How's this:

diff --git a/lib/igt_core.c b/lib/igt_core.c
index ec05535c..6a4d0270 100644
--- a/lib/igt_core.c
+++ b/lib/igt_core.c
@@ -2727,6 +2727,8 @@ void igt_log(const char *domain, enum igt_log_level 
level, const char *format, .
 }
 
 static pthread_key_t __vlog_line_continuation;
+static const bool __dummy_true = true;
+static const bool __dummy_false = false;
 
 igt_constructor {
pthread_key_create(&__vlog_line_continuation, NULL);
@@ -2751,6 +2753,7 @@ void igt_vlog(const char *domain, enum igt_log_level 
level, const char *format,
FILE *file;
char *line, *formatted_line;
char *thread_id;
+   void *line_continuation;
const char *program_name;
const char *igt_log_level_str[] = {
"DEBUG",
@@ -2785,7 +2788,8 @@ void igt_vlog(const char *domain, enum igt_log_level 
level, const char *format,
if (vasprintf(, format, args) == -1)
return;
 
-   if (pthread_getspecific(__vlog_line_continuation)) {
+   line_continuation = pthread_getspecific(__vlog_line_continuation);
+   if (line_continuation != NULL && *(bool *)line_continuation) {
formatted_line = strdup(line);
if (!formatted_line)
goto out;
@@ -2796,9 +2800,9 @@ void igt_vlog(const char *domain, enum igt_log_level 
level, const char *format,
}
 
if (line[strlen(line) - 1] == '\n')
-   pthread_setspecific(__vlog_line_continuation, (void*) false);
+   pthread_setspecific(__vlog_line_continuation, &__dummy_false);
else
-   pthread_setspecific(__vlog_line_continuation, (void*) true);
+   pthread_setspecific(__vlog_line_continuation, &__dummy_true);
 
/* append log buffer */
_igt_log_buffer_append(formatted_line);
diff --git a/lib/igt_thread.c b/lib/igt_thread.c
index 5bdda410..0d7bce80 100644
--- a/lib/igt_thread.c
+++ b/lib/igt_thread.c
@@ -29,6 +29,7 @@
 #include "igt_thread.h"
 
 static pthread_key_t __igt_is_main_thread;
+static const bool __dummy_true = true;
 
 static _Atomic(bool) __thread_failed = false;
 
@@ -65,5 +66,5 @@ bool igt_thread_is_main(void)
 
 igt_constructor {
pthread_key_create(&__igt_is_main_thread, NULL);
-   pthread_setspecific(__igt_is_main_thread, (void*) 0x1);
+   pthread_setspecific(__igt_is_main_thread, &__dummy_true);
 }