Permalink
Browse files

sync

  • Loading branch information...
1 parent 9a24834 commit 43cb1a47b2cea30fcb158543203f4b3fdb3fc034 @stefanocasazza committed Sep 7, 2011
Showing with 1,475 additions and 1,261 deletions.
  1. +2 −2 README.html
  2. +2 −2 README.md
  3. BIN doc/benchmark/bench.ods
  4. +5 −0 doc/benchmark/bin/bench1.c
  5. +102 −102 doc/benchmark/current/userver_tcp/localhost/userver_tcp_100_NO_keepalive.csv
  6. +102 −102 doc/benchmark/current/userver_tcp/localhost/usp_keepalive.csv
  7. +102 −102 doc/benchmark/current/userver_tcp/stefano/userver_tcp_1000_NO_keepalive.csv
  8. +102 −102 doc/benchmark/current/userver_tcp/stefano/userver_tcp_1000_keepalive.csv
  9. +102 −102 doc/benchmark/current/userver_tcp/stefano/userver_tcp_100_NO_keepalive.csv
  10. +102 −102 doc/benchmark/current/userver_tcp/stefano/userver_tcp_100_keepalive.csv
  11. +97 −97 doc/benchmark/current/userver_tcp/stefano/userver_tcp_big_NO_keepalive.csv
  12. +102 −102 doc/benchmark/current/userver_tcp/stefano/usp_NO_keepalive.csv
  13. +102 −102 doc/benchmark/current/userver_tcp/stefano/usp_keepalive.csv
  14. +2 −2 doc/benchmark/current/userver_tcp/userver_tcp.ver
  15. BIN doc/benchmark/img/localhost_keep_alive.png
  16. BIN doc/benchmark/img/localhost_no_keep_alive.png
  17. BIN doc/benchmark/img/net_keep_alive.png
  18. BIN doc/benchmark/img/net_no_keep_alive.png
  19. +13 −9 include/ulib/event/event_fd.h
  20. +4 −10 include/ulib/net/server/client_image.h
  21. +1 −1 include/ulib/net/server/plugin/mod_http.h
  22. +2 −1 include/ulib/net/server/server.h
  23. +7 −7 include/ulib/notifier.h
  24. +2 −1 include/ulib/ssl/net/sslsocket.h
  25. +2 −2 include/ulib/utility/uhttp.h
  26. +33 −12 src/ulib/net/server/client_image.cpp
  27. +6 −5 src/ulib/net/server/plugin/mod_http.cpp
  28. +3 −1 src/ulib/net/server/plugin/mod_ssi.cpp
  29. +51 −19 src/ulib/net/server/server.cpp
  30. +8 −5 src/ulib/net/tcpsocket.cpp
  31. +84 −126 src/ulib/notifier.cpp
  32. +4 −4 src/ulib/ssl/net/sslsocket.cpp
  33. +183 −110 src/ulib/utility/uhttp.cpp
  34. +1 −1 tests/examples/TSA/CA/tsaserial
  35. BIN tests/examples/TSA/TSA/.rnd
  36. +17 −4 tests/examples/benchmark/benchmarking_ssl.cfg
  37. +3 −2 tests/examples/benchmarking.sh
  38. +32 −18 tests/examples/hello_world.sh
  39. +92 −0 tests/examples/web_server.cfg
  40. +3 −4 tests/examples/web_server.sh
  41. BIN tests/ulib/inp/test.db
