952bcc50bf
We had a mix of styles for declaring function-like macros:
Style A:
#define \
foo() \
do { \
... \
} while (0)
Style B:
#define foo() \
do { \
... \
} while (0)
We had a similar number of occurences of each style:
$ grep -rnI '^\w*(.*\\' | wc -l
244
$ grep -rn 'define.*(.*)' | wc -l
239
(Those regexes aren't perfect, but a very decent approximation.)
Real examples:
$ find src -type f | xargs sed -n '/^nxt_double_is_zero/,/^$/p'
nxt_double_is_zero(f) \
(fabs(f) <= FLT_EPSILON)
$ find src -type f | xargs sed -n '/define nxt_http_field_set/,/^$/p'
#define nxt_http_field_set(_field, _name, _value) \
do { \
(_field)->name_length = nxt_length(_name); \
(_field)->value_length = nxt_length(_value); \
(_field)->name = (u_char *) _name; \
(_field)->value = (u_char *) _value; \
} while (0)
I'd like to standardize on a single style for them, and IMO,
having the identifier in the same line as #define is a better
option for the following reasons:
- Programmers are used to `#define foo() ...` (readability).
- One less line of code.
- The program for finding them is really simple (see below).
function grep_ngx_func()
{
if (($# != 1)); then
>&2 echo "Usage: ${FUNCNAME[0]} <func>";
return 1;
fi;
find src -type f \
| grep '\.[ch]$' \
| xargs grep -l "$1" \
| sort \
| xargs pcregrep -Mn "(?s)^\$[\w\s*]+?^$1\(.*?^}";
find src -type f \
| grep '\.[ch]$' \
| xargs grep -l "$1" \
| sort \
| xargs pcregrep -Mn "(?s)define $1\(.*?^$" \
| sed -E '1s/^[^:]+:[0-9]+:/&\n\n/';
}
$ grep_ngx_func
Usage: grep_ngx_func <func>
$ grep_ngx_func nxt_http_field_set
src/nxt_http.h:98:
#define nxt_http_field_set(_field, _name, _value) \
do { \
(_field)->name_length = nxt_length(_name); \
(_field)->value_length = nxt_length(_value); \
(_field)->name = (u_char *) _name; \
(_field)->value = (u_char *) _value; \
} while (0)
$ grep_ngx_func nxt_sprintf
src/nxt_sprintf.c:56:
u_char * nxt_cdecl
nxt_sprintf(u_char *buf, u_char *end, const char *fmt, ...)
{
u_char *p;
va_list args;
va_start(args, fmt);
p = nxt_vsprintf(buf, end, fmt, args);
va_end(args);
return p;
}
................
Scripted change:
................
$ find src -type f \
| grep '\.[ch]$' \
| xargs sed -i '/define *\\$/{N;s/ *\\\n/ /;s/ //}'
190 lines
3.7 KiB
C
190 lines
3.7 KiB
C
|
|
/*
|
|
* Copyright (C) Igor Sysoev
|
|
* Copyright (C) NGINX, Inc.
|
|
*/
|
|
|
|
#ifndef _NXT_UNIX_THREAD_ID_H_INCLUDED_
|
|
#define _NXT_UNIX_THREAD_ID_H_INCLUDED_
|
|
|
|
|
|
#if (NXT_LINUX)
|
|
|
|
/*
|
|
* Linux thread id is a pid of thread created by clone(2),
|
|
* glibc does not provide a wrapper for gettid().
|
|
*/
|
|
|
|
typedef pid_t nxt_tid_t;
|
|
|
|
nxt_inline nxt_tid_t
|
|
nxt_thread_get_tid(void)
|
|
{
|
|
return syscall(SYS_gettid);
|
|
}
|
|
|
|
#elif (NXT_FREEBSD)
|
|
|
|
/*
|
|
* FreeBSD 9.0 provides pthread_getthreadid_np(), here is its
|
|
* emulation. Kernel thread id is the first field of struct pthread.
|
|
* Although kernel exports a thread id as long type, lwpid_t is 32bit.
|
|
* Thread id is a number above 100,000.
|
|
*/
|
|
|
|
typedef uint32_t nxt_tid_t;
|
|
|
|
nxt_inline nxt_tid_t
|
|
nxt_thread_get_tid(void)
|
|
{
|
|
return (uint32_t) (*(long *) pthread_self());
|
|
}
|
|
|
|
#elif (NXT_SOLARIS)
|
|
|
|
/* Solaris pthread_t are numbers starting with 1. */
|
|
|
|
typedef pthread_t nxt_tid_t;
|
|
|
|
nxt_inline nxt_tid_t
|
|
nxt_thread_get_tid(void)
|
|
{
|
|
return pthread_self();
|
|
}
|
|
|
|
#elif (NXT_MACOSX)
|
|
|
|
/*
|
|
* MacOSX thread has two thread ids:
|
|
*
|
|
* 1) MacOSX 10.6 (Snow Leoprad) has pthread_threadid_np() returning
|
|
* an uint64_t value, which is obtained using the __thread_selfid()
|
|
* syscall. It is a number above 300,000.
|
|
*/
|
|
|
|
typedef uint64_t nxt_tid_t;
|
|
|
|
nxt_inline nxt_tid_t
|
|
nxt_thread_get_tid(void)
|
|
{
|
|
uint64_t tid;
|
|
|
|
(void) pthread_threadid_np(NULL, &tid);
|
|
return tid;
|
|
}
|
|
|
|
/*
|
|
* 2) Kernel thread mach_port_t returned by pthread_mach_thread_np().
|
|
* It is a number in range 100-100,000.
|
|
*
|
|
* return pthread_mach_thread_np(pthread_self());
|
|
*/
|
|
|
|
#elif (NXT_OPENBSD)
|
|
|
|
typedef pid_t nxt_tid_t;
|
|
|
|
/* OpenBSD 3.9 getthrid(). */
|
|
|
|
nxt_inline nxt_tid_t
|
|
nxt_thread_get_tid(void)
|
|
{
|
|
return getthrid();
|
|
}
|
|
|
|
#elif (NXT_AIX)
|
|
|
|
/*
|
|
* pthread_self() in main thread returns 1.
|
|
* pthread_self() in other threads returns 258, 515, etc.
|
|
*
|
|
* pthread_getthrds_np(PTHRDSINFO_QUERY_TID) returns kernel tid
|
|
* shown in "ps -ef -m -o THREAD" output.
|
|
*/
|
|
|
|
typedef tid_t nxt_tid_t;
|
|
|
|
nxt_inline nxt_tid_t
|
|
nxt_thread_get_tid(void)
|
|
{
|
|
int err, size;
|
|
pthread_t pt;
|
|
struct __pthrdsinfo ti;
|
|
|
|
size = 0;
|
|
pt = pthread_self();
|
|
|
|
err = pthread_getthrds_np(&pt, PTHRDSINFO_QUERY_TID, &ti,
|
|
sizeof(struct __pthrdsinfo), NULL, size);
|
|
|
|
if (nxt_fast_path(err == 0)) {
|
|
return ti.__pi_tid;
|
|
}
|
|
|
|
nxt_main_log_alert("pthread_getthrds_np(PTHRDSINFO_QUERY_TID) failed %E",
|
|
err);
|
|
return 0;
|
|
}
|
|
|
|
/*
|
|
* AIX pthread_getunique_np() returns thread unique number starting with 1.
|
|
* OS/400 and i5/OS have pthread_getthreadid_np(), but AIX lacks their
|
|
* counterpart.
|
|
*
|
|
*
|
|
* int tid;
|
|
* pthread_t pt;
|
|
*
|
|
* pt = pthread_self();
|
|
* pthread_getunique_np(&pt, &tid);
|
|
* return tid;
|
|
*/
|
|
|
|
#elif (NXT_HPUX)
|
|
|
|
/* HP-UX pthread_t are numbers starting with 1. */
|
|
|
|
typedef pthread_t nxt_tid_t;
|
|
|
|
nxt_inline nxt_tid_t
|
|
nxt_thread_get_tid(void)
|
|
{
|
|
return pthread_self();
|
|
}
|
|
|
|
#else
|
|
|
|
typedef pthread_t nxt_tid_t;
|
|
|
|
nxt_inline nxt_tid_t
|
|
nxt_thread_get_tid(void)
|
|
{
|
|
return pthread_self();
|
|
}
|
|
|
|
#endif
|
|
|
|
|
|
NXT_EXPORT nxt_tid_t nxt_thread_tid(nxt_thread_t *thr);
|
|
|
|
|
|
/*
|
|
* On Linux pthread_t is unsigned long integer.
|
|
* On FreeBSD, MacOSX, NetBSD, and OpenBSD pthread_t is pointer to a struct.
|
|
* On Solaris and AIX pthread_t is unsigned integer.
|
|
* On HP-UX pthread_t is int.
|
|
* On Cygwin pthread_t is pointer to void.
|
|
* On z/OS pthread_t is "struct { char __[0x08]; }".
|
|
*/
|
|
typedef pthread_t nxt_thread_handle_t;
|
|
|
|
|
|
#define nxt_thread_handle_clear(th) \
|
|
th = (pthread_t) 0
|
|
|
|
#define nxt_thread_handle_equal(th0, th1) \
|
|
pthread_equal(th0, th1)
|
|
|
|
|
|
#endif /* _NXT_UNIX_THREAD_ID_H_INCLUDED_ */
|