Mercurial > hg > nginx

annotate auto/os/darwin @ 6383:85dea406e18f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Dynamic modules. The auto/module script is extended to understand ngx_module_link=DYNAMIC. When set, it links the module as a shared object rather than statically into nginx binary. The module can later be loaded using the "load_module" directive. New auto/module parameter ngx_module_order allows to define module loading order in complex cases. By default the order is set based on ngx_module_type. 3rd party modules can be compiled dynamically using the --add-dynamic-module configure option, which will preset ngx_module_link to "DYNAMIC" before calling the module config script. Win32 support is rudimentary, and only works when using MinGW gcc (which is able to handle exports/imports automatically). In collaboration with Ruslan Ermilov.
author Maxim Dounin <mdounin@mdounin.ru>
date Thu, 04 Feb 2016 20:25:29 +0300
parents 79b473d5381d
children e393c0bf53d3
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
2128
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
1
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
2 # Copyright (C) Igor Sysoev
4412
d620f497c50f Copyright updated.
Maxim Konovalov <maxim@nginx.com>
parents: 2128
diff changeset
3 # Copyright (C) Nginx, Inc.
2128
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
4
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
5
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
6 have=NGX_DARWIN . auto/have_headers
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
7
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
8 CORE_INCS="$UNIX_INCS"
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
9 CORE_DEPS="$UNIX_DEPS $DARWIN_DEPS"
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
10 CORE_SRCS="$UNIX_SRCS $DARWIN_SRCS"
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
11
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
12
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
13
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
14 ngx_spacer='
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
15 '
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
16
6383
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6007
diff changeset
17 MAIN_LINK=
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6007
diff changeset
18 MODULE_LINK="-shared -Wl,-undefined,dynamic_lookup"
85dea406e18f Dynamic modules.
Maxim Dounin <mdounin@mdounin.ru>
parents: 6007
diff changeset
19
2128
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
20 # kqueue
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
21
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
22 echo " + kqueue found"
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
23 have=NGX_HAVE_KQUEUE . auto/have
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
24 have=NGX_HAVE_CLEAR_EVENT . auto/have
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
25 EVENT_MODULES="$EVENT_MODULES $KQUEUE_MODULE"
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
26 CORE_SRCS="$CORE_SRCS $KQUEUE_SRCS"
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
27 EVENT_FOUND=YES
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
28 NGX_KQUEUE_CHECKED=YES
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
29
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
30 ngx_feature="kqueue's EVFILT_TIMER"
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
31 ngx_feature_name="NGX_HAVE_TIMER_EVENT"
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
32 ngx_feature_run=yes
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
33 ngx_feature_incs="#include <sys/event.h>
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
34 #include <sys/time.h>"
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
35 ngx_feature_path=
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
36 ngx_feature_libs=
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
37 ngx_feature_test="int kq;
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
38 struct kevent kev;
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
39 struct timespec ts;
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
40
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
41 if ((kq = kqueue()) == -1) return 1;
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
42
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
43 kev.ident = 0;
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
44 kev.filter = EVFILT_TIMER;
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
45 kev.flags = EV_ADD|EV_ENABLE;
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
46 kev.fflags = 0;
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
47 kev.data = 1000;
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
48 kev.udata = 0;
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
49
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
50 ts.tv_sec = 0;
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
51 ts.tv_nsec = 0;
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
52
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
53 if (kevent(kq, &kev, 1, &kev, 1, &ts) == -1) return 1;
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
54
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
55 if (kev.flags & EV_ERROR) return 1;"
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
56
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
57 . auto/feature
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
58
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
59
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
60 ngx_feature="Darwin 64-bit kqueue millisecond timeout bug"
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
61 ngx_feature_name=NGX_DARWIN_KEVENT_BUG
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
62 ngx_feature_run=bug
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
63 ngx_feature_incs="#include <sys/event.h>
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
64 #include <sys/time.h>"
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
65 ngx_feature_path=
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
66 ngx_feature_libs=
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
67 ngx_feature_test="int kq;
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
68 struct kevent kev;
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
69 struct timespec ts;
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
70 struct timeval tv, tv0;
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
71
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
72 kq = kqueue();
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
73
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
74 ts.tv_sec = 0;
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
75 ts.tv_nsec = 999000000;
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
76
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
77 gettimeofday(&tv, 0);
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
78 kevent(kq, NULL, 0, &kev, 1, &ts);
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
79 gettimeofday(&tv0, 0);
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
80 timersub(&tv0, &tv, &tv);
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
81
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
82 if (tv.tv_sec * 1000000 + tv.tv_usec < 900000) return 1;"
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
83
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
84 . auto/feature
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
85
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
86
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
87 # sendfile()
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
88
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
89 CC_AUX_FLAGS="$CC_AUX_FLAGS"
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
90 ngx_feature="sendfile()"
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
91 ngx_feature_name="NGX_HAVE_SENDFILE"
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
92 ngx_feature_run=yes
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
93 ngx_feature_incs="#include <sys/types.h>
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
94 #include <sys/socket.h>
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
95 #include <sys/uio.h>
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
96 #include <sys/errno.h>"
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
97 ngx_feature_path=
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
98 ngx_feature_libs=
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
99 ngx_feature_test="int s = 0, fd = 1;
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
100 off_t n; off_t off = 0;
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
101 n = sendfile(s, fd, off, &n, NULL, 0);
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
102 if (n == -1 && errno == ENOSYS) return 1"
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
103 . auto/feature
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
104
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
105 if [ $ngx_found = yes ]; then
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
106 CORE_SRCS="$CORE_SRCS $DARWIN_SENDFILE_SRCS"
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
107 fi
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
108
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
109
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
110 ngx_feature="atomic(3)"
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
111 ngx_feature_name=NGX_DARWIN_ATOMIC
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
112 ngx_feature_run=no
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
113 ngx_feature_incs="#include <libkern/OSAtomic.h>"
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
114 ngx_feature_path=
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
115 ngx_feature_libs=
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
116 ngx_feature_test="int32_t lock, n;
5224
09d7faaef16f Configure: fixed test of OS X atomic(3).
Ruslan Ermilov <ru@nginx.com>
parents: 4412
diff changeset
117 n = OSAtomicCompareAndSwap32Barrier(0, 1, &lock)"
2128
345a014436d4 *) move Darwin support to separate files
Igor Sysoev <igor@sysoev.ru>
parents:
diff changeset
118 . auto/feature