Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Joe Martin
OpenLDAP
Commits
a0ec50b3
Commit
a0ec50b3
authored
Nov 22, 2017
by
Ondřej Kuzník
Committed by
Ondřej Kuzník
Nov 17, 2020
Browse files
Upstream queues ordered by c_connid
In preparation for operation timeout events.
parent
0cfd4fca
Changes
2
Hide whitespace changes
Inline
Side-by-side
servers/lloadd/slap.h
View file @
a0ec50b3
...
...
@@ -275,6 +275,7 @@ struct Backend {
int
b_bindavail
,
b_active
,
b_opening
;
LDAP_CIRCLEQ_HEAD
(
ConnSt
,
Connection
)
b_conns
,
b_bindconns
,
b_preparing
;
LDAP_LIST_HEAD
(
ConnectingSt
,
PendingConnection
)
b_connecting
;
Connection
*
b_last_conn
,
*
b_last_bindconn
;
long
b_max_pending
,
b_max_conn_pending
;
long
b_n_ops_executing
;
...
...
servers/lloadd/upstream.c
View file @
a0ec50b3
...
...
@@ -300,10 +300,16 @@ upstream_bind_cb( Connection *c )
CONNECTION_UNLOCK_INCREF
(
c
);
ldap_pvt_thread_mutex_lock
(
&
b
->
b_mutex
);
LDAP_CIRCLEQ_REMOVE
(
&
b
->
b_preparing
,
c
,
c_next
);
LDAP_CIRCLEQ_INSERT_HEAD
(
&
b
->
b_conns
,
c
,
c_next
);
b
->
b_active
++
;
b
->
b_opening
--
;
b
->
b_failed
=
0
;
if
(
b
->
b_last_conn
)
{
LDAP_CIRCLEQ_INSERT_AFTER
(
&
b
->
b_conns
,
b
->
b_last_conn
,
c
,
c_next
);
}
else
{
LDAP_CIRCLEQ_INSERT_HEAD
(
&
b
->
b_conns
,
c
,
c_next
);
}
b
->
b_last_conn
=
c
;
ldap_pvt_thread_mutex_unlock
(
&
b
->
b_mutex
);
backend_retry
(
b
);
CONNECTION_LOCK_DECREF
(
c
);
...
...
@@ -407,20 +413,31 @@ upstream_finish( Connection *c )
if
(
is_bindconn
)
{
LDAP_CIRCLEQ_REMOVE
(
&
b
->
b_preparing
,
c
,
c_next
);
LDAP_CIRCLEQ_INSERT_HEAD
(
&
b
->
b_bindconns
,
c
,
c_next
);
c
->
c_state
=
LLOAD_C_READY
;
c
->
c_type
=
LLOAD_C_BIND
;
b
->
b_bindavail
++
;
b
->
b_opening
--
;
b
->
b_failed
=
0
;
if
(
b
->
b_last_bindconn
)
{
LDAP_CIRCLEQ_INSERT_AFTER
(
&
b
->
b_bindconns
,
b
->
b_last_bindconn
,
c
,
c_next
);
}
else
{
LDAP_CIRCLEQ_INSERT_HEAD
(
&
b
->
b_bindconns
,
c
,
c_next
);
}
b
->
b_last_bindconn
=
c
;
}
else
if
(
bindconf
.
sb_method
==
LDAP_AUTH_NONE
)
{
LDAP_CIRCLEQ_REMOVE
(
&
b
->
b_preparing
,
c
,
c_next
);
LDAP_CIRCLEQ_INSERT_HEAD
(
&
b
->
b_conns
,
c
,
c_next
);
c
->
c_state
=
LLOAD_C_READY
;
c
->
c_type
=
LLOAD_C_OPEN
;
b
->
b_active
++
;
b
->
b_opening
--
;
b
->
b_failed
=
0
;
if
(
b
->
b_last_conn
)
{
LDAP_CIRCLEQ_INSERT_AFTER
(
&
b
->
b_conns
,
b
->
b_last_conn
,
c
,
c_next
);
}
else
{
LDAP_CIRCLEQ_INSERT_HEAD
(
&
b
->
b_conns
,
c
,
c_next
);
}
b
->
b_last_conn
=
c
;
}
else
{
rc
=
1
;
ldap_pvt_thread_pool_submit
(
&
connection_pool
,
upstream_bind
,
c
);
...
...
@@ -769,9 +786,27 @@ upstream_destroy( Connection *c )
b
->
b_opening
--
;
b
->
b_failed
++
;
}
else
if
(
c
->
c_type
==
LLOAD_C_BIND
)
{
if
(
c
==
b
->
b_last_bindconn
)
{
Connection
*
prev
=
LDAP_CIRCLEQ_LOOP_PREV
(
&
b
->
b_bindconns
,
c
,
c_next
);
if
(
prev
==
c
)
{
b
->
b_last_bindconn
=
NULL
;
}
else
{
b
->
b_last_bindconn
=
prev
;
}
}
LDAP_CIRCLEQ_REMOVE
(
&
b
->
b_bindconns
,
c
,
c_next
);
b
->
b_bindavail
--
;
}
else
{
if
(
c
==
b
->
b_last_conn
)
{
Connection
*
prev
=
LDAP_CIRCLEQ_LOOP_PREV
(
&
b
->
b_conns
,
c
,
c_next
);
if
(
prev
==
c
)
{
b
->
b_last_conn
=
NULL
;
}
else
{
b
->
b_last_conn
=
prev
;
}
}
LDAP_CIRCLEQ_REMOVE
(
&
b
->
b_conns
,
c
,
c_next
);
b
->
b_active
--
;
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment