Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 4606 invoked by uid 99); 5 Aug 2012 23:18:08 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Aug 2012 23:18:08 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 05 Aug 2012 23:18:04 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9694C2388860; Sun, 5 Aug 2012 23:17:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1369702 - in /httpd/httpd/trunk/docs/manual: misc/perf-scaling.html.en mod/mod_lua.html.en mod/mod_lua.xml.fr Date: Sun, 05 Aug 2012 23:17:19 -0000 To: cvs@httpd.apache.org From: igalic@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120805231719.9694C2388860@eris.apache.org> Author: igalic Date: Sun Aug 5 23:17:19 2012 New Revision: 1369702 URL: http://svn.apache.org/viewvc?rev=1369702&view=rev Log: xforms Modified: httpd/httpd/trunk/docs/manual/misc/perf-scaling.html.en httpd/httpd/trunk/docs/manual/mod/mod_lua.html.en httpd/httpd/trunk/docs/manual/mod/mod_lua.xml.fr Modified: httpd/httpd/trunk/docs/manual/misc/perf-scaling.html.en URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/misc/perf-scaling.html.en?rev=1369702&r1=1369701&r2=1369702&view=diff ============================================================================== --- httpd/httpd/trunk/docs/manual/misc/perf-scaling.html.en (original) +++ httpd/httpd/trunk/docs/manual/misc/perf-scaling.html.en Sun Aug 5 23:17:19 2012 @@ -118,73 +118,40 @@ Linux (Xen) system:

- top - 23:10:58 up 71 days, 6:14, 4 users, load average: - 0.25, 0.53, 0.47 - Tasks: 163 total, 1 running, 162 sleeping, 0 stopped, - 0 zombie - Cpu(s): 11.6%us, 0.7%sy, 0.0%ni, 87.3%id, 0.4%wa, - 0.0%hi, 0.0%si, 0.0%st - Mem: 2621656k total, 2178684k used, 442972k free, - 100500k buffers - Swap: 4194296k total, 860584k used, 3333712k free, - 1157552k cached - - PID USER PR NI VIRT RES SHR S %CPU %MEM TIME+ - COMMAND - 16687 example_ 20 0 1200m 547m 179m S 45 21.4 - 1:09.59 httpd-worker - 15195 www 20 0 441m 33m 2468 S 0 1.3 - 0:41.41 httpd-worker - 1 root 20 0 10312 328 308 S 0 0.0 0:33.17 - init - 2 root 15 -5 0 0 0 S 0 0.0 0:00.00 - kthreadd - 3 root RT -5 0 0 0 S 0 0.0 0:00.14 - migration/0 - 4 root 15 -5 0 0 0 S 0 0.0 0:04.58 - ksoftirqd/0 - 5 root RT -5 0 0 0 S 0 0.0 4:45.89 - watchdog/0 - 6 root 15 -5 0 0 0 S 0 0.0 1:42.52 - events/0 - 7 root 15 -5 0 0 0 S 0 0.0 0:00.00 - khelper - 19 root 15 -5 0 0 0 S 0 0.0 0:00.00 - xenwatch - 20 root 15 -5 0 0 0 S 0 0.0 0:00.00 - xenbus - 28 root RT -5 0 0 0 S 0 0.0 0:00.14 - migration/1 - 29 root 15 -5 0 0 0 S 0 0.0 0:00.20 - ksoftirqd/1 - 30 root RT -5 0 0 0 S 0 0.0 0:05.96 - watchdog/1 - 31 root 15 -5 0 0 0 S 0 0.0 1:18.35 - events/1 - 32 root RT -5 0 0 0 S 0 0.0 0:00.08 - migration/2 - 33 root 15 -5 0 0 0 S 0 0.0 0:00.18 - ksoftirqd/2 - 34 root RT -5 0 0 0 S 0 0.0 0:06.00 - watchdog/2 - 35 root 15 -5 0 0 0 S 0 0.0 1:08.39 - events/2 - 36 root RT -5 0 0 0 S 0 0.0 0:00.10 - migration/3 - 37 root 15 -5 0 0 0 S 0 0.0 0:00.16 - ksoftirqd/3 - 38 root RT -5 0 0 0 S 0 0.0 0:06.08 - watchdog/3 - 39 root 15 -5 0 0 0 S 0 0.0 1:22.81 - events/3 - 68 root 15 -5 0 0 0 S 0 0.0 0:06.28 - kblockd/0 - 69 root 15 -5 0 0 0 S 0 0.0 0:00.04 - kblockd/1 - 70 root 15 -5 0 0 0 S 0 0.0 0:00.04 - kblockd/2 -