View
@@ -165,10 +165,10 @@ <h2>nginx run with the follow configuration:</h2>
}
</code></pre>
-<p>All tests are performed on an Intel Pentium 4 2.8 Ghz, Hard drive 5400 rpm, Memory: 2GB DDR2 800MHz running Gentoo 64 bit (kernel 3.0.3).
+<p>All tests are performed on an Intel Pentium 4 2.8 Ghz, Hard drive 5400 rpm, Memory: 2GB DDR2 800MHz running <code>Gentoo 64 bit (kernel 3.0.4)</code>.
Yes, this CPU is 11-year old (single-core) P4, but some test on more recent processor (dual-core AMD) give similar results.</p>
-<p>For better comparison with gwan (32 bit) userver_tcp and nginx are compiled and run (as gwan) in chrooted environment: Ubuntu 11.04 (iX86)</p>
+<p>For better comparison with gwan (32 bit) userver_tcp and nginx are compiled and run (as gwan) in chrooted environment: <code>Ubuntu 11.04 (iX86)</code></p>
<p>The client <a href="https://github.com/stefanocasazza/ULib/tree/master/doc/benchmark/bin/bench1.c">bench1.c</a>
relies on ApacheBench (ab) and it is a slightly modified version of <a href="http://gwan.ch/source/ab.c.txt">G-WAN client</a>.</p>
View
@@ -168,10 +168,10 @@ nginx run with the follow configuration:
}
}
-All tests are performed on an Intel Pentium 4 2.8 Ghz, Hard drive 5400 rpm, Memory: 2GB DDR2 800MHz running Gentoo 64 bit (kernel 3.0.3).
+All tests are performed on an Intel Pentium 4 2.8 Ghz, Hard drive 5400 rpm, Memory: 2GB DDR2 800MHz running `Gentoo 64 bit (kernel 3.0.4)`.
Yes, this CPU is 11-year old (single-core) P4, but some test on more recent processor (dual-core AMD) give similar results.
-For better comparison with gwan (32 bit) userver_tcp and nginx are compiled and run (as gwan) in chrooted environment: Ubuntu 11.04 (iX86)
+For better comparison with gwan (32 bit) userver_tcp and nginx are compiled and run (as gwan) in chrooted environment: `Ubuntu 11.04 (iX86)`
The client [bench1.c](https://github.com/stefanocasazza/ULib/tree/master/doc/benchmark/bin/bench1.c)
relies on ApacheBench (ab) and it is a slightly modified version of [G-WAN client](http://gwan.ch/source/ab.c.txt).
View
Binary file not shown.
@@ -281,6 +281,7 @@ PORT = (argv[3]?atoi(argv[3]):80);
FROM = (argv[4]?atoi(argv[4]):0);
TO = (argv[5]?atoi(argv[5]):1000);
+// #define U_SSL
// #define GWAN_28x
// #define U_KEEP_ALIVES
// -------------------------
@@ -319,7 +320,11 @@ TO = (argv[5]?atoi(argv[5]):1000);
"-H \"Connection: close\" " /* GWAN 2.8.[8-14] need this if NO Keep-Alives */
# endif
"-H \"Accept-Encoding: gzip,deflate\" " /* HTTP compression */
+# ifdef U_SSL
+ "\"https://%s" ":%d" "%s" "\"" " > %s/ab.txt", i?i:1, IP, PORT, URL, IP);
+# else
"\"http://%s" ":%d" "%s" "\"" " > %s/ab.txt", i?i:1, IP, PORT, URL, IP);
+# endif
#else
// HTTPerf does not let you specify the 'concurrency'rate:
//
@@ -1,102 +1,102 @@
- 1, 5942, 5965, 5992
- 10, 8075, 8111, 8172
- 20, 8430, 8471, 8528
- 30, 8508, 8568, 8610
- 40, 8602, 8646, 8700
- 50, 8624, 8667, 8717
- 60, 8619, 8684, 8732
- 70, 8636, 8670, 8728
- 80, 8625, 8660, 8722
- 90, 8586, 8641, 8687
- 100, 8611, 8648, 8709
- 110, 8599, 8659, 8707
- 120, 8585, 8647, 8692
- 130, 8587, 8627, 8693
- 140, 8580, 8625, 8666
- 150, 8503, 8561, 8617
- 160, 8518, 8559, 8624
- 170, 8521, 8576, 8622
- 180, 8478, 8529, 8590
- 190, 8462, 8517, 8584
- 200, 8445, 8506, 8542
- 210, 8403, 8445, 8499
- 220, 8402, 8476, 8547
- 230, 8416, 8477, 8528
- 240, 8399, 8446, 8516
- 250, 8389, 8447, 8504
- 260, 8393, 8436, 8474
- 270, 8345, 8380, 8431
- 280, 8365, 8421, 8471
- 290, 8353, 8395, 8448
- 300, 8321, 8371, 8432
- 310, 8329, 8381, 8423
- 320, 8325, 8363, 8411
- 330, 8261, 8309, 8381
- 340, 8295, 8354, 8396
- 350, 8282, 8319, 8393
- 360, 8261, 8308, 8366
- 370, 8276, 8324, 8375
- 380, 8254, 8292, 8358
- 390, 8223, 8274, 8322
- 400, 8244, 8294, 8339
- 410, 8235, 8268, 8327
- 420, 8220, 8274, 8315
- 430, 8223, 8254, 8301
- 440, 8201, 8236, 8303
- 450, 8168, 8217, 8251
- 460, 8177, 8211, 8276
- 470, 8166, 8217, 8275
- 480, 8159, 8198, 8241
- 490, 8131, 8180, 8244
- 500, 8128, 8178, 8229
- 510, 8118, 8159, 8207
- 520, 8141, 8167, 8229
- 530, 8134, 8184, 8244
- 540, 8118, 8159, 8223
- 550, 8088, 8141, 8211
- 560, 8078, 8160, 8210
- 570, 8062, 8100, 8172
- 580, 8076, 8125, 8198
- 590, 8067, 8127, 8188
- 600, 8056, 8094, 8165
- 610, 8062, 8107, 8156
- 620, 8055, 8096, 8151
- 630, 8041, 8074, 8132
- 640, 8059, 8108, 8162
- 650, 8039, 8082, 8149
- 660, 8037, 8090, 8149
- 670, 8031, 8083, 8133
- 680, 8044, 8081, 8161
- 690, 8052, 8109, 8157
- 700, 8092, 8130, 8212
- 710, 8079, 8141, 8245
- 720, 8041, 8142, 8230
- 730, 8081, 8141, 8265
- 740, 8029, 8146, 8243
- 750, 8000, 8064, 8179
- 760, 8025, 8110, 8237
- 770, 8010, 8107, 8218
- 780, 8010, 8068, 8191
- 790, 7978, 8099, 8189
- 800, 8006, 8083, 8213
- 810, 7978, 8063, 8195
- 820, 8000, 8078, 8192
- 830, 7964, 8036, 8192
- 840, 7959, 8081, 8195
- 850, 7951, 8014, 8155
- 860, 7917, 8024, 8141
- 870, 7913, 7994, 8119
- 880, 7946, 8010, 8151
- 890, 7916, 8023, 8144
- 900, 7917, 7981, 8133
- 910, 7913, 8019, 8138
- 920, 7890, 7967, 8122
- 930, 7851, 7928, 8076
- 940, 7893, 7973, 8078
- 950, 7839, 7917, 8073
- 960, 7853, 7966, 8088
- 970, 7829, 7890, 8012
- 980, 7814, 7910, 8010
- 990, 7780, 7860, 7991
- 1000, 7795, 7865, 8023
-min:824507 avg:830358 max:838057 Time:1060 second(s) [00:17:40]
+ 1, 5986, 6014, 6038
+ 10, 8065, 8122, 8180
+ 20, 8444, 8483, 8536
+ 30, 8564, 8620, 8664
+ 40, 8609, 8656, 8715
+ 50, 8635, 8679, 8732
+ 60, 8654, 8704, 8738
+ 70, 8625, 8676, 8734
+ 80, 8623, 8674, 8722
+ 90, 8611, 8668, 8705
+ 100, 8621, 8650, 8698
+ 110, 8600, 8657, 8699
+ 120, 8599, 8649, 8688
+ 130, 8582, 8616, 8668
+ 140, 8542, 8615, 8657
+ 150, 8527, 8578, 8629
+ 160, 8509, 8554, 8605
+ 170, 8487, 8550, 8594
+ 180, 8500, 8535, 8582
+ 190, 8469, 8525, 8579
+ 200, 8444, 8508, 8544
+ 210, 8432, 8475, 8530
+ 220, 8428, 8470, 8510
+ 230, 8417, 8457, 8492
+ 240, 8411, 8437, 8469
+ 250, 8393, 8433, 8468
+ 260, 8354, 8412, 8451
+ 270, 8363, 8401, 8458
+ 280, 8377, 8417, 8448
+ 290, 8372, 8395, 8437
+ 300, 8351, 8388, 8434
+ 310, 8323, 8379, 8416
+ 320, 8310, 8352, 8386
+ 330, 8299, 8337, 8382
+ 340, 8284, 8339, 8383
+ 350, 8273, 8303, 8362
+ 360, 8268, 8311, 8363
+ 370, 8266, 8308, 8345
+ 380, 8255, 8289, 8341
+ 390, 8262, 8300, 8343
+ 400, 8242, 8286, 8330
+ 410, 8242, 8269, 8326
+ 420, 8248, 8283, 8315
+ 430, 8218, 8240, 8279
+ 440, 8196, 8227, 8279
+ 450, 8186, 8227, 8257
+ 460, 8151, 8203, 8250
+ 470, 8185, 8209, 8248
+ 480, 8162, 8207, 8242
+ 490, 8155, 8194, 8253
+ 500, 8128, 8176, 8219
+ 510, 8157, 8180, 8217
+ 520, 8128, 8157, 8203
+ 530, 8138, 8179, 8220
+ 540, 8125, 8159, 8230
+ 550, 8083, 8138, 8208
+ 560, 8084, 8158, 8206
+ 570, 8070, 8118, 8173
+ 580, 8090, 8136, 8199
+ 590, 8064, 8124, 8189
+ 600, 8053, 8103, 8169
+ 610, 8065, 8113, 8174
+ 620, 8047, 8094, 8149
+ 630, 8071, 8102, 8170
+ 640, 8060, 8103, 8147
+ 650, 8021, 8067, 8123
+ 660, 8031, 8072, 8122
+ 670, 8034, 8083, 8129
+ 680, 8028, 8069, 8141
+ 690, 8061, 8116, 8161
+ 700, 8072, 8115, 8189
+ 710, 8046, 8127, 8223
+ 720, 8051, 8140, 8229
+ 730, 8030, 8112, 8259
+ 740, 8031, 8140, 8227
+ 750, 8020, 8084, 8196
+ 760, 8025, 8112, 8222
+ 770, 8000, 8091, 8216
+ 780, 7984, 8066, 8194
+ 790, 8008, 8100, 8198
+ 800, 7991, 8063, 8187
+ 810, 7970, 8062, 8196
+ 820, 7993, 8071, 8185
+ 830, 7964, 8024, 8168
+ 840, 7972, 8079, 8185
+ 850, 7961, 8026, 8167
+ 860, 7937, 8040, 8169
+ 870, 7929, 8015, 8153
+ 880, 7911, 7983, 8097
+ 890, 7883, 7988, 8099
+ 900, 7906, 7966, 8105
+ 910, 7909, 8002, 8114
+ 920, 7881, 7962, 8118
+ 930, 7886, 7968, 8096
+ 940, 7890, 7967, 8059
+ 950, 7850, 7927, 8099
+ 960, 7859, 7966, 8092
+ 970, 7840, 7908, 8098
+ 980, 7828, 7910, 8027
+ 990, 7801, 7886, 8012
+ 1000, 7806, 7865, 8019
+min:824891 avg:830493 max:837651 Time:1061 second(s) [00:17:41]
Oops, something went wrong.

0 comments on commit 43cb1a4

Please sign in to comment.