From 41b35d978e05963c0858aa35bb7b59f59ca007c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sur=C3=BD?= Date: Wed, 11 Sep 2019 10:31:48 +0200 Subject: [PATCH] Update the whitespaces --- lib/isc/include/isc/netmgr.h | 1 + lib/isc/include/isc/task.h | 2 +- lib/isc/netmgr/netmgr-int.h | 6 +++--- lib/isc/task.c | 8 ++++---- lib/ns/client.c | 3 +-- lib/ns/interfacemgr.c | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lib/isc/include/isc/netmgr.h b/lib/isc/include/isc/netmgr.h index f5e1a1ac4e..a0ad7088e5 100644 --- a/lib/isc/include/isc/netmgr.h +++ b/lib/isc/include/isc/netmgr.h @@ -8,6 +8,7 @@ * See the COPYRIGHT file distributed with this work for additional * information regarding copyright ownership. */ + #pragma once #include diff --git a/lib/isc/include/isc/task.h b/lib/isc/include/isc/task.h index bf7f5cda36..0d241c6720 100644 --- a/lib/isc/include/isc/task.h +++ b/lib/isc/include/isc/task.h @@ -641,7 +641,7 @@ isc_taskmgr_createinctx(isc_mem_t *mctx, isc_taskmgr_t **managerp); isc_result_t isc_taskmgr_create(isc_mem_t *mctx, unsigned int workers, - unsigned int default_quantum, + unsigned int default_quantum, isc_nm_t *nm, isc_taskmgr_t **managerp); /*%< * Create a new task manager. isc_taskmgr_createinctx() also associates diff --git a/lib/isc/netmgr/netmgr-int.h b/lib/isc/netmgr/netmgr-int.h index eeaa51c1b5..095359a501 100644 --- a/lib/isc/netmgr/netmgr-int.h +++ b/lib/isc/netmgr/netmgr-int.h @@ -41,7 +41,7 @@ typedef struct isc__networker { int id; /* thread id */ uv_loop_t loop; /* libuv loop structure */ uv_async_t async; /* async channel to send - * data to this networker */ + * data to this networker */ isc_mutex_t lock; isc_mempool_t * mpool_bufs; isc_condition_t cond; @@ -76,7 +76,7 @@ struct isc_nmhandle { * handles when we're destroying the socket. */ isc_nmsocket_t * socket; size_t ah_pos; /* Position in socket active handles - * array */ + * array */ /* The handle is 'inflight' if netmgr is not currently processing it in * any way - it might mean that e.g. a recursive resolution is * happening. For an inflight handle we must wait for the calling @@ -151,7 +151,7 @@ typedef struct isc__nm_uvreq { int magic; isc_nm_t * mgr; uv_buf_t uvbuf; /* translated isc_region_t, to be sent or - * received */ + * received */ isc_sockaddr_t local; /* local address */ isc_sockaddr_t peer; /* peer address */ isc__nm_cb_t cb; /* callback */ diff --git a/lib/isc/task.c b/lib/isc/task.c index d4671b5192..9f7dd69e38 100644 --- a/lib/isc/task.c +++ b/lib/isc/task.c @@ -1647,12 +1647,12 @@ isc_task_pause(isc_task_t *task0) { task->state = task_state_paused; UNLOCK(&task->lock); /* XXXWPK TODO optimize it - 'lazy' removal in runner? */ - LOCK(&manager->queues[task->threadid].lock); + LOCK(&manager->queues[task->threadid].lock); if (ISC_LINK_LINKED(task, ready_link)) { - DEQUEUE(manager->queues[task->threadid].ready_tasks, - task, ready_link); + DEQUEUE(manager->queues[task->threadid].ready_tasks, + task, ready_link); } - UNLOCK(&manager->queues[task->threadid].lock); + UNLOCK(&manager->queues[task->threadid].lock); } void diff --git a/lib/ns/client.c b/lib/ns/client.c index b281e17b4f..fc0cc23beb 100644 --- a/lib/ns/client.c +++ b/lib/ns/client.c @@ -623,7 +623,7 @@ client_allocsendbuf(ns_client_t *client, isc_buffer_t *buffer, isc_buffer_init(tcpbuffer, data, NS_CLIENT_TCP_BUFFER_SIZE); isc_buffer_init(buffer, data, - NS_CLIENT_TCP_BUFFER_SIZE); + NS_CLIENT_TCP_BUFFER_SIZE); } else { isc_buffer_init(buffer, data, NS_CLIENT_TCP_BUFFER_SIZE); @@ -1919,7 +1919,6 @@ ns__client_request(void *arg, LOCK(&mgr->listlock); ISC_LIST_APPEND(mgr->clients, client, link); UNLOCK(&mgr->listlock); - } isc_task_pause(client->task); if (client->handle == NULL) { diff --git a/lib/ns/interfacemgr.c b/lib/ns/interfacemgr.c index 94610fe2c0..da23596228 100644 --- a/lib/ns/interfacemgr.c +++ b/lib/ns/interfacemgr.c @@ -446,7 +446,7 @@ static isc_result_t ns_interface_listenudp(ns_interface_t *ifp) { isc_result_t result; /* XXXWPK TODO we have to increase refcount on ifp, for both UDP and TCP */ - result = isc_nm_udp_listen(ifp->mgr->nm, + result = isc_nm_udp_listen(ifp->mgr->nm, (isc_nmiface_t*) &ifp->addr, /* XXXWPK TODO! */ ns__client_request, sizeof(ns_client_t),