DISPATCH-2235: Dump time delay before lock is acquired

include/qpid/dispatch/threading.h

@@ -25,7 +25,7 @@
 
 typedef struct sys_mutex_t sys_mutex_t;
 
-sys_mutex_t *sys_mutex(void);
+sys_mutex_t *sys_mutex(const char *name);
 void         sys_mutex_free(sys_mutex_t *mutex);
 void         sys_mutex_lock(sys_mutex_t *mutex);
 void         sys_mutex_unlock(sys_mutex_t *mutex);
@@ -42,7 +42,7 @@ void        sys_cond_signal_all(sys_cond_t *cond);
 
 typedef struct sys_rwlock_t sys_rwlock_t;
 
-sys_rwlock_t *sys_rwlock(void);
+sys_rwlock_t *sys_rwlock(const char *name);
 void          sys_rwlock_free(sys_rwlock_t *lock);
 void          sys_rwlock_wrlock(sys_rwlock_t *lock);
 void          sys_rwlock_rdlock(sys_rwlock_t *lock);

src/adaptors/http1/http1_adaptor.c

@@ -642,7 +642,7 @@ static void qd_http1_adaptor_init(qdr_core_t *core, void **adaptor_context)
     ZERO(adaptor);
     adaptor->core    = core;
     adaptor->log = qd_log_source(QD_HTTP_LOG_SOURCE);
-    adaptor->lock = sys_mutex();
+    adaptor->lock = sys_mutex("HTTP1_ADAPTOR");
     DEQ_INIT(adaptor->listeners);
     DEQ_INIT(adaptor->connectors);
     DEQ_INIT(adaptor->connections);

src/adaptors/http2/http2_adaptor.c

@@ -2771,7 +2771,7 @@ static void qdr_http2_adaptor_init(qdr_core_t *core, void **adaptor_context)
                                             qdr_http_conn_trace);
     adaptor->log_source = qd_log_source(QD_HTTP_LOG_SOURCE);
     adaptor->protocol_log_source = qd_log_source("PROTOCOL");
-    adaptor->lock = sys_mutex();
+    adaptor->lock = sys_mutex("HTTP2_ADAPTOR");
     *adaptor_context = adaptor;
     DEQ_INIT(adaptor->listeners);
     DEQ_INIT(adaptor->connectors);

src/adaptors/tcp_adaptor.c

@@ -937,7 +937,7 @@ static qdr_tcp_connection_t *qdr_tcp_connection_ingress(qd_tcp_listener_t* liste
 {
     qdr_tcp_connection_t* tc = new_qdr_tcp_connection_t();
     ZERO(tc);
-    tc->activation_lock = sys_mutex();
+    tc->activation_lock = sys_mutex("TCP_ACTIVATION");
     tc->ingress = true;
     tc->context.context = tc;
     tc->context.handler = &handle_connection_event;
@@ -1046,7 +1046,7 @@ static qdr_tcp_connection_t *qdr_tcp_connection_egress(qd_tcp_bridge_t *config,
 {
     qdr_tcp_connection_t* tc = new_qdr_tcp_connection_t();
     ZERO(tc);
-    tc->activation_lock = sys_mutex();
+    tc->activation_lock = sys_mutex("TCP_ACTIVATION");
     if (initial_delivery) {
         tc->egress_dispatcher = false;
         tc->initial_delivery  = initial_delivery;
@@ -1099,7 +1099,7 @@ static qd_tcp_bridge_t *qd_bridge_config()
     if (!bc) return 0;
     ZERO(bc);
     sys_atomic_init(&bc->ref_count, 1);
-    bc->stats_lock = sys_mutex();
+    bc->stats_lock = sys_mutex("TCP_BRIDGE_STATS");
     return bc;
 }
 

src/alloc_pool.c

@@ -286,7 +286,13 @@ static void qd_alloc_init(qd_alloc_type_desc_t *desc)
         desc->global_pool = NEW(qd_alloc_pool_t);
         DEQ_ITEM_INIT(desc->global_pool);
         init_stack(&desc->global_pool->free_list);
-        desc->lock = sys_mutex();
+        {
+            size_t len = strlen(desc->type_name) + 6;
+            char *buf = qd_malloc(len);
+            snprintf(buf, len, "%s_pool", desc->type_name);
+            desc->lock = sys_mutex(buf);
+            free(buf);
+        }
         DEQ_INIT(desc->tpool_list);
         desc->stats = NEW(qd_alloc_stats_t);
         ZERO(desc->stats);
@@ -517,7 +523,7 @@ uint32_t qd_alloc_sequence(void *p)
 
 void qd_alloc_initialize(void)
 {
-    init_lock = sys_mutex();
+    init_lock = sys_mutex("ALLOC_INIT");
     DEQ_INIT(type_list);
 }
 

src/container.c

@@ -764,7 +764,7 @@ qd_container_t *qd_container(qd_dispatch_t *qd)
     container->server        = qd->server;
     container->node_type_map = qd_hash(6,  4, 1);  // 64 buckets, item batches of 4
     container->node_map      = qd_hash(10, 32, 0); // 1K buckets, item batches of 32
-    container->lock          = sys_mutex();
+    container->lock          = sys_mutex("CONTAINER");
     container->default_node  = 0;
     DEQ_INIT(container->nodes);
     DEQ_INIT(container->node_type_list);

src/entity_cache.c

@@ -52,7 +52,7 @@ static sys_mutex_t *event_lock = 0;
 static entity_event_list_t  event_list;
 
 void qd_entity_cache_initialize() {
-    event_lock = sys_mutex();
+    event_lock = sys_mutex("ENTITY_CACHE");
     DEQ_INIT(event_list);
 }
 

src/http-libwebsockets.c

@@ -230,7 +230,7 @@ static void work_queue_destroy(work_queue_t *wq) {
 }
 
 static void work_queue_init(work_queue_t *wq) {
-    wq->lock = sys_mutex();
+    wq->lock = sys_mutex("LWS_WORK_QUEUE");
     wq->cond = sys_cond();
 }
 

src/log.c

@@ -512,7 +512,7 @@ void qd_log_initialize(void)
     for (level_index_t i = NONE + 1; i < N_LEVELS; ++i)
         aprintf(&begin, end, ", %s", levels[i].name);
 
-    log_source_lock = sys_mutex();
+    log_source_lock = sys_mutex("LOG_SOURCE");
 
     default_log_source = qd_log_source(SOURCE_DEFAULT);
     default_log_source->mask = levels[INFO].mask;

src/message.c

@@ -1022,7 +1022,7 @@ qd_message_t *qd_message()
     }
 
     ZERO(msg->content);
-    msg->content->lock = sys_mutex();
+    msg->content->lock = sys_mutex("PER_MSG_CONTENT");
     sys_atomic_init(&msg->content->aborted, 0);
     sys_atomic_init(&msg->content->discard, 0);
     sys_atomic_init(&msg->content->ma_stream, 0);

src/policy.c

@@ -119,9 +119,9 @@ qd_policy_t *qd_policy(qd_dispatch_t *qd)
     policy->qd                   = qd;
     policy->log_source           = qd_log_source("POLICY");
     policy->max_connection_limit = 65535;
-    policy->tree_lock            = sys_mutex();
+    policy->tree_lock            = sys_mutex("POLICY_TREE");
     policy->hostname_tree        = qd_parse_tree_new(QD_PARSE_TREE_ADDRESS);
-    stats_lock                   = sys_mutex();
+    stats_lock                   = sys_mutex("POLICY_STATS");
     policy_log_source            = policy->log_source;
 
     qd_log(policy->log_source, QD_LOG_TRACE, "Policy Initialized");