Mercurial > hg > nginx
annotate auto/cc/owc @ 4621:c90801720a0c
Upstream: smooth weighted round-robin balancing.
For edge case weights like { 5, 1, 1 } we now produce { a, a, b, a, c, a, a }
sequence instead of { c, b, a, a, a, a, a } produced previously.
Algorithm is as follows: on each peer selection we increase current_weight
of each eligible peer by its weight, select peer with greatest current_weight
and reduce its current_weight by total number of weight points distributed
among peers.
In case of { 5, 1, 1 } weights this gives the following sequence of
current_weight's:
a b c
0 0 0 (initial state)
5 1 1 (a selected)
-2 1 1
3 2 2 (a selected)
-4 2 2
1 3 3 (b selected)
1 -4 3
6 -3 4 (a selected)
-1 -3 4
4 -2 5 (c selected)
4 -2 -2
9 -1 -1 (a selected)
2 -1 -1
7 0 0 (a selected)
0 0 0
To preserve weight reduction in case of failures the effective_weight
variable was introduced, which usually matches peer's weight, but is
reduced temporarily on peer failures.
This change also fixes loop with backup servers and proxy_next_upstream
http_404 (ticket #47), and skipping alive upstreams in some cases if there
are multiple dead ones (ticket #64).
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 14 May 2012 09:57:20 +0000 |
parents | d620f497c50f |
children | 670ceaba03d8 |
rev | line source |
---|---|
455 | 1 |
2 # Copyright (C) Igor Sysoev | |
4412 | 3 # Copyright (C) Nginx, Inc. |
455 | 4 |
5 | |
583 | 6 # Open Watcom C 1.0, 1.2, 1.3 |
455 | 7 |
8 # optimizations | |
9 | |
10 # maximize speed | |
11 CFLAGS="$CFLAGS -ot" | |
577 | 12 # reorder instructions for best pipeline usage |
455 | 13 CFLAGS="$CFLAGS -op" |
14 # inline intrinsic functions | |
15 CFLAGS="$CFLAGS -oi" | |
16 # inline expansion | |
17 CFLAGS="$CFLAGS -oe" | |
18 # disable stack checking calls | |
19 CFLAGS="$CFLAGS -s" | |
20 | |
21 case $CPU in | |
22 pentium) | |
23 # optimize for Pentium and Athlon | |
24 # register-based arguments passing conventions | |
25 CPU_OPT="-5r" | |
26 # stack-based arguments passing conventions | |
27 #CPU_OPT="-5s" | |
577 | 28 ;; |
455 | 29 |
30 pentiumpro) | |
31 # optimize for Pentium Pro, Pentium II and Pentium III | |
32 # register-based arguments passing conventions | |
33 CPU_OPT="-6r" | |
34 # stack-based arguments passing conventions | |
35 #CPU_OPT="-6s" | |
36 ;; | |
37 esac | |
38 | |
39 CFLAGS="$CFLAGS $CPU_OPT" | |
40 | |
41 | |
42 # warnings | |
43 | |
499 | 44 # maximum level |
45 CFLAGS="$CFLAGS -wx" | |
455 | 46 #CFLAGS="$CFLAGS -w3" |
47 | |
48 # stop on warning | |
49 CFLAGS="$CFLAGS -we" | |
50 | |
51 # built target is NT | |
52 CFLAGS="$CFLAGS -bt=nt" | |
53 | |
54 # multithreaded | |
55 CFLAGS="$CFLAGS -bm" | |
56 | |
57 # debug | |
58 CFLAGS="$CFLAGS -d2" | |
59 | |
60 # quiet | |
61 CFLAGS="$CFLAGS -zq" | |
62 | |
63 # Open Watcom C 1.2 | |
583 | 64 have=NGX_HAVE_C99_VARIADIC_MACROS . auto/have |
455 | 65 |
461 | 66 |
577 | 67 # the precompiled headers |
469 | 68 CORE_DEPS="$CORE_DEPS $NGX_OBJS/ngx_config.pch" |
69 NGX_PCH="$NGX_OBJS/ngx_config.pch" | |
70 NGX_BUILD_PCH="-fhq=$NGX_OBJS/ngx_config.pch" | |
71 NGX_USE_PCH="-fh=$NGX_OBJS/ngx_config.pch" | |
455 | 72 |
461 | 73 |
74 # the link flags, built target is NT GUI mode application | |
2725 | 75 #CORE_LINK="$CORE_LINK -l=nt_win" |
461 | 76 |
77 | |
78 # the resource file | |
469 | 79 NGX_RCC="wrc \$(CORE_INCS) -fo=$NGX_OBJS/nginx.res " |
80 NGX_RCC="$NGX_RCC $NGX_WIN32_RC $NGX_OBJS/nginx.exe" | |
461 | 81 |
455 | 82 |
83 ngx_include_opt="-i=" | |
84 ngx_objout="-fo" | |
85 ngx_binout="-fe=" | |
86 ngx_objext="obj" | |
87 ngx_binext=".exe" | |
88 | |
89 ngx_regex_dirsep='\\' | |
90 ngx_dirsep="\\" | |
2825
bb05c0834c8c
remove BMAKE (build make): a cc compiler should use own make
Igor Sysoev <igor@sysoev.ru>
parents:
2725
diff
changeset
|
91 |
2839
cb7739c822c6
add miltilines in OpenWatcom makefiles
Igor Sysoev <igor@sysoev.ru>
parents:
2825
diff
changeset
|
92 ngx_long_start=' ' |
cb7739c822c6
add miltilines in OpenWatcom makefiles
Igor Sysoev <igor@sysoev.ru>
parents:
2825
diff
changeset
|
93 ngx_long_end=' ' |
cb7739c822c6
add miltilines in OpenWatcom makefiles
Igor Sysoev <igor@sysoev.ru>
parents:
2825
diff
changeset
|
94 ngx_long_regex_cont=' \&\ |
cb7739c822c6
add miltilines in OpenWatcom makefiles
Igor Sysoev <igor@sysoev.ru>
parents:
2825
diff
changeset
|
95 ' |
cb7739c822c6
add miltilines in OpenWatcom makefiles
Igor Sysoev <igor@sysoev.ru>
parents:
2825
diff
changeset
|
96 ngx_long_cont=' & |
cb7739c822c6
add miltilines in OpenWatcom makefiles
Igor Sysoev <igor@sysoev.ru>
parents:
2825
diff
changeset
|
97 ' |
cb7739c822c6
add miltilines in OpenWatcom makefiles
Igor Sysoev <igor@sysoev.ru>
parents:
2825
diff
changeset
|
98 |
cb7739c822c6
add miltilines in OpenWatcom makefiles
Igor Sysoev <igor@sysoev.ru>
parents:
2825
diff
changeset
|
99 ngx_regex_cont=' \&\ |
cb7739c822c6
add miltilines in OpenWatcom makefiles
Igor Sysoev <igor@sysoev.ru>
parents:
2825
diff
changeset
|
100 ' |
cb7739c822c6
add miltilines in OpenWatcom makefiles
Igor Sysoev <igor@sysoev.ru>
parents:
2825
diff
changeset
|
101 ngx_cont=' & |
cb7739c822c6
add miltilines in OpenWatcom makefiles
Igor Sysoev <igor@sysoev.ru>
parents:
2825
diff
changeset
|
102 ' |
cb7739c822c6
add miltilines in OpenWatcom makefiles
Igor Sysoev <igor@sysoev.ru>
parents:
2825
diff
changeset
|
103 ngx_tab=' & |
cb7739c822c6
add miltilines in OpenWatcom makefiles
Igor Sysoev <igor@sysoev.ru>
parents:
2825
diff
changeset
|
104 ' |