+top - 23:10:58 up 71 days,  6:14,  4 users,  load average: 0.25, 0.53, 0.47
+Tasks: 163 total,   1 running, 162 sleeping,   0 stopped,   0 zombie
+Cpu(s): 11.6%us,  0.7%sy,  0.0%ni, 87.3%id,  0.4%wa,  0.0%hi,  0.0%si,  0.0%st
+Mem:   2621656k total,  2178684k used,   442972k free,   100500k buffers
+Swap:  4194296k total,   860584k used,  3333712k free,  1157552k cached
+
+  PID USER      PR  NI  VIRT  RES  SHR S %CPU %MEM    TIME+  COMMAND
+16687 example_  20   0 1200m 547m 179m S   45 21.4   1:09.59 httpd-worker
+15195 www       20   0  441m  33m 2468 S    0  1.3   0:41.41 httpd-worker
+    1 root      20   0 10312  328  308 S    0  0.0   0:33.17 init
+    2 root      15  -5     0    0    0 S    0  0.0   0:00.00 kthreadd
+    3 root      RT  -5     0    0    0 S    0  0.0   0:00.14 migration/0
+    4 root      15  -5     0    0    0 S    0  0.0   0:04.58 ksoftirqd/0
+    5 root      RT  -5     0    0    0 S    0  0.0   4:45.89 watchdog/0
+    6 root      15  -5     0    0    0 S    0  0.0   1:42.52 events/0
+    7 root      15  -5     0    0    0 S    0  0.0   0:00.00 khelper
+   19 root      15  -5     0    0    0 S    0  0.0   0:00.00 xenwatch
+   20 root      15  -5     0    0    0 S    0  0.0   0:00.00 xenbus
+   28 root      RT  -5     0    0    0 S    0  0.0   0:00.14 migration/1
+   29 root      15  -5     0    0    0 S    0  0.0   0:00.20 ksoftirqd/1
+   30 root      RT  -5     0    0    0 S    0  0.0   0:05.96 watchdog/1
+   31 root      15  -5     0    0    0 S    0  0.0   1:18.35 events/1
+   32 root      RT  -5     0    0    0 S    0  0.0   0:00.08 migration/2
+   33 root      15  -5     0    0    0 S    0  0.0   0:00.18 ksoftirqd/2
+   34 root      RT  -5     0    0    0 S    0  0.0   0:06.00 watchdog/2
+   35 root      15  -5     0    0    0 S    0  0.0   1:08.39 events/2
+   36 root      RT  -5     0    0    0 S    0  0.0   0:00.10 migration/3
+   37 root      15  -5     0    0    0 S    0  0.0   0:00.16 ksoftirqd/3
+   38 root      RT  -5     0    0    0 S    0  0.0   0:06.08 watchdog/3
+   39 root      15  -5     0    0    0 S    0  0.0   1:22.81 events/3
+   68 root      15  -5     0    0    0 S    0  0.0   0:06.28 kblockd/0
+   69 root      15  -5     0    0    0 S    0  0.0   0:00.04 kblockd/1
+   70 root      15  -5     0    0    0 S    0  0.0   0:00.04 kblockd/2

Top is a wonderful tool even though it’s slightly resource intensive (when running, its own process is usually in the @@ -208,14 +175,13 @@ The output of free looks like this:

- sctemme@brutus:~$ free - total used free shared buffers cached - Mem: 4026028 3901892 124136 0 253144 - 841044 - -/+ buffers/cache: 2807704 1218324 - Swap: 3903784 12540 3891244 -

+sctemme@brutus:~$ free
+              total       used     free   shared    buffers    cached
+Mem:        4026028    3901892   124136         0    253144    841044
+-/+ buffers/cache:     2807704  1218324
+Swap:       3903784      12540  3891244
+

vmstat @@ -239,37 +205,27 @@

- [sctemme@GayDeceiver sctemme]$ vmstat 5 3 - procs memory swap io - system cpu - r b w swpd free buff cache si so bi bo in - cs us sy i - 0 0 0 0 186252 6688 37516 0 0 12 5 47 - 311 0 1 9 - 0 0 0 0 186244 6696 37516 0 0 0 16 41 - 314 0 0 10 - 0 0 0 0 186236 6704 37516 0 0 0 9 44 - 314 0 0 100 -

+[sctemme@GayDeceiver sctemme]$ vmstat 5 3
+   procs                      memory     swap         io    system        cpu
+ r b w     swpd   free   buff cache si so       bi    bo in     cs us  sy id
+ 0 0 0        0 186252   6688 37516    0    0   12     5 47    311  0   1 99
+ 0 0 0        0 186244   6696 37516    0    0    0    16 41    314  0   0 100
+ 0 0 0        0 186236   6704 37516    0    0    0     9 44    314  0   0 100
+

And this is output of a server that is under a load of one hundred simultaneous connections fetching static content:

- sctemme@GayDeceiver sctemme]$ vmstat 5 3 - procs memory swap io - system cpu - r b w swpd free buff cache si so bi bo in - cs us sy id - 1 0 1 0 162580 6848 40056 0 0 11 5 150 - 324 1 1 98 - 6 0 1 0 163280 6856 40248 0 0 0 66 6384 - 1117 42 25 32 - 11 0 0 0 162780 6864 40436 0 0 0 61 6309 - 1165 33 28 40 -

