Skip to content

Commit e3b3401

Browse files
Merge branch 'hpc-gridware:master' into master
2 parents cf3e5c7 + 22898a5 commit e3b3401

File tree

1 file changed

+8
-13
lines changed

1 file changed

+8
-13
lines changed

source/libs/comm/cl_commlib.cc

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -764,7 +764,7 @@ int cl_com_setup_commlib(cl_thread_mode_t t_mode, cl_log_t debug_level, cl_log_f
764764
ret_val = cl_thread_list_create_thread(cl_com_thread_list,
765765
&thread_p,
766766
cl_com_log_list,
767-
"com-trigger", 1, cl_com_trigger_thread, nullptr, nullptr,
767+
"trigger_thread", 1, cl_com_trigger_thread, nullptr, nullptr,
768768
CL_TT_COMMLIB);
769769
pthread_sigmask(SIG_SETMASK, &old_sigmask, nullptr);
770770
}
@@ -976,6 +976,7 @@ cl_com_handle_t *cl_com_create_handle(int *commlib_error,
976976
int usec_rest = 0;
977977
int full_usec_seconds = 0;
978978
int sec_param = 0;
979+
char help_buffer[80];
979980
char *local_hostname = nullptr;
980981
struct in_addr local_addr;
981982
cl_handle_list_elem_t *elem = nullptr;
@@ -1524,14 +1525,15 @@ cl_com_handle_t *cl_com_create_handle(int *commlib_error,
15241525

15251526

15261527
CL_LOG(CL_LOG_INFO, "starting handle service thread ...");
1528+
snprintf(help_buffer, 80, "%s_service", new_handle->local->comp_name);
15271529
{
15281530
sigset_t old_sigmask;
15291531
sge_thread_block_all_signals(&old_sigmask);
15301532

15311533
return_value = cl_thread_list_create_thread(cl_com_thread_list,
15321534
&(new_handle->service_thread),
15331535
cl_com_log_list,
1534-
"com-service", 2, cl_com_handle_service_thread, nullptr,
1536+
help_buffer, 2, cl_com_handle_service_thread, nullptr,
15351537
(void *) new_handle, CL_TT_COMMLIB);
15361538

15371539
pthread_sigmask(SIG_SETMASK, &old_sigmask, nullptr);
@@ -1544,6 +1546,7 @@ cl_com_handle_t *cl_com_create_handle(int *commlib_error,
15441546
}
15451547

15461548
CL_LOG(CL_LOG_INFO, "starting handle read thread ...");
1549+
snprintf(help_buffer, 80, "%s_read", new_handle->local->comp_name);
15471550

15481551
{
15491552
sigset_t old_sigmask;
@@ -1570,7 +1573,7 @@ cl_com_handle_t *cl_com_create_handle(int *commlib_error,
15701573
return_value = cl_thread_list_create_thread(cl_com_thread_list,
15711574
&(new_handle->read_thread),
15721575
cl_com_log_list,
1573-
"com-read", 3, cl_com_handle_read_thread,
1576+
help_buffer, 3, cl_com_handle_read_thread,
15741577
cl_thread_read_write_thread_cleanup_function,
15751578
(void *) thread_data, CL_TT_COMMLIB);
15761579
pthread_sigmask(SIG_SETMASK, &old_sigmask, nullptr);
@@ -1584,6 +1587,7 @@ cl_com_handle_t *cl_com_create_handle(int *commlib_error,
15841587
}
15851588

15861589
CL_LOG(CL_LOG_INFO, "starting handle write thread ...");
1590+
snprintf(help_buffer, 80, "%s_write", new_handle->local->comp_name);
15871591

15881592
{
15891593
sigset_t old_sigmask;
@@ -1610,7 +1614,7 @@ cl_com_handle_t *cl_com_create_handle(int *commlib_error,
16101614
return_value = cl_thread_list_create_thread(cl_com_thread_list,
16111615
&(new_handle->write_thread),
16121616
cl_com_log_list,
1613-
"com-write", 2, cl_com_handle_write_thread,
1617+
help_buffer, 2, cl_com_handle_write_thread,
16141618
cl_thread_read_write_thread_cleanup_function,
16151619
(void *) thread_data, CL_TT_COMMLIB);
16161620
pthread_sigmask(SIG_SETMASK, &old_sigmask, nullptr);
@@ -7761,12 +7765,3 @@ unsigned long cl_com_messages_in_send_queue(cl_com_handle_t *handle) {
77617765
return elems;
77627766
}
77637767

7764-
cl_raw_list_t *
7765-
cl_com_get_thread_list() {
7766-
pthread_mutex_lock(&cl_com_thread_list_mutex);
7767-
cl_raw_list_t* thread_list = cl_com_thread_list;
7768-
pthread_mutex_unlock(&cl_com_thread_list_mutex);
7769-
return thread_list;
7770-
}
7771-
7772-

0 commit comments

Comments
 (0)