Changeset: 811885a39495 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/811885a39495
Modified Files:
        clients/Tests/exports.stable.out
        gdk/gdk_logger.c
        gdk/gdk_system.c
        gdk/gdk_system.h
Branch: Mar2025
Log Message:

Fill in condition variable name when initializing.


diffs (55 lines):

diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -365,7 +365,7 @@ gdk_return MT_alloc_tls(MT_TLS_t *newkey
 int MT_check_nr_cores(void);
 void MT_cond_broadcast(MT_Cond *cond);
 void MT_cond_destroy(MT_Cond *cond);
-void MT_cond_init(MT_Cond *cond);
+void MT_cond_init(MT_Cond *cond, const char *name);
 void MT_cond_signal(MT_Cond *cond);
 void MT_cond_wait(MT_Cond *cond, MT_Lock *lock);
 int MT_create_thread(MT_Id *t, void (*function)(void *), void *arg, enum 
MT_thr_detach d, const char *threadname);
diff --git a/gdk/gdk_logger.c b/gdk/gdk_logger.c
--- a/gdk/gdk_logger.c
+++ b/gdk/gdk_logger.c
@@ -2478,7 +2478,7 @@ log_new(int debug, const char *fn, const
        MT_lock_init(&lg->lock, fn);
        MT_lock_init(&lg->rotation_lock, "rotation_lock");
        MT_lock_init(&lg->flush_lock, "flush_lock");
-       MT_cond_init(&lg->excl_flush_cv);
+       MT_cond_init(&lg->excl_flush_cv, "flush_cond");
 
        if (log_load(fn, lg, filename) == GDK_SUCCEED) {
                return lg;
diff --git a/gdk/gdk_system.c b/gdk/gdk_system.c
--- a/gdk/gdk_system.c
+++ b/gdk/gdk_system.c
@@ -1214,13 +1214,14 @@ MT_check_nr_cores(void)
 
 
 void
-MT_cond_init(MT_Cond *cond)
+MT_cond_init(MT_Cond *cond, const char *name)
 {
 #if !defined(HAVE_PTHREAD_H) && defined(WIN32)
        InitializeConditionVariable(&cond->cv);
 #else
        pthread_cond_init(&cond->cv, NULL);
 #endif
+       strcpy_len(cond->name, name, sizeof(cond->name));
 }
 
 
diff --git a/gdk/gdk_system.h b/gdk/gdk_system.h
--- a/gdk/gdk_system.h
+++ b/gdk/gdk_system.h
@@ -843,7 +843,7 @@ typedef struct MT_Cond {
 #  define MT_COND_INITIALIZER(N) { .cv = PTHREAD_COND_INITIALIZER, .name = #N }
 #endif
 
-gdk_export void MT_cond_init(MT_Cond *cond);
+gdk_export void MT_cond_init(MT_Cond *cond, const char *name);
 gdk_export void MT_cond_destroy(MT_Cond *cond);
 gdk_export void MT_cond_wait(MT_Cond *cond, MT_Lock *lock);
 gdk_export void MT_cond_signal(MT_Cond *cond);
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]

Reply via email to