+[sctemme@GayDeceiver sctemme]$ vmstat 5 3
+   procs                      memory     swap    io      system       cpu
+ r b w     swpd   free   buff cache si so     bi bo   in     cs us sy  id
+ 1 0 1        0 162580   6848 40056    0    0 11  5 150     324  1  1  98
+ 6 0 1        0 163280   6856 40248    0    0  0 66 6384 1117   42 25  32
+11 0 0        0 162780   6864 40436    0    0  0 61 6309 1165   33 28  40
+

The first line gives averages since the last reboot. The subsequent lines give information for five second @@ -486,9 +442,10 @@ can be specified on a per module basis:

+

LogLevel debug mod_ssl:warn -

+ +

This puts all of the server in debug mode, except for @@ -520,22 +477,15 @@

- 195.54.228.42 - - [24/Mar/2007:23:05:11 -0400] "GET - /sander/feed/ HTTP/1.1" 200 9747 - 64.34.165.214 - - [24/Mar/2007:23:10:11 -0400] "GET - /sander/feed/atom HTTP/1.1" 200 9068 - 60.28.164.72 - - [24/Mar/2007:23:11:41 -0400] "GET / - HTTP/1.0" 200 618 - 85.140.155.56 - - [24/Mar/2007:23:14:12 -0400] "GET - /sander/2006/09/27/44/ HTTP/1.1" 200 14172 - 85.140.155.56 - - [24/Mar/2007:23:14:15 -0400] "GET - /sander/2006/09/21/gore-tax-pollution/ HTTP/1.1" 200 15147 - 74.6.72.187 - - [24/Mar/2007:23:18:11 -0400] "GET - /sander/2006/09/27/44/ HTTP/1.0" 200 14172 - 74.6.72.229 - - [24/Mar/2007:23:24:22 -0400] "GET - /sander/2006/11/21/os-java/ HTTP/1.0" 200 13457 -

+195.54.228.42 - - [24/Mar/2007:23:05:11 -0400] "GET /sander/feed/ HTTP/1.1" 200 9747
+64.34.165.214 - - [24/Mar/2007:23:10:11 -0400] "GET /sander/feed/atom HTTP/1.1" 200 9068
+60.28.164.72 - - [24/Mar/2007:23:11:41 -0400] "GET / HTTP/1.0" 200 618
+85.140.155.56 - - [24/Mar/2007:23:14:12 -0400] "GET /sander/2006/09/27/44/ HTTP/1.1" 200 14172
+85.140.155.56 - - [24/Mar/2007:23:14:15 -0400] "GET /sander/2006/09/21/gore-tax-pollution/ HTTP/1.1" 200 15147
+74.6.72.187 - - [24/Mar/2007:23:18:11 -0400] "GET /sander/2006/09/27/44/ HTTP/1.0" 200 14172
+74.6.72.229 - - [24/Mar/2007:23:24:22 -0400] "GET /sander/2006/11/21/os-java/ HTTP/1.0" 200 13457
+

@@ -1347,42 +1297,36 @@ pre-rendered blog pages:

Listen *:8001 - <VirtualHost *:8001> - - ServerName blog.sandla.org:8001 - ServerAdmin sander@temme.net - DocumentRoot "/home/sctemme/inst/blog/httpd/htdocs" - <Directory - "/home/sctemme/inst/blog/httpd/htdocs"> - - Options +Indexes - Order allow,deny - Allow from all - RewriteEngine on - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - RewriteRule ^(.*)$ /cgi-bin/blosxom.cgi/$1 [L,QSA] - - </Directory> - RewriteLog - /home/sctemme/inst/blog/httpd/logs/rewrite_log - RewriteLogLevel 9 - ErrorLog /home/sctemme/inst/blog/httpd/logs/error_log - LogLevel debug - CustomLog /home/sctemme/inst/blog/httpd/logs/access_log - common - ScriptAlias /cgi-bin/ /home/sctemme/inst/blog/bin/ - <Directory "/home/sctemme/inst/blog/bin"> - - Options +ExecCGI - Order allow,deny - Allow from all - - </Directory> - - </VirtualHost> -

