[PATCH 07/18] Replaced nxt_inline in .h files by inline.

Alejandro Colomar alx.manpages at gmail.com
Thu Jun 2 18:05:01 UTC 2022


Keep the nxt_always_inline to avoid changing behavior.

I put the attributes in a line preceeding the return type of the
function, since it seems to me a bit more readable.
---
 src/nxt_app_queue.h       | 15 ++++++++++-----
 src/nxt_array.h           |  6 ++++--
 src/nxt_atomic.h          |  9 ++++++---
 src/nxt_buf.h             | 12 ++++++++----
 src/nxt_event_engine.h    |  3 ++-
 src/nxt_hash.h            |  9 ++++++---
 src/nxt_http.h            |  3 ++-
 src/nxt_http_parse.h      |  3 ++-
 src/nxt_list.h            |  6 ++++--
 src/nxt_port.h            |  6 ++++--
 src/nxt_port_memory_int.h | 30 ++++++++++++++++++++----------
 src/nxt_port_queue.h      |  9 ++++++---
 src/nxt_rbtree.h          |  6 ++++--
 src/nxt_socket_msg.h      |  9 ++++++---
 src/nxt_string.h          |  3 ++-
 src/nxt_thread_id.h       | 24 ++++++++++++++++--------
 src/nxt_thread_log.h      |  3 ++-
 src/nxt_timer.h           |  3 ++-
 src/nxt_utf8.h            |  3 ++-
 src/nxt_var.h             |  3 ++-
 src/nxt_vector.h          |  3 ++-
 src/test/nxt_rbtree1.h    |  3 ++-
 src/test/nxt_tests.h      |  3 ++-
 23 files changed, 116 insertions(+), 58 deletions(-)

diff --git a/src/nxt_app_queue.h b/src/nxt_app_queue.h
index a1cc2f1..22aa1a1 100644
--- a/src/nxt_app_queue.h
+++ b/src/nxt_app_queue.h
@@ -30,7 +30,8 @@ typedef struct {
 } nxt_app_queue_t;
 
 
-nxt_inline void
+nxt_always_inline
+inline void
 nxt_app_queue_init(nxt_app_queue_t volatile *q)
 {
     nxt_app_nncq_atomic_t  i;
@@ -46,7 +47,8 @@ nxt_app_queue_init(nxt_app_queue_t volatile *q)
 }
 
 
-nxt_inline nxt_int_t
+nxt_always_inline
+inline nxt_int_t
 nxt_app_queue_send(nxt_app_queue_t volatile *q, const void *p,
     uint8_t size, uint32_t tracking, int *notify, uint32_t *cookie)
 {
@@ -78,14 +80,16 @@ nxt_app_queue_send(nxt_app_queue_t volatile *q, const void *p,
 }
 
 
-nxt_inline void
+nxt_always_inline
+inline void
 nxt_app_queue_notification_received(nxt_app_queue_t volatile *q)
 {
     q->notified = 0;
 }
 
 
-nxt_inline nxt_bool_t
+nxt_always_inline
+inline nxt_bool_t
 nxt_app_queue_cancel(nxt_app_queue_t volatile *q, uint32_t cookie,
     uint32_t tracking)
 {
@@ -97,7 +101,8 @@ nxt_app_queue_cancel(nxt_app_queue_t volatile *q, uint32_t cookie,
 }
 
 
-nxt_inline ssize_t
+nxt_always_inline
+inline ssize_t
 nxt_app_queue_recv(nxt_app_queue_t volatile *q, void *p, uint32_t *cookie)
 {
     ssize_t                res;
diff --git a/src/nxt_array.h b/src/nxt_array.h
index f06ff14..548548f 100644
--- a/src/nxt_array.h
+++ b/src/nxt_array.h
@@ -18,7 +18,8 @@ typedef struct {
 } nxt_array_t;
 
 
-nxt_inline void
+nxt_always_inline
+inline void
 nxt_array_init(nxt_array_t *array, nxt_mp_t *mp, size_t size)
 {
     array->elts = nxt_pointer_to(array, sizeof(nxt_array_t));
@@ -47,7 +48,8 @@ NXT_EXPORT nxt_array_t *nxt_array_copy(nxt_mp_t *mp, nxt_array_t *dst,
     ((array)->nelts == 0)
 
 
-nxt_inline void *
+nxt_always_inline
+inline void *
 nxt_array_remove_last(nxt_array_t *array)
 {
     array->nelts--;
diff --git a/src/nxt_atomic.h b/src/nxt_atomic.h
index cd2e725..7d13aad 100644
--- a/src/nxt_atomic.h
+++ b/src/nxt_atomic.h
@@ -166,7 +166,8 @@ typedef unsigned long               nxt_atomic_uint_t;
 typedef volatile nxt_atomic_int_t   nxt_atomic_t;
 
 
-nxt_inline nxt_bool_t
+nxt_always_inline
+inline nxt_bool_t
 nxt_atomic_cmp_set(nxt_atomic_t *lock, nxt_atomic_int_t cmp,
     nxt_atomic_int_t set)
 {
@@ -193,7 +194,8 @@ typedef unsigned int                nxt_atomic_uint_t;
 typedef volatile nxt_atomic_int_t   nxt_atomic_t;
 
 
-nxt_inline nxt_bool_t
+nxt_always_inline
+inline nxt_bool_t
 nxt_atomic_cmp_set(nxt_atomic_t *lock, nxt_atomic_int_t cmp,
     nxt_atomic_int_t set)
 {
@@ -240,7 +242,8 @@ nxt_atomic_cmp_set(nxt_atomic_t *lock, nxt_atomic_int_t cmp,
  * the lock is granted.
  */
 
-nxt_inline nxt_bool_t
+nxt_always_inline
+inline nxt_bool_t
 nxt_atomic_try_lock(nxt_atomic_t *lock)
 {
     if (nxt_atomic_cmp_set(lock, 0, 1)) {
diff --git a/src/nxt_buf.h b/src/nxt_buf.h
index f1e2879..65769d9 100644
--- a/src/nxt_buf.h
+++ b/src/nxt_buf.h
@@ -227,7 +227,8 @@ NXT_EXPORT void nxt_buf_parent_completion(nxt_task_t *task, nxt_buf_t *parent);
 NXT_EXPORT nxt_buf_t *nxt_buf_make_plain(nxt_mp_t *mp, nxt_buf_t *src,
     size_t size);
 
-nxt_inline nxt_buf_t *
+nxt_always_inline
+inline nxt_buf_t *
 nxt_buf_chk_make_plain(nxt_mp_t *mp, nxt_buf_t *src, size_t size)
 {
     if (nxt_slow_path(src != NULL && src->next != NULL)) {
@@ -244,7 +245,8 @@ nxt_buf_chk_make_plain(nxt_mp_t *mp, nxt_buf_t *src, size_t size)
 NXT_EXPORT void nxt_buf_chain_add(nxt_buf_t **head, nxt_buf_t *in);
 NXT_EXPORT size_t nxt_buf_chain_length(nxt_buf_t *b);
 
-nxt_inline nxt_buf_t *
+nxt_always_inline
+inline nxt_buf_t *
 nxt_buf_cpy(nxt_buf_t *b, const void *src, size_t length)
 {
     nxt_memcpy(b->mem.free, src, length);
@@ -253,14 +255,16 @@ nxt_buf_cpy(nxt_buf_t *b, const void *src, size_t length)
     return b;
 }
 
-nxt_inline nxt_buf_t *
+nxt_always_inline
+inline nxt_buf_t *
 nxt_buf_cpystr(nxt_buf_t *b, const nxt_str_t *str)
 {
     return nxt_buf_cpy(b, str->start, str->length);
 }
 
 
-nxt_inline void
+nxt_always_inline
+inline void
 nxt_buf_dummy_completion(nxt_task_t *task, void *obj, void *data)
 {
 }
diff --git a/src/nxt_event_engine.h b/src/nxt_event_engine.h
index 91cfc0a..1a55ae1 100644
--- a/src/nxt_event_engine.h
+++ b/src/nxt_event_engine.h
@@ -514,7 +514,8 @@ void nxt_event_engine_buf_mem_completion(nxt_task_t *task, void *obj,
     void *data);
 
 
-nxt_inline nxt_event_engine_t *
+nxt_always_inline
+inline nxt_event_engine_t *
 nxt_thread_event_engine(void)
 {
     nxt_thread_t  *thr;
diff --git a/src/nxt_hash.h b/src/nxt_hash.h
index 01c727d..aea6a5b 100644
--- a/src/nxt_hash.h
+++ b/src/nxt_hash.h
@@ -15,7 +15,8 @@ typedef struct {
 } nxt_hash_t;
 
 
-nxt_inline nxt_int_t
+nxt_always_inline
+inline nxt_int_t
 nxt_hash_find(nxt_hash_t *h, nxt_lvlhsh_query_t *lhq)
 {
     lhq->proto = h->proto;
@@ -24,7 +25,8 @@ nxt_hash_find(nxt_hash_t *h, nxt_lvlhsh_query_t *lhq)
 }
 
 
-nxt_inline nxt_int_t
+nxt_always_inline
+inline nxt_int_t
 nxt_hash_insert(nxt_hash_t *h, nxt_lvlhsh_query_t *lhq)
 {
     lhq->proto = h->proto;
@@ -34,7 +36,8 @@ nxt_hash_insert(nxt_hash_t *h, nxt_lvlhsh_query_t *lhq)
 }
 
 
-nxt_inline nxt_int_t
+nxt_always_inline
+inline nxt_int_t
 nxt_hash_delete(nxt_hash_t *h, nxt_lvlhsh_query_t *lhq)
 {
     lhq->proto = h->proto;
diff --git a/src/nxt_http.h b/src/nxt_http.h
index d299fdd..c916ae5 100644
--- a/src/nxt_http.h
+++ b/src/nxt_http.h
@@ -276,7 +276,8 @@ struct nxt_http_client_ip_s {
 
 #define NXT_HTTP_DATE_LEN  nxt_length("Wed, 31 Dec 1986 16:40:00 GMT")
 
-nxt_inline u_char *
+nxt_always_inline
+inline u_char *
 nxt_http_date(u_char *buf, struct tm *tm)
 {
     static const char  *week[] = { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri",
diff --git a/src/nxt_http_parse.h b/src/nxt_http_parse.h
index 3cd9bd1..4a2894d 100644
--- a/src/nxt_http_parse.h
+++ b/src/nxt_http_parse.h
@@ -132,7 +132,8 @@ nxt_buf_t *nxt_http_chunk_parse(nxt_task_t *task, nxt_http_chunk_parse_t *hcp,
 
 extern const nxt_lvlhsh_proto_t  nxt_http_fields_hash_proto;
 
-nxt_inline nxt_int_t
+nxt_always_inline
+inline nxt_int_t
 nxt_http_field_process(nxt_http_field_t *field, nxt_lvlhsh_t *hash, void *ctx)
 {
     nxt_lvlhsh_query_t     lhq;
diff --git a/src/nxt_list.h b/src/nxt_list.h
index dc948e0..32f8e49 100644
--- a/src/nxt_list.h
+++ b/src/nxt_list.h
@@ -49,7 +49,8 @@ typedef struct {
     nxt_list_data(nxt_list_part(list))
 
 
-nxt_inline void *
+nxt_always_inline
+inline void *
 nxt_list_elt(nxt_list_t *list, nxt_uint_t n)
 {
     nxt_list_part_t  *part;
@@ -103,7 +104,8 @@ NXT_EXPORT void *nxt_list_next(nxt_list_t *list, nxt_list_next_t *next);
     (nxt_pointer_to(nxt_list_data((next)->part), (next)->elt * (list)->size))
 
 
-nxt_inline nxt_uint_t
+nxt_always_inline
+inline nxt_uint_t
 nxt_list_nelts(nxt_list_t *list)
 {
     nxt_uint_t       n;
diff --git a/src/nxt_port.h b/src/nxt_port.h
index 3b66edf..6ee8db7 100644
--- a/src/nxt_port.h
+++ b/src/nxt_port.h
@@ -327,7 +327,8 @@ nxt_int_t nxt_port_socket_write2(nxt_task_t *task, nxt_port_t *port,
     nxt_uint_t type, nxt_fd_t fd, nxt_fd_t fd2, uint32_t stream,
     nxt_port_id_t reply_port, nxt_buf_t *b);
 
-nxt_inline nxt_int_t
+nxt_always_inline
+inline nxt_int_t
 nxt_port_socket_write(nxt_task_t *task, nxt_port_t *port,
     nxt_uint_t type, nxt_fd_t fd, uint32_t stream, nxt_port_id_t reply_port,
     nxt_buf_t *b)
@@ -358,7 +359,8 @@ nxt_int_t nxt_port_post(nxt_task_t *task, nxt_port_t *port,
     nxt_port_post_handler_t handler, void *data);
 void nxt_port_use(nxt_task_t *task, nxt_port_t *port, int i);
 
-nxt_inline void nxt_port_inc_use(nxt_port_t *port)
+nxt_always_inline
+inline void nxt_port_inc_use(nxt_port_t *port)
 {
     nxt_atomic_fetch_add(&port->use_count, 1);
 }
diff --git a/src/nxt_port_memory_int.h b/src/nxt_port_memory_int.h
index d2524ee..c9ba0a7 100644
--- a/src/nxt_port_memory_int.h
+++ b/src/nxt_port_memory_int.h
@@ -91,22 +91,27 @@ struct nxt_port_mmap_tracking_msg_s {
     nxt_chunk_id_t      tracking_id;   /* Tracking index. */
 };
 
-nxt_inline nxt_bool_t
+nxt_always_inline
+inline nxt_bool_t
 nxt_port_mmap_get_free_chunk(nxt_free_map_t *m, nxt_chunk_id_t *c);
 
 #define nxt_port_mmap_get_chunk_busy(m, c)                                    \
     ((m[FREE_IDX(c)] & FREE_MASK(c)) == 0)
 
-nxt_inline void
+nxt_always_inline
+inline void
 nxt_port_mmap_set_chunk_busy(nxt_free_map_t *m, nxt_chunk_id_t c);
 
-nxt_inline nxt_bool_t
+nxt_always_inline
+inline nxt_bool_t
 nxt_port_mmap_chk_set_chunk_busy(nxt_free_map_t *m, nxt_chunk_id_t c);
 
-nxt_inline void
+nxt_always_inline
+inline void
 nxt_port_mmap_set_chunk_free(nxt_free_map_t *m, nxt_chunk_id_t c);
 
-nxt_inline nxt_chunk_id_t
+nxt_always_inline
+inline nxt_chunk_id_t
 nxt_port_mmap_chunk_id(nxt_port_mmap_header_t *hdr, u_char *p)
 {
     u_char  *mm_start;
@@ -117,7 +122,8 @@ nxt_port_mmap_chunk_id(nxt_port_mmap_header_t *hdr, u_char *p)
 }
 
 
-nxt_inline u_char *
+nxt_always_inline
+inline u_char *
 nxt_port_mmap_chunk_start(nxt_port_mmap_header_t *hdr, nxt_chunk_id_t c)
 {
     u_char  *mm_start;
@@ -128,7 +134,8 @@ nxt_port_mmap_chunk_start(nxt_port_mmap_header_t *hdr, nxt_chunk_id_t c)
 }
 
 
-nxt_inline nxt_bool_t
+nxt_always_inline
+inline nxt_bool_t
 nxt_port_mmap_get_free_chunk(nxt_free_map_t *m, nxt_chunk_id_t *c)
 {
     const nxt_free_map_t  default_mask = (nxt_free_map_t) -1;
@@ -164,14 +171,16 @@ nxt_port_mmap_get_free_chunk(nxt_free_map_t *m, nxt_chunk_id_t *c)
 }
 
 
-nxt_inline void
+nxt_always_inline
+inline void
 nxt_port_mmap_set_chunk_busy(nxt_free_map_t *m, nxt_chunk_id_t c)
 {
     nxt_atomic_and_fetch(m + FREE_IDX(c), ~FREE_MASK(c));
 }
 
 
-nxt_inline nxt_bool_t
+nxt_always_inline
+inline nxt_bool_t
 nxt_port_mmap_chk_set_chunk_busy(nxt_free_map_t *m, nxt_chunk_id_t c)
 {
     nxt_free_map_t  *f;
@@ -193,7 +202,8 @@ nxt_port_mmap_chk_set_chunk_busy(nxt_free_map_t *m, nxt_chunk_id_t c)
 }
 
 
-nxt_inline void
+nxt_always_inline
+inline void
 nxt_port_mmap_set_chunk_free(nxt_free_map_t *m, nxt_chunk_id_t c)
 {
     nxt_atomic_or_fetch(m + FREE_IDX(c), FREE_MASK(c));
diff --git a/src/nxt_port_queue.h b/src/nxt_port_queue.h
index d2b2326..2ff7a3f 100644
--- a/src/nxt_port_queue.h
+++ b/src/nxt_port_queue.h
@@ -30,7 +30,8 @@ typedef struct {
 } nxt_port_queue_t;
 
 
-nxt_inline void
+nxt_always_inline
+inline void
 nxt_port_queue_init(nxt_port_queue_t volatile *q)
 {
     nxt_nncq_atomic_t  i;
@@ -46,7 +47,8 @@ nxt_port_queue_init(nxt_port_queue_t volatile *q)
 }
 
 
-nxt_inline nxt_int_t
+nxt_always_inline
+inline nxt_int_t
 nxt_port_queue_send(nxt_port_queue_t volatile *q, const void *p, uint8_t size,
     int *notify)
 {
@@ -74,7 +76,8 @@ nxt_port_queue_send(nxt_port_queue_t volatile *q, const void *p, uint8_t size,
 }
 
 
-nxt_inline ssize_t
+nxt_always_inline
+inline ssize_t
 nxt_port_queue_recv(nxt_port_queue_t volatile *q, void *p)
 {
     ssize_t                res;
diff --git a/src/nxt_rbtree.h b/src/nxt_rbtree.h
index 4bf479e..54ba12e 100644
--- a/src/nxt_rbtree.h
+++ b/src/nxt_rbtree.h
@@ -64,7 +64,8 @@ typedef intptr_t (*nxt_rbtree_compare_t)(nxt_rbtree_node_t *node1,
     nxt_rbtree_branch_min(tree, &(tree)->sentinel)
 
 
-nxt_inline nxt_rbtree_node_t *
+nxt_always_inline
+inline nxt_rbtree_node_t *
 nxt_rbtree_branch_min(nxt_rbtree_t *tree, nxt_rbtree_node_t *node)
 {
     while (node->left != nxt_rbtree_sentinel(tree)) {
@@ -79,7 +80,8 @@ nxt_rbtree_branch_min(nxt_rbtree_t *tree, nxt_rbtree_node_t *node)
     ((node) != nxt_rbtree_sentinel(tree))
 
 
-nxt_inline nxt_rbtree_node_t *
+nxt_always_inline
+inline nxt_rbtree_node_t *
 nxt_rbtree_node_successor(nxt_rbtree_t *tree, nxt_rbtree_node_t *node)
 {
     nxt_rbtree_node_t  *parent;
diff --git a/src/nxt_socket_msg.h b/src/nxt_socket_msg.h
index 04de176..2ed208a 100644
--- a/src/nxt_socket_msg.h
+++ b/src/nxt_socket_msg.h
@@ -69,7 +69,8 @@ NXT_EXPORT ssize_t nxt_recvmsg(nxt_socket_t s,
     nxt_iobuf_t *iob, nxt_uint_t niob, nxt_recv_oob_t *oob);
 
 
-nxt_inline void
+nxt_always_inline
+inline void
 nxt_socket_msg_oob_init(nxt_send_oob_t *oob, int *fds)
 {
     int             nfds;
@@ -123,7 +124,8 @@ nxt_socket_msg_oob_init(nxt_send_oob_t *oob, int *fds)
 }
 
 
-nxt_inline nxt_int_t
+nxt_always_inline
+inline nxt_int_t
 nxt_socket_msg_oob_get_fds(nxt_recv_oob_t *oob, nxt_fd_t *fd)
 {
     size_t          size;
@@ -154,7 +156,8 @@ nxt_socket_msg_oob_get_fds(nxt_recv_oob_t *oob, nxt_fd_t *fd)
 }
 
 
-nxt_inline nxt_int_t
+nxt_always_inline
+inline nxt_int_t
 nxt_socket_msg_oob_get(nxt_recv_oob_t *oob, nxt_fd_t *fd, nxt_pid_t *pid)
 {
     size_t          size;
diff --git a/src/nxt_string.h b/src/nxt_string.h
index 80cdbb5..4021dae 100644
--- a/src/nxt_string.h
+++ b/src/nxt_string.h
@@ -55,7 +55,8 @@ NXT_EXPORT void nxt_memcpy_upcase(u_char *dst, const u_char *src,
  * nxt_cpymem() is an inline function but not a macro to
  * eliminate possible double evaluation of length "length".
  */
-nxt_inline void *
+nxt_always_inline
+inline void *
 nxt_cpymem(void *dst, const void *src, size_t length)
 {
     return ((u_char *) memcpy(dst, src, length)) + length;
diff --git a/src/nxt_thread_id.h b/src/nxt_thread_id.h
index 764c993..5f70987 100644
--- a/src/nxt_thread_id.h
+++ b/src/nxt_thread_id.h
@@ -17,7 +17,8 @@
 
 typedef pid_t  nxt_tid_t;
 
-nxt_inline nxt_tid_t
+nxt_always_inline
+inline nxt_tid_t
 nxt_thread_get_tid(void)
 {
     return syscall(SYS_gettid);
@@ -34,7 +35,8 @@ nxt_thread_get_tid(void)
 
 typedef uint32_t  nxt_tid_t;
 
-nxt_inline nxt_tid_t
+nxt_always_inline
+inline nxt_tid_t
 nxt_thread_get_tid(void)
 {
     return (uint32_t) (*(long *) pthread_self());
@@ -46,7 +48,8 @@ nxt_thread_get_tid(void)
 
 typedef pthread_t  nxt_tid_t;
 
-nxt_inline nxt_tid_t
+nxt_always_inline
+inline nxt_tid_t
 nxt_thread_get_tid(void)
 {
     return pthread_self();
@@ -64,7 +67,8 @@ nxt_thread_get_tid(void)
 
 typedef uint64_t  nxt_tid_t;
 
-nxt_inline nxt_tid_t
+nxt_always_inline
+inline nxt_tid_t
 nxt_thread_get_tid(void)
 {
     uint64_t  tid;
@@ -86,7 +90,8 @@ typedef pid_t  nxt_tid_t;
 
 /* OpenBSD 3.9 getthrid(). */
 
-nxt_inline nxt_tid_t
+nxt_always_inline
+inline nxt_tid_t
 nxt_thread_get_tid(void)
 {
     return getthrid();
@@ -104,7 +109,8 @@ nxt_thread_get_tid(void)
 
 typedef tid_t  nxt_tid_t;
 
-nxt_inline nxt_tid_t
+nxt_always_inline
+inline nxt_tid_t
 nxt_thread_get_tid(void)
 {
     int                  err, size;
@@ -146,7 +152,8 @@ nxt_thread_get_tid(void)
 
 typedef pthread_t  nxt_tid_t;
 
-nxt_inline nxt_tid_t
+nxt_always_inline
+inline nxt_tid_t
 nxt_thread_get_tid(void)
 {
     return pthread_self();
@@ -156,7 +163,8 @@ nxt_thread_get_tid(void)
 
 typedef pthread_t  nxt_tid_t;
 
-nxt_inline nxt_tid_t
+nxt_always_inline
+inline nxt_tid_t
 nxt_thread_get_tid(void)
 {
     return pthread_self();
diff --git a/src/nxt_thread_log.h b/src/nxt_thread_log.h
index 214098f..67466af 100644
--- a/src/nxt_thread_log.h
+++ b/src/nxt_thread_log.h
@@ -48,7 +48,8 @@
 #endif
 
 
-nxt_inline nxt_log_t *
+nxt_always_inline
+inline nxt_log_t *
 nxt_thread_log(void)
 {
     nxt_thread_t  *thr;
diff --git a/src/nxt_timer.h b/src/nxt_timer.h
index 3ccff84..161825b 100644
--- a/src/nxt_timer.h
+++ b/src/nxt_timer.h
@@ -101,7 +101,8 @@ NXT_EXPORT void nxt_timer_add(nxt_event_engine_t *engine, nxt_timer_t *timer,
 NXT_EXPORT nxt_bool_t nxt_timer_delete(nxt_event_engine_t *engine,
     nxt_timer_t *timer);
 
-nxt_inline void
+nxt_always_inline
+inline void
 nxt_timer_disable(nxt_event_engine_t *engine, nxt_timer_t *timer)
 {
     nxt_debug(timer->task, "timer disable: %M", timer->time);
diff --git a/src/nxt_utf8.h b/src/nxt_utf8.h
index 13f42e1..cd5e508 100644
--- a/src/nxt_utf8.h
+++ b/src/nxt_utf8.h
@@ -28,7 +28,8 @@ NXT_EXPORT nxt_bool_t nxt_utf8_is_valid(const u_char *p, size_t len);
 
 /* nxt_utf8_next() expects a valid UTF-8 string. */
 
-nxt_inline const u_char *
+nxt_always_inline
+inline const u_char *
 nxt_utf8_next(const u_char *p, const u_char *end)
 {
     u_char  c;
diff --git a/src/nxt_var.h b/src/nxt_var.h
index 3b7d0c2..32fa453 100644
--- a/src/nxt_var.h
+++ b/src/nxt_var.h
@@ -23,7 +23,8 @@ typedef struct {
 } nxt_var_decl_t;
 
 
-nxt_inline nxt_bool_t
+nxt_always_inline
+inline nxt_bool_t
 nxt_is_var(nxt_str_t *str)
 {
     return (nxt_memchr(str->start, '$', str->length) != NULL);
diff --git a/src/nxt_vector.h b/src/nxt_vector.h
index dcac53d..281bb45 100644
--- a/src/nxt_vector.h
+++ b/src/nxt_vector.h
@@ -54,7 +54,8 @@ NXT_EXPORT void nxt_vector_remove(nxt_vector_t *vector, void *item);
     ((vector)->items == 0)
 
 
-nxt_inline void *
+nxt_always_inline
+inline void *
 nxt_vector_remove_last(nxt_vector_t *vector)
 {
     vector->items--;
diff --git a/src/test/nxt_rbtree1.h b/src/test/nxt_rbtree1.h
index 60048da..b322bf8 100644
--- a/src/test/nxt_rbtree1.h
+++ b/src/test/nxt_rbtree1.h
@@ -62,7 +62,8 @@ NXT_EXPORT void nxt_rbtree1_insert_timer_value(nxt_rbtree1_node_t *root,
 #define nxt_rbtree1_sentinel_init(node)  nxt_rbtree1_black(node)
 
 
-nxt_inline nxt_rbtree1_node_t *
+nxt_always_inline
+inline nxt_rbtree1_node_t *
 nxt_rbtree1_min(nxt_rbtree1_node_t *node, nxt_rbtree1_node_t *sentinel)
 {
     while (node->left != sentinel) {
diff --git a/src/test/nxt_tests.h b/src/test/nxt_tests.h
index 463dc85..6a59ca9 100644
--- a/src/test/nxt_tests.h
+++ b/src/test/nxt_tests.h
@@ -19,7 +19,8 @@ typedef nxt_bool_t (*nxt_msec_less_t)(nxt_msec_t first, nxt_msec_t second);
 
 #define NXT_TEST_RTDTSC  1
 
-nxt_inline uint64_t
+nxt_always_inline
+inline uint64_t
 nxt_rdtsc(void)
 {
     uint32_t  eax, edx;
-- 
2.36.1



More information about the unit mailing list