upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-12-21 15:19:34 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

ITS#9596 Let others wait on the startup readiness indication

Browse source
This commit is contained in:
Ondřej Kuzník 2021-05-12 11:03:05 +01:00 committed by Quanah Gibson-Mount
parent 544a7c8839
commit b7390f1710
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
servers/slapd/daemon.c
View file

@ -2612,7 +2612,7 @@ slapd_daemon_task(
sock_errstr(err, ebuf, sizeof(ebuf)) ); sock_errstr(err, ebuf, sizeof(ebuf)) );
ldap_pvt_thread_mutex_lock( &slapd_init_mutex ); ldap_pvt_thread_mutex_lock( &slapd_init_mutex );
slapd_shutdown = 2; slapd_shutdown = 2;
ldap_pvt_thread_cond_signal( &slapd_init_cond ); ldap_pvt_thread_cond_broadcast( &slapd_init_cond );
ldap_pvt_thread_mutex_unlock( &slapd_init_mutex ); ldap_pvt_thread_mutex_unlock( &slapd_init_mutex );
return (void*)-1; return (void*)-1;
} }
@ -2623,7 +2623,7 @@ slapd_daemon_task(
"set nonblocking on a listening socket failed\n" ); "set nonblocking on a listening socket failed\n" );
ldap_pvt_thread_mutex_lock( &slapd_init_mutex ); ldap_pvt_thread_mutex_lock( &slapd_init_mutex );
slapd_shutdown = 2; slapd_shutdown = 2;
ldap_pvt_thread_cond_signal( &slapd_init_cond ); ldap_pvt_thread_cond_broadcast( &slapd_init_cond );
ldap_pvt_thread_mutex_unlock( &slapd_init_mutex ); ldap_pvt_thread_mutex_unlock( &slapd_init_mutex );
return (void*)-1; return (void*)-1;
} }
@ -2633,7 +2633,7 @@ slapd_daemon_task(
ldap_pvt_thread_mutex_lock( &slapd_init_mutex ); ldap_pvt_thread_mutex_lock( &slapd_init_mutex );
slapd_ready = 1; slapd_ready = 1;
ldap_pvt_thread_cond_signal( &slapd_init_cond ); ldap_pvt_thread_cond_broadcast( &slapd_init_cond );
ldap_pvt_thread_mutex_unlock( &slapd_init_mutex ); ldap_pvt_thread_mutex_unlock( &slapd_init_mutex );
#ifdef HAVE_NT_SERVICE_MANAGER #ifdef HAVE_NT_SERVICE_MANAGER

1
servers/slapd/proto-slap.h
View file

@ -905,6 +905,7 @@ LDAP_SLAPD_V (SOCKET *) slapd_ws_sockets;
LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) slapd_init_mutex; LDAP_SLAPD_V (ldap_pvt_thread_mutex_t) slapd_init_mutex;
LDAP_SLAPD_V (ldap_pvt_thread_cond_t) slapd_init_cond; LDAP_SLAPD_V (ldap_pvt_thread_cond_t) slapd_init_cond;
LDAP_SLAPD_V (int) slapd_ready;
/* /*
* dn.c * dn.c