+Listen *:8001
+  <VirtualHost *:8001>
+      ServerName blog.sandla.org:8001
+      ServerAdmin sander@temme.net
+      DocumentRoot "/home/sctemme/inst/blog/httpd/htdocs"
+      <Directory
+      "/home/sctemme/inst/blog/httpd/htdocs">
+          Options +Indexes
+          Order allow,deny
+          Allow from all
+          RewriteEngine on
+          RewriteCond %{REQUEST_FILENAME} !-f
+          RewriteCond %{REQUEST_FILENAME} !-d
+          RewriteRule ^(.*)$ /cgi-bin/blosxom.cgi/$1 [L,QSA]
+      </Directory>
+      RewriteLog /home/sctemme/inst/blog/httpd/logs/rewrite_log
+      RewriteLogLevel 9
+      ErrorLog /home/sctemme/inst/blog/httpd/logs/error_log
+      LogLevel debug
+      CustomLog /home/sctemme/inst/blog/httpd/logs/access_log common
+      ScriptAlias /cgi-bin/ /home/sctemme/inst/blog/bin/
+      <Directory "/home/sctemme/inst/blog/bin">
+          Options +ExecCGI
+          Order allow,deny
+          Allow from all
+      </Directory>
+  </VirtualHost>
+

The RewriteCond @@ -1462,14 +1406,15 @@ configuration snippet in httpd.conf:

- CacheRoot /raid1/cacheroot - CacheEnable disk / - # A page modified 100 minutes ago will expire in 10 minutes - CacheLastModifiedFactor .1 - # Always check again after 6 hours - CacheMaxExpire 21600 -

+CacheRoot /raid1/cacheroot
+CacheEnable disk /
+# A page modified 100 minutes ago will expire in 10 minutes
+CacheLastModifiedFactor .1
+# Always check again after 6 hours
+CacheMaxExpire 21600
+

This configuration will try to cache any and all content within its virtual host. It will never cache content for @@ -1495,13 +1440,12 @@ Unfortunately there does currently not exist a way to cache these headers.

- <FilesMatch \.(jpe?g|png|gif|js|css|x?html|xml)> - - FileETag None - - </FilesMatch> -

+<FilesMatch \.(jpe?g|png|gif|js|css|x?html|xml)>
+    FileETag None
+</FilesMatch>
+

This will disable the generation of the ETag: Modified: httpd/httpd/trunk/docs/manual/mod/mod_lua.html.en URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_lua.html.en?rev=1369702&r1=1369701&r2=1369702&view=diff ============================================================================== --- httpd/httpd/trunk/docs/manual/mod/mod_lua.html.en (original) +++ httpd/httpd/trunk/docs/manual/mod/mod_lua.html.en Sun Aug 5 23:17:19 2012 @@ -992,8 +992,8 @@ end

This directive matches a uri pattern to invoke a specific handler function in a specific file. It uses PCRE regular expressions to match the uri, and supports interpolating - match groups into both the file path and the function name - be careful writing your regular expressions to avoid security + match groups into both the file path and the function name. + Be careful writing your regular expressions to avoid security issues.

Examples:

     LuaMapHandler /(\w+)/(\w+) /scripts/$1.lua handle_$2
@@ -1107,8 +1107,8 @@ LuaPackagePath /scripts/lib/?/init.lua
 
     server:
  This one is different than others because the
             server scope is quite long lived, and multiple threads
-            will have the same server_rec. To accommodate this
-            server scoped interpreter are stored in an apr
+            will have the same server_rec. To accommodate this,
+            server scoped Lua states are stored in an apr
             resource list. The min and max arguments 
             specify the minimum and maximum number of Lua states to keep in the 
             pool.
@@ -1123,7 +1123,7 @@ LuaPackagePath /scripts/lib/?/init.lua
     maximum performance. While the thread scope will provide the 
     fastest responses, the server scope will use less memory, as 
     states are pooled, allowing f.x. 1000 threads to share only 100 Lua states, 
-    thus using only 10% of the memory requried by the thread scope.
+    thus using only 10% of the memory required by the thread scope.

Modified: httpd/httpd/trunk/docs/manual/mod/mod_lua.xml.fr URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/manual/mod/mod_lua.xml.fr?rev=1369702&r1=1369701&r2=1369702&view=diff ============================================================================== --- httpd/httpd/trunk/docs/manual/mod/mod_lua.xml.fr (original) +++ httpd/httpd/trunk/docs/manual/mod/mod_lua.xml.fr Sun Aug 5 23:17:19 2012 @@ -1,7 +1,7 @@ - +