Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Knot DNS
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
22
Issues
22
List
Boards
Labels
Service Desk
Milestones
Merge Requests
16
Merge Requests
16
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Knot projects
Knot DNS
Commits
00e66824
Commit
00e66824
authored
Jan 20, 2016
by
Daniel Salzman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
server: fix ambiguous variable name in for cycles
parent
dc880427
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
13 deletions
+13
-13
src/knot/server/server.c
src/knot/server/server.c
+13
-13
No files found.
src/knot/server/server.c
View file @
00e66824
...
...
@@ -285,9 +285,9 @@ static int reconfigure_sockets(conf_t *conf, server_t *s)
/* Wait for readers that are reconfiguring right now. */
/*! \note This subsystem will be reworked in #239 */
for
(
unsigned
i
=
IO_UDP
;
i
<=
IO_TCP
;
++
i
)
{
dt_unit_t
*
tu
=
s
->
handlers
[
i
].
handler
.
unit
;
iohandler_t
*
ioh
=
&
s
->
handlers
[
i
].
handler
;
for
(
unsigned
proto
=
IO_UDP
;
proto
<=
IO_TCP
;
++
proto
)
{
dt_unit_t
*
tu
=
s
->
handlers
[
proto
].
handler
.
unit
;
iohandler_t
*
ioh
=
&
s
->
handlers
[
proto
].
handler
;
for
(
unsigned
i
=
0
;
i
<
tu
->
size
;
++
i
)
{
while
(
ioh
->
thread_state
[
i
]
&
ServerReload
)
{
sleep
(
1
);
...
...
@@ -300,12 +300,12 @@ static int reconfigure_sockets(conf_t *conf, server_t *s)
/* Update TCP+UDP ifacelist (reload all threads). */
unsigned
thread_count
=
0
;
for
(
unsigned
i
=
IO_UDP
;
i
<=
IO_TCP
;
++
i
)
{
dt_unit_t
*
tu
=
s
->
handlers
[
i
].
handler
.
unit
;
for
(
unsigned
proto
=
IO_UDP
;
proto
<=
IO_TCP
;
++
proto
)
{
dt_unit_t
*
tu
=
s
->
handlers
[
proto
].
handler
.
unit
;
for
(
unsigned
i
=
0
;
i
<
tu
->
size
;
++
i
)
{
ref_retain
((
ref_t
*
)
newlist
);
s
->
handlers
[
i
].
handler
.
thread_state
[
i
]
|=
ServerReload
;
s
->
handlers
[
i
].
handler
.
thread_id
[
i
]
=
thread_count
++
;
s
->
handlers
[
proto
].
handler
.
thread_state
[
i
]
|=
ServerReload
;
s
->
handlers
[
proto
].
handler
.
thread_id
[
i
]
=
thread_count
++
;
if
(
s
->
state
&
ServerRunning
)
{
dt_activate
(
tu
->
threads
[
i
]);
dt_signalize
(
tu
->
threads
[
i
],
SIGALRM
);
...
...
@@ -441,9 +441,9 @@ int server_start(server_t *server, bool async)
/* Start I/O handlers. */
server
->
state
|=
ServerRunning
;
for
(
int
i
=
IO_UDP
;
i
<=
IO_TCP
;
++
i
)
{
if
(
server
->
handlers
[
i
].
size
>
0
)
{
int
ret
=
dt_start
(
server
->
handlers
[
i
].
handler
.
unit
);
for
(
int
proto
=
IO_UDP
;
proto
<=
IO_TCP
;
++
proto
)
{
if
(
server
->
handlers
[
proto
].
size
>
0
)
{
int
ret
=
dt_start
(
server
->
handlers
[
proto
].
handler
.
unit
);
if
(
ret
!=
KNOT_EOK
)
{
return
ret
;
}
...
...
@@ -462,9 +462,9 @@ void server_wait(server_t *server)
evsched_join
(
&
server
->
sched
);
worker_pool_join
(
server
->
workers
);
for
(
int
i
=
IO_UDP
;
i
<=
IO_TCP
;
++
i
)
{
if
(
server
->
handlers
[
i
].
size
>
0
)
{
server_free_handler
(
&
server
->
handlers
[
i
].
handler
);
for
(
int
proto
=
IO_UDP
;
proto
<=
IO_TCP
;
++
proto
)
{
if
(
server
->
handlers
[
proto
].
size
>
0
)
{
server_free_handler
(
&
server
->
handlers
[
proto
].
handler
);
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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