Merge remote-tracking branch 'upstream/master'

.travis.yml

@@ -0,0 +1,184 @@
+language: python
+python: 
+  - "2.7"
+
+env:
+  global:
+    - TFB_SERVER_HOST=127.0.0.1
+    - TFB_CLIENT_HOST=127.0.0.1
+    - TFB_DATABASE_HOST=127.0.0.1
+    - TFB_CLIENT_USER=travis
+    - TFB_DATABASE_USER=travis
+    - TFB_CLIENT_IDENTITY_FILE=/home/travis/.ssh/id_rsa
+    - TFB_DATABASE_IDENTITY_FILE=/home/travis/.ssh/id_rsa
+
+  matrix:
+
+    # Group tests by directory to logically break up travis-CI build. Otherwise
+    # we end up starting ~200+ different workers. Seems that ~100 is the limit
+    # before their website starts to lag heavily
+    #
+    # Here's a bash one-liner if you need to update this: 
+    # toolset/run-tests.py --list-tests | while read line ; do
+    #    echo "    - TEST=$line"
+    # done    
+    - TESTDIR=activeweb
+    - TESTDIR=aspnet
+    - TESTDIR=beego
+    - TESTDIR=bottle
+    - TESTDIR=cakephp
+    - TESTDIR=compojure
+    - TESTDIR=cowboy
+    - TESTDIR=cpoll_cppsp
+    - TESTDIR=curacao
+    - TESTDIR=dancer
+    - TESTDIR=dart
+    - TESTDIR=dart-start
+    - TESTDIR=dart-stream
+    - TESTDIR=dart-redstone
+    - TESTDIR=django
+    - TESTDIR=dropwizard
+    - TESTDIR=dropwizard-mongodb
+    - TESTDIR=duda
+    - TESTDIR=elli
+    - TESTDIR=evhttp-sharp
+    - TESTDIR=express
+    - TESTDIR=falcon
+    - TESTDIR=falcore
+    - TESTDIR=finagle
+    - TESTDIR=flask
+    - TESTDIR=gemini
+    - TESTDIR=gin
+    - TESTDIR=go
+    - TESTDIR=grails
+    - TESTDIR=grizzly-bm
+    - TESTDIR=grizzly-jersey
+    - TESTDIR=hapi
+    - TESTDIR=hhvm
+    - TESTDIR=http-kit
+    - TESTDIR=jester
+    - TESTDIR=jetty-servlet
+    - TESTDIR=kelp
+    - TESTDIR=lapis
+    - TESTDIR=lift-stateless
+    - TESTDIR=luminus
+    - TESTDIR=mojolicious
+    - TESTDIR=nancy
+    - TESTDIR=nawak
+    - TESTDIR=netty
+    - TESTDIR=ninja-resin
+    - TESTDIR=ninja-standalone
+    - TESTDIR=nodejs
+    - TESTDIR=onion
+    - TESTDIR=openresty
+    - TESTDIR=php
+    - TESTDIR=php-codeigniter
+    - TESTDIR=php-fuel
+    - TESTDIR=php-kohana
+    - TESTDIR=php-laravel
+    - TESTDIR=php-lithium
+    - TESTDIR=php-micromvc
+    - TESTDIR=php-phalcon
+    - TESTDIR=php-phalcon-micro
+    - TESTDIR=php-phpixie
+    - TESTDIR=php-pimf
+    - TESTDIR=php-senthot
+    - TESTDIR=php-silex
+    - TESTDIR=php-silex-orm
+    - TESTDIR=php-silica
+    - TESTDIR=php-slim
+    - TESTDIR=php-symfony2
+    - TESTDIR=php-symfony2-stripped
+    - TESTDIR=php-yaf
+    - TESTDIR=php-yii2
+    - TESTDIR=php-zend-framework
+    - TESTDIR=phreeze
+    - TESTDIR=plack
+    - TESTDIR=plain
+    - TESTDIR=play1
+    - TESTDIR=play1siena
+    - TESTDIR=play-activate-mysql
+    - TESTDIR=play-java
+    - TESTDIR=play-java-jpa
+    - TESTDIR=play-scala
+    - TESTDIR=play-scala-mongodb
+    - TESTDIR=play-slick
+    - TESTDIR=pyramid
+    - TESTDIR=rack
+    - TESTDIR=racket-ws
+    - TESTDIR=rails
+    - TESTDIR=rails-stripped
+    - TESTDIR=restexpress
+    - TESTDIR=revel
+    - TESTDIR=revel-jet
+    - TESTDIR=revel-qbs
+    - TESTDIR=ringojs
+    - TESTDIR=ringojs-convenient
+    - TESTDIR=scalatra
+    - TESTDIR=servicestack
+    - TESTDIR=servlet
+    - TESTDIR=servlet3-cass
+    - TESTDIR=sinatra
+    - TESTDIR=snap
+    - TESTDIR=spark
+    - TESTDIR=spray
+    - TESTDIR=spring
+    - TESTDIR=tapestry
+    - TESTDIR=tornado
+    - TESTDIR=treefrog
+    - TESTDIR=ULib
+    - TESTDIR=undertow
+    - TESTDIR=undertow-edge
+    - TESTDIR=unfiltered
+    - TESTDIR=urweb
+    - TESTDIR=uwsgi
+    - TESTDIR=vertx
+    - TESTDIR=wai
+    - TESTDIR=WeberFramework
+    - TESTDIR=webgo
+    - TESTDIR=web-simple
+    - TESTDIR=wicket
+    - TESTDIR=wildfly-ee7
+    - TESTDIR=wsgi
+    - TESTDIR=wt
+    - TESTDIR=yesod
+
+before_install:
+  # Enables $TRAVIS_COMMIT_RANGE for pull requests
+  - time ./toolset/setup/travis-ci/add_commit_range.sh
+  
+  # Configure Travis-CI build environment for TFB
+  #   e.g. setup databases, users, etc
+  - time ./toolset/run-ci.py cisetup $TESTDIR
+
+addons:
+  postgresql: "9.3" 
+
+install:
+  # Install prerequisites
+  - time ./toolset/run-ci.py prereq $TESTDIR
+  
+  # Install software for this framework  
+  - time ./toolset/run-ci.py install $TESTDIR
+   
+script: 
+  # Pick one test in this directory and verify
+  - time ./toolset/run-ci.py verify $TESTDIR
+
+notifications:
+  irc:
+    channels:
+      - "chat.freenode.net#techempower-fwbm"
+    template:
+      - "%{repository_slug} branch '%{branch}' %{result} (%{author})"
+      - "Build %{build_number} took %{duration}. See %{build_url}"
+    on_success: always
+    on_failure: always
+    skip_join: true
+
+cache:
+  directories:
+    - installs/mono-3.2.8
+    - installs/py2
+    - installs/py3
+    - installs/perl-5.18

README.md

@@ -1,4 +1,5 @@
 # Web Framework Performance Comparison
+[![Build Status](https://travis-ci.org/TechEmpower/FrameworkBenchmarks.svg?branch=master)](https://travis-ci.org/TechEmpower/FrameworkBenchmarks)
 
 This project provides representative performance measures across a wide field of web application frameworks. With much help from the community, coverage is quite broad and we are happy to broaden it further with contributions. The project presently includes frameworks on many languages including Go, Python, Java, Ruby, PHP, Clojure, Groovy, JavaScript, Erlang, Haskell, Scala, Lua, and C.  The current tests exercise plaintext responses, JSON seralization, database reads and writes via the object-relational mapper (ORM), collections, sorting, server-side templates, and XSS counter-measures.  Future tests will exercise other components and greater computation.
 
@@ -26,13 +27,13 @@ $ sudo apt-get install openssh-server
 ```bash
 $ sudo useradd -m -G sudo tfb
 ```
+* Run the command: `sudo visudo`
+* Change line 20 in from `%sudo   ALL=(ALL:ALL) ALL` to `%sudo ALL=(ALL) NOPASSWD: ALL`
 * Log in as `tfb`
 * Fully update **NOTE**: If you update the kernel (linux-firmware), it is generally a good idea to reboot aftewards.
 ```bash
 $ sudo apt-get update && sudo apt-get upgrade
 ```
-* Run the command: `sudo visudo`
-* Change line 20 in from `%sudo   ALL=(ALL:ALL) ALL` to `%sudo ALL=(ALL) NOPASSWD: ALL`
 * Run the following **(Don't enter a password, just hit enter when the prompt pops up)**. **NOTE** This is still necessary if the client and database are on the same computer as the server
 ```bash
 $ ssh-keygen
@@ -48,7 +49,7 @@ $ cd FrameworkBenchmarks
 ```
 * Install the server software. This will take a long time
 ```bash
-$ nohup python toolset/run-tests.py -s <server hostname/ip> -c <client hostname/ip> -u tfb --install server --list-tests &
+$ nohup python toolset/run-tests.py -s <server hostname/ip> -c <client hostname/ip> -u tfb --install-strategy unified --install server --list-tests &
 ```
 * If you want to view the process of installing, do the following. The session can be interrupted easily so no need to worry about keeping a connection.
 ```bash
@@ -158,7 +159,8 @@ Now, when running `run-tests.py`, just add `-d <ip of SQL Server instance>`. Thi
 
 ## Running the test suite
 
-We ran our tests using three dedicated i7 2600k machines, three EC2 m1.large instances, and three servers from Peak Hosting
+We ran our tests using three dedicated i7 2600k machines, three EC2 m1.large instances, and three servers from Peak Hosting. You can find the raw output data 
+[here](https://github.com/TechEmpower/TFB-Round-9)
 
 ## Updating Tests
 

ULib/README.md

@@ -0,0 +1,107 @@
+#ULib Benchmarking Test
+
+This is the ULib portion of a [benchmarking test suite](https://github.com/TechEmpower/FrameworkBenchmarks) comparing a variety of web development platforms.
+
+### JSON Encoding Test
+
+* [JSON test source](src/json.usp)
+
+### Data-Store/Database Mapping Test
+
+* [Database test source](src/db.usp)
+
+### Variable Query Test
+
+* [Variable Query test source](src/queries.usp)
+
+### Fortune Query Test
+
+* [Fortune Query test source](src/fortunes.usp)
+
+### Variable Query (update) Test
+
+* [Variable Query (update) test source](src/updates.usp)
+
+### Plaintext Test
+
+* [Plaintext test source](src/plaintext.usp)
+
+## Infrastructure Software Versions
+The tests were run with:
+
+* [ULib Version 1.4.1](https://github.com/stefanocasazza/ULib/archive/v1.4.1.tar.gz)
+
+Output
+======
+
+[/json](http://www.techempower.com/benchmarks/#section=json)
+-----
+```
+HTTP/1.1 200 OK
+Date: Thu, 03 Jul 2014 10:11:10 GMT
+Server: ULib 
+Content-Length: 27
+Content-Type: application/json; charset=UTF-8
+
+{"message":"Hello, World!"}
+```
+
+[/db](http://www.techempower.com/benchmarks/#section=db)
+---
+```
+HTTP/1.1 200 OK
+Date: Thu, 03 Jul 2014 10:14:51 GMT
+Server: ULib 
+Content-Length: 31
+Content-Type: application/json; charset=UTF-8
+
+{"id":6227,"randomNumber":8489}
+```
+
+[/queries?queries=10](http://www.techempower.com/benchmarks/#section=query)
+-------------------
+```
+HTTP/1.1 200 OK
+Date: Thu, 03 Jul 2014 10:14:51 GMT
+Server: ULib 
+Content-Length: 320
+Content-Type: application/json; charset=UTF-8
+
+[{"id":6851,"randomNumber":7598},{"id":3968,"randomNumber":7325},{"id":8159,"randomNumber":348},{"id":9560,"randomNumber":7333},{"id":9938,"randomNumber":9080},{"id":1598,"randomNumber":1623},{"id":3280,"randomNumber":8707},{"id":4521,"randomNumber":6063},{"id":8173,"randomNumber":3690},{"id":3648,"randomNumber":8803}]
+```
+
+[/fortunes](http://www.techempower.com/benchmarks/#section=fortune)
+---------
+```
+HTTP/1.1 200 OK
+Date: Thu, 03 Jul 2014 10:14:51 GMT
+Server: ULib 
+Content-Type: text/html; charset=UTF-8
+Content-Length: 1227
+
+<!doctype html><html><head><title>Fortunes</title></head><body><table><tr><th>id</th><th>message</th></tr><tr><td>11</td><td>&lt;script&gt;alert(&quot;This should not be displayed in a browser alert box.&quot;);&lt;/script&gt;</td></tr><tr><td>4</td><td>A bad random number generator: 1, 1, 1, 1, 1, 4.33e+67, 1, 1, 1</td></tr><tr><td>5</td><td>A computer program does what you tell it to do, not what you want it to do.</td></tr><tr><td>2</td><td>A computer scientist is someone who fixes things that aren&apos;t broken.</td></tr><tr><td>8</td><td>A list is only as strong as its weakest link. — Donald Knuth</td></tr><tr><td>0</td><td>Additional fortune added at request time.</td></tr><tr><td>3</td><td>After enough decimal places, nobody gives a damn.</td></tr><tr><td>7</td><td>Any program that runs right is obsolete.</td></tr><tr><td>10</td><td>Computers make very fast, very accurate mistakes.</td></tr><tr><td>6</td><td>Emacs is a nice operating system, but I prefer UNIX. — Tom Christaensen</td></tr><tr><td>9</td><td>Feature: A bug with seniority.</td></tr><tr><td>1</td><td>fortune: No such file or directory</td></tr><tr><td>12</td><td>フレームワークのベンチマーク</td></tr></table></body></html>
+```
+
+[/updates?queries=10](http://www.techempower.com/benchmarks/#section=update)
+-------------------
+```
+HTTP/1.1 200 OK
+Date: Thu, 03 Jul 2014 10:14:51 GMT
+Server: ULib 
+Content-Length: 319
+Content-Type: application/json; charset=UTF-8
+
+[{"id":7171,"randomNumber":351},{"id":6019,"randomNumber":9725},{"id":8118,"randomNumber":4023},{"id":7965,"randomNumber":1388},{"id":7797,"randomNumber":2249},{"id":112,"randomNumber":1108},{"id":6127,"randomNumber":4323},{"id":2597,"randomNumber":7509},{"id":2978,"randomNumber":7883},{"id":1111,"randomNumber":2228}]
+```
+
+[/plaintext](http://www.techempower.com/benchmarks/#section=plaintext)
+----------
+```
+HTTP/1.1 200 OK
+Date: Thu, 03 Jul 2014 10:14:51 GMT
+Server: ULib 
+Content-Type: text/plain; charset=UTF-8
+Content-Length: 13
+
+Hello, World!
+```

ULib/bash_profile.sh

@@ -0,0 +1,16 @@
+#---------------------------------------------------------------------------------------------------------
+# bash_profile.sh - set the environment of our ULib installation
+#---------------------------------------------------------------------------------------------------------
+# TROOT - Path of this test's directory
+# IROOT - Path of this test's install directory ($FWROOT/installs or $FWROOT/installs/pertest/<test-name>)
+#---------------------------------------------------------------------------------------------------------
+# INFO:root:Running installation for ULib
+# INSTALL: 
+#    export TROOT=$FWROOT/ULib && 
+#    export IROOT=$FWROOT/installs && 
+#    . $FWROOT/toolset/setup/linux/bash_functions.sh && 
+#    . $FWROOT/ULib/install.sh (cwd=$FWROOT//installs)
+#---------------------------------------------------------------------------------------------------------
+export ULIB_VERSION=1.4.1
+export ULIB_ROOT=$IROOT/ULib
+export ULIB_DOCUMENT_ROOT=${ULIB_ROOT}/ULIB_DOCUMENT_ROOT

ULib/benchmark_config

@@ -0,0 +1,28 @@
+{
+  "framework": "ULib",
+  "tests": [{
+    "default": {
+      "setup_file": "setup",
+      "json_url": "/json",
+      "db_url": "/db",
+      "query_url": "/queries?queries=",
+      "fortune_url": "/fortunes",
+      "update_url": "/updates?queries=",
+      "plaintext_url": "/plaintext",
+      "port": 8080,
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "ULib",
+      "language": "C++",
+      "orm": "Micro",
+      "platform": "ULib",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "ULib",
+      "notes": "",
+      "versus": ""
+    }
+  }]
+}

ULib/install.sh

@@ -0,0 +1,77 @@
+#!/bin/bash
+
+# install.sh
+# --------------------------------------------------------------------------------------------------------
+# toolset/run-tests.py --install server --test ULib --type all --verbose
+# --------------------------------------------------------------------------------------------------------
+# TROOT - Path of this test's directory
+# IROOT - Path of this test's install directory ($FWROOT/installs or $FWROOT/installs/pertest/<test-name>)
+# --------------------------------------------------------------------------------------------------------
+# INFO:root:Running installation for ULib
+# INSTALL: 
+#    export TROOT=$FWROOT/ULib && 
+#    export IROOT=$FWROOT/installs && 
+#    . $FWROOT/toolset/setup/linux/bash_functions.sh && 
+#    . $FWROOT/ULib/install.sh (cwd=$FWROOT//installs)
+# --------------------------------------------------------------------------------------------------------
+
+# Chekc if ULib is already installed
+RETCODE=$(fw_exists ulib-${ULIB_VERSION}.installed)
+[ ! "$RETCODE" == 0 ] || { return 0; }
+
+# Create a run directory for ULIB
+if [ ! -d "$ULIB_ROOT" ]; then
+  mkdir -p $ULIB_ROOT
+fi
+
+# Add a simple configuration file to it
+cd $ULIB_ROOT
+if [ ! -f "benchmark.cfg" ]; then
+  cat <<EOF >benchmark.cfg
+userver {
+ PORT 8080
+ PREFORK_CHILD 8
+ LISTEN_BACKLOG 8192
+ MAX_KEEP_ALIVE 8192
+ DOCUMENT_ROOT $ULIB_DOCUMENT_ROOT
+ PID_FILE ${ULIB_ROOT}/userver_tcp.pid
+}
+EOF
+fi
+
+# 1. Download ULib
+cd $IROOT
+fw_get -O ULib-${ULIB_VERSION}.tar.gz https://github.com/stefanocasazza/ULib/archive/v${ULIB_VERSION}.tar.gz 
+fw_untar ULib-${ULIB_VERSION}.tar.gz
+
+# 2. Compile application (userver_tcp)
+
+cd ULib-$ULIB_VERSION
+
+# AVOID "configure: error: newly created file is older than distributed files! Check your system clock"
+find . -exec touch {} \;
+
+LIBS="-lssl -lcrypto -lz" \
+./configure --prefix=$ULIB_ROOT \
+            --disable-static \
+            --with-mysql \
+            --without-ssl --without-pcre --without-expat \
+            --without-libz --without-libuuid --without-magic \
+            --enable-static-orm-driver=mysql --enable-static-server-plugin=http
+#           --enable-debug \
+make install
+
+# 3. Compile usp pages for benchmark
+cd src/ulib/net/server/plugin/usp
+make db.la fortunes.la json.la plaintext.la queries.la updates.la
+
+# Check that compilation worked
+if [ ! -e .libs/db.so ]; then
+   exit 1
+fi
+
+mkdir -p $ULIB_DOCUMENT_ROOT
+cp .libs/db.so .libs/fortunes.so .libs/json.so .libs/plaintext.so .libs/queries.so .libs/updates.so $ULIB_DOCUMENT_ROOT
+
+cd $IROOT
+touch ulib-${ULIB_VERSION}.installed 

ULib/setup.py

@@ -0,0 +1,60 @@
+import os
+import sys
+import time
+import setup_util
+import subprocess
+import multiprocessing
+
+def start(args, logfile, errfile):
+
+  fwroot = args.fwroot
+
+  try:
+    ulib_root = subprocess.check_output('printf $ULIB_ROOT', shell=True, stderr=errfile)
+
+    fcfg = ulib_root + "/benchmark.cfg"
+
+    # 1. Change ULib Server configuration
+
+    # I don't understand if the two approach are different...
+    #threads = str(args.max_threads)
+    PROCS = str(multiprocessing.cpu_count())
+    setup_util.replace_text(fcfg, "PREFORK_CHILD .*", "PREFORK_CHILD " + PROCS)
+
+    fprg = ulib_root + "/bin/userver_tcp"
+
+    # 2. Start ULib Server (userver_tcp)
+    logfile.write("ULib: trying to start server %s -c %s\n" % (fprg, fcfg))
+
+    # sudo mysqlcheck -v -r -A -u benchmarkdbuser -p
+    os.putenv("ORM_DRIVER","mysql")
+    os.putenv("ORM_OPTION","host=" + args.database_host + " user=benchmarkdbuser password=benchmarkdbpass dbname=hello_world")
+    os.putenv("UMEMPOOL", "1583,1507,-19,45,16458,523,-27,-14,27")
+
+    # Run in the background, but keep stdout/stderr for easy debugging
+    subprocess.Popen( "%s -c %s" % (fprg, fcfg), shell=True, stdout=logfile, stderr=errfile)
+    # subprocess.Popen("UTRACE=\"0 50M\" " + fprg + " -c " + fcfg, shell=True, stdout=logfile, stderr=errfile)
+
+    logfile.write("ULib: server STARTED\n")
+    return 0
+  except subprocess.CalledProcessError:
+    return 1
+
+def stop(logfile, errfile):
+  try:
+    logfile.write( "ULib: setup.py STOP\n")
+
+
+    # Stop ULib Server (userver_tcp)
+    subprocess.check_call("kill -TERM $( cat $ULIB_ROOT/userver_tcp.pid )", shell=True, stderr=errfile, stdout=logfile)
+    time.sleep(2);
+    p = subprocess.Popen(['ps', 'aux'], stdout=subprocess.PIPE)
+    out, err = p.communicate()
+    for line in out.splitlines():
+       if 'userver_tcp' in line:
+         pid = int(line.split(None, 2)[1])
+         os.kill(pid, 9)
+    subprocess.call("rm -f $ULIB_ROOT/userver_tcp.pid", shell=True, stderr=errfile, stdout=logfile)
+    return 0
+  except subprocess.CalledProcessError:
+    return 1

ULib/source_code

@@ -0,0 +1,8 @@
+./src/db.usp
+./src/world.h
+./src/json.usp
+./src/fortune.h
+./src/queries.usp
+./src/updates.usp
+./src/fortunes.usp
+./src/plaintext.usp

ULib/src/db.usp

@@ -0,0 +1,120 @@
+<!--#
+Test 2: Single database query
+
+This test exercises the framework's object-relational mapper (ORM), random number generator, database driver, and database connection pool.
+
+Requirements
+
+1.  For every request, a single row from a World table must be retrieved from a database table. 
+
+2.  The recommended URI is /db.
+
+3.  The schema for World is id (int, primary key) and randomNumber (int).
+
+4.  The World table is known to contain 10,000 rows.
+
+5.  The row retrieved must be selected by its id using a random number generator (ids range from 1 to 10,000).
+
+6.  The row should be converted to an object using an object-relational mapping (ORM) tool.
+    Tests that do not use an ORM will be identified with the suffix "raw," meaning they use the platform's raw database connectivity.
+
+7.  The object (or database row, if an ORM is not used) must be serialized to JSON.
+
+8.  The response content length should be approximately 32 bytes.
+
+9.  The response content type must be set to application/json.
+
+10. The response headers must include either Content-Length or Transfer-Encoding.
+
+11. The response headers must include Server and Date.
+
+12. Use of an in-memory cache of World objects or rows by the application is not permitted.
+
+13. Use of prepared statements for SQL database tests (e.g., for MySQL) is encouraged but not required.
+
+14. gzip compression is not permitted.
+
+15. Server support for HTTP Keep-Alive is strongly encouraged but not required.
+
+16. If HTTP Keep-Alive is enabled, no maximum Keep-Alive timeout is specified by this test.
+
+17. The request handler will be exercised at concurrency levels ranging from 8 to 256.
+
+18. The request handler will be exercised using GET requests.
+
+Example request:
+
+GET /db HTTP/1.1
+Host: server
+User-Agent: Mozilla/5.0 (X11; Linux x86_64) Gecko/20130501 Firefox/30.0 AppleWebKit/600.00 Chrome/30.0.0000.0 Trident/10.0 Safari/600.00
+Cookie: uid=12345678901234567890; __utma=1.1234567890.1234567890.1234567890.1234567890.12; wd=2560x1600
+Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
+Accept-Language: en-US,en;q=0.5
+Connection: keep-alive
+
+Example response:
+
+HTTP/1.1 200 OK
+Content-Type: application/json; charset=UTF-8
+Content-Length: 32
+Server: Example
+Date: Wed, 17 Apr 2013 12:00:00 GMT
+{"id":3217,"randomNumber":2149}
+-->
+<!--#declaration
+#include "world.h"
+
+#define AS_cpoll_cppsp_DO
+
+#ifndef AS_cpoll_cppsp_DO
+static UValue*	pvalue;
+#endif
+static World*			 pworld_db;
+static UOrmSession*	 psql_db;
+static UOrmStatement* pstmt_db;
+
+static void usp_init_db()
+{
+	U_TRACE(5, "::usp_init_db()")
+
+	psql_db	= U_NEW(UOrmSession(U_CONSTANT_TO_PARAM("hello_world")));
+	pstmt_db	= U_NEW(UOrmStatement(*psql_db, U_CONSTANT_TO_PARAM("SELECT randomNumber FROM World WHERE id = ?")));
+
+	if (pstmt_db == 0) U_ERROR("usp_init_db(): we cound't connect to db, exiting...");
+
+	pworld_db = U_NEW(World);
+
+	pstmt_db->use( pworld_db->id);
+	pstmt_db->into(pworld_db->randomNumber);
+
+#ifndef AS_cpoll_cppsp_DO
+	pvalue = U_NEW(UValue(OBJECT_VALUE));
+#endif
+}
+
+static void usp_end_db()
+{
+	U_TRACE(5, "::usp_end_db()")
+
+	delete pstmt_db;
+	delete psql_db;
+	delete pworld_db;
+#ifndef AS_cpoll_cppsp_DO
+	delete pvalue;
+#endif
+}
+-->
+<!--#header
+Content-Type: application/json; charset=UTF-8
+-->
+<!--#code
+pworld_db->id = u_get_num_random(10000);
+
+pstmt_db->execute();
+
+#ifdef AS_cpoll_cppsp_DO
+USP_PRINTF_ADD("{\"id\":%d,\"randomNumber\":%d}", pworld_db->id, pworld_db->randomNumber);
+#else
+USP_JSON_stringify(*pvalue, World, *pworld_db);
+#endif
+-->

ULib/src/fortune.h

@@ -0,0 +1,123 @@
+// fortune.h
+
+#ifndef FORTUNE_H
+#define FORTUNE_H 1
+
+#include <ulib/orm/orm.h>
+#include <ulib/json/value.h>
+
+class Fortune {
+public:
+	// Check for memory error
+	U_MEMORY_TEST
+
+	// Allocator e Deallocator
+	U_MEMORY_ALLOCATOR
+	U_MEMORY_DEALLOCATOR
+
+	int id;
+	UString message;
+
+	// CONSTRUCTOR
+
+	Fortune()
+		{
+		U_TRACE_REGISTER_OBJECT(5, Fortune, "")
+		}
+
+	Fortune(int _id, const UString& _message) : id(_id), message(_message)
+		{
+		U_TRACE_REGISTER_OBJECT(5, Fortune, "%d,%.*S", _id, U_STRING_TO_TRACE(_message))
+		}
+
+	Fortune(const Fortune& f) : id(f.id), message((void*)U_STRING_TO_PARAM(f.message))
+		{
+		U_TRACE_REGISTER_OBJECT(5, Fortune, "%p", &f)
+
+		U_MEMORY_TEST_COPY(f)
+		}
+
+	~Fortune()
+		{
+		U_TRACE_UNREGISTER_OBJECT(5, Fortune)
+		}
+
+	// SERVICE
+
+	bool operator<(const Fortune& other) const { return cmp_obj(&message, &other.message); }
+
+	static int cmp_obj(const void* a, const void* b)
+		{
+		U_TRACE(5, "Fortune::cmp_obj(%p,%p)", a, b)
+
+		return (*(const Fortune**)a)->message.compare((*(const Fortune**)b)->message);
+		}
+
+#ifdef DEBUG
+	const char* dump(bool breset) const
+		{
+		*UObjectIO::os << "id               " << id				   << '\n'
+							<< "message (UString " << (void*)&message << ')';
+
+		if (breset)
+			{
+			UObjectIO::output();
+
+			return UObjectIO::buffer_output;
+			}
+
+		return 0;
+		}
+#endif
+
+private:
+	Fortune& operator=(const Fortune&) { return *this; }
+};
+
+// ORM TEMPLATE SPECIALIZATIONS
+
+template <> class U_EXPORT UOrmTypeHandler<Fortune> : public UOrmTypeHandler_Base {
+public:
+	explicit UOrmTypeHandler(Fortune& val) : UOrmTypeHandler_Base(&val) {}
+
+	void bindParam(UOrmStatement* stmt) const
+		{
+		U_TRACE(0, "UOrmTypeHandler<Fortune>::bindParam(%p)", stmt)
+
+		stmt->bindParam(U_ORM_TYPE_HANDLER(Fortune, id,		  int));
+		stmt->bindParam(U_ORM_TYPE_HANDLER(Fortune, message, UString));
+		}
+
+	void bindResult(UOrmStatement* stmt)
+		{
+		U_TRACE(0, "UOrmTypeHandler<Fortune>::bindResult(%p)", stmt)
+
+		stmt->bindResult(U_ORM_TYPE_HANDLER(Fortune, id,		int));
+		stmt->bindResult(U_ORM_TYPE_HANDLER(Fortune, message, UString));
+		}
+};
+
+// JSON TEMPLATE SPECIALIZATIONS
+
+template <> class U_EXPORT UJsonTypeHandler<Fortune> : public UJsonTypeHandler_Base {
+public:
+	explicit UJsonTypeHandler(Fortune& val) : UJsonTypeHandler_Base(&val) {}
+
+	void toJSON(UValue& json)
+		{
+		U_TRACE(0, "UJsonTypeHandler<Fortune>::toJSON(%p)", &json)
+
+		json.toJSON(U_JSON_TYPE_HANDLER(Fortune, id,		  int));
+		json.toJSON(U_JSON_TYPE_HANDLER(Fortune, message, UString));
+		}
+
+	void fromJSON(UValue& json)
+		{
+		U_TRACE(0, "UJsonTypeHandler<Fortune>::fromJSON(%p)", &json)
+
+		json.fromJSON(U_JSON_TYPE_HANDLER(Fortune, id,		 int));
+		json.fromJSON(U_JSON_TYPE_HANDLER(Fortune, message, UString));
+		}
+};
+
+#endif

ULib/src/fortunes.usp

@@ -0,0 +1,153 @@
+<!--#
+Test 4: Fortunes
+
+This test exercises the ORM, database connectivity, dynamic-size collections,
+sorting, server-side templates, XSS countermeasures, and character encoding.
+
+Requirements
+
+1.  The recommended URI is /fortunes.
+
+2.  A Fortune database table contains a dozen Unix-style fortune-cookie messages.
+
+3.  The schema for Fortune is id (int, primary key) and message (varchar).
+
+4.  Using an ORM, all Fortune objects must be fetched from the Fortune table, and placed into a list data structure.
+    Tests that do not use an ORM will be classified as "raw" meaning they use the platform's raw database connectivity.
+
+5.  The list data structure must be a dynamic-size or equivalent and should not be dimensioned using foreknowledge of
+    the row-count of the database table.
+
+6.  Within the scope of the request, a new Fortune object must be constructed and added to the list. This confirms that
+    the data structure is dynamic-sized. The new fortune is not persisted to the database; it is ephemeral for the scope of the request.
+
+7.  The new Fortune's message must be "Additional fortune added at request time."
+
+8.  The list of Fortune objects must be sorted by the order of the message field. No ORDER BY clause is permitted in the
+    database query (ordering within the query would be of negligible value anyway since a newly instantiated Fortune is
+	 added to the list prior to sorting).
+
+9.  The sorted list must be provided to a server-side template and rendered to simple HTML (see below for minimum template).
+    The resulting HTML table displays each Fortune's id number and message text.
+
+10. This test does not include external assets (CSS, JavaScript); a later test type will include assets.
+
+11. The HTML generated by the template must be sent as a response.
+
+12. Be aware that the message text fields are stored as UTF-8 and one of the fortune cookie messages is in Japanese.
+
+13. The resulting HTML must be delivered using UTF-8 encoding.
+
+14. The Japanese fortune cookie message must be displayed correctly.
+
+15. Be aware that at least one of the message text fields includes a <script> tag.
+
+16. The server-side template must assume the message text cannot be trusted and must escape the message text properly.
+
+17. The implementation is encouraged to use best practices for templates such as layout inheritence, separate header and
+    footer files, and so on. However, this is not required. We request that implementations do not manage assets (JavaScript,
+	 CSS, images). We are deferring asset management until we can craft a more suitable test.
+
+18. The response content type must be set to text/html.
+
+19. The response headers must include either Content-Length or Transfer-Encoding.
+
+20. The response headers must include Server and Date.
+
+21. Use of an in-memory cache of Fortune objects or rows by the application is not permitted.
+
+22. Use of prepared statements for SQL database tests (e.g., for MySQL) is encouraged but not required.
+
+23. gzip compression is not permitted.
+
+24. Server support for HTTP Keep-Alive is strongly encouraged but not required.
+
+25. If HTTP Keep-Alive is enabled, no maximum Keep-Alive timeout is specified by this test.
+
+26. The request handler will be exercised at concurrency levels ranging from 8 to 256.
+
+27. The request handler will be exercised using GET requests.
+
+Example request:
+
+GET /fortunes HTTP/1.1
+Host: server
+User-Agent: Mozilla/5.0 (X11; Linux x86_64) Gecko/20130501 Firefox/30.0 AppleWebKit/600.00 Chrome/30.0.0000.0 Trident/10.0 Safari/600.00
+Cookie: uid=12345678901234567890; __utma=1.1234567890.1234567890.1234567890.1234567890.12; wd=2560x1600
+Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
+Accept-Language: en-US,en;q=0.5
+Connection: keep-alive
+
+Example response:
+
+HTTP/1.1 200 OK
+Content-Length: 1190
+Content-Type: text/html; charset=UTF-8
+Server: Example
+Date: Wed, 17 Apr 2013 12:00:00 GMT
+
+<!doctype html><html><head><title>Fortunes</title></head><body><table><tr><th>id</th><th>message</th></tr><tr><td>11</td><td>&lt;script&gt;alert(&quot;This should not be displayed in a browser alert box.&quot;);&lt;/script&gt;</td></tr><tr><td>4</td><td>A bad random number generator: 1, 1, 1, 1, 1, 4.33e+67, 1, 1, 1</td></tr><tr><td>5</td><td>A computer program does what you tell it to do, not what you want it to do.</td></tr><tr><td>2</td><td>A computer scientist is someone who fixes things that aren't broken.</td></tr><tr><td>8</td><td>A list is only as strong as its weakest link. â Donald Knuth</td></tr><tr><td>0</td><td>Additional fortune added at request time.</td></tr><tr><td>3</td><td>After enough decimal places, nobody gives a damn.</td></tr><tr><td>7</td><td>Any program that runs right is obsolete.</td></tr><tr><td>10</td><td>Computers make very fast, very accurate mistakes.</td></tr><tr><td>6</td><td>Emacs is a nice operating system, but I prefer UNIX. â Tom Christaensen</td></tr><tr><td>9</td><td>Feature: A bug with seniority.</td></tr><tr><td>1</td><td>fortune: No such file or directory</td></tr><tr><td>12</td><td>ã¬ã¼ãã¯ã¼ã¯ã®ãã³ããã¼ã¯</td></tr></table></body></html>
+-->
+<!--#declaration
+#include "fortune.h"
+
+static UOrmSession*		  psql_fortune;
+static UOrmStatement*	  pstmt_fortune;
+static Fortune*			  pfortune;
+static UString*           pmessage;
+static UVector<Fortune*>* pvfortune;
+
+static void usp_init_fortunes()
+{
+	U_TRACE(5, "::usp_init_fortunes()")
+
+	psql_fortune  = U_NEW(UOrmSession(U_CONSTANT_TO_PARAM("fortune")));
+	pstmt_fortune = U_NEW(UOrmStatement(*psql_fortune, U_CONSTANT_TO_PARAM("SELECT id, message FROM Fortune")));
+
+	if (pstmt_fortune == 0) U_ERROR("usp_init_fortunes(): we cound't connect to db, exiting...");
+
+	pfortune  = U_NEW(Fortune);
+	pvfortune = U_NEW(UVector<Fortune*>);
+	pmessage  = U_NEW(U_STRING_FROM_CONSTANT("Additional fortune added at request time."));
+
+	pstmt_fortune->into(*pfortune);
+}
+
+static void usp_end_fortunes()
+{
+	U_TRACE(5, "::usp_end_fortunes()")
+
+	delete pstmt_fortune;
+	delete psql_fortune;
+	delete pvfortune;
+	delete pfortune;
+	delete pmessage;
+}
+-->
+<!doctype html><html><head><title>Fortunes</title></head><body><table><tr><th>id</th><th>message</th></tr><!--#code
+Fortune* elem;
+unsigned char encoded[1024];
+
+pstmt_fortune->execute();
+
+	  pvfortune->push_back(U_NEW(Fortune(0, *pmessage)));
+do	{ pvfortune->push_back(U_NEW(Fortune(*pfortune))); } while (pstmt_fortune->nextRow());
+
+pvfortune->sort(Fortune::cmp_obj);
+
+for (uint32_t i = 0, n = pvfortune->size(); i < n; ++i)
+	{
+	elem = (*pvfortune)[i];
+
+	(void) u_xml_encode((const unsigned char*)U_STRING_TO_PARAM(elem->message), encoded);
+
+	USP_PRINTF_ADD(
+		"<tr>"
+		"<td>%d</td>"
+		"<td>%s</td>"
+		"</tr>",
+		elem->id, encoded);
+	}
+
+pvfortune->clear();
+--></table></body></html>

ULib/src/json.usp

@@ -0,0 +1,80 @@
+<!--#
+Test 1: JSON serialization
+
+This test exercises the framework fundamentals including keep-alive support, request routing, request header
+parsing, object instantiation, JSON serialization, response header generation, and request count throughput.
+
+Requirements
+
+1.  For each request, an object mapping the key message to Hello, World! must be instantiated.
+
+2.  The recommended URI is /json.
+
+3.  A JSON serializer must be used to convert the object to JSON.
+
+4.  The response text must be {"message":"Hello, World!"}, but white-space variations are acceptable.
+
+5.  The response content length should be approximately 28 bytes.
+
+6.  The response content type must be set to application/json.
+
+7.  The response headers must include either Content-Length or Transfer-Encoding.
+
+8.  The response headers must include Server and Date.
+
+9.  gzip compression is not permitted.
+
+10. Server support for HTTP Keep-Alive is strongly encouraged but not required.
+
+11. If HTTP Keep-Alive is enabled, no maximum Keep-Alive timeout is specified by this test.
+
+12. The request handler will be exercised at concurrency levels ranging from 8 to 256.
+
+13. The request handler will be exercised using GET requests.
+
+Example request:
+
+GET /json HTTP/1.1
+Host: server
+User-Agent: Mozilla/5.0 (X11; Linux x86_64) Gecko/20130501 Firefox/30.0 AppleWebKit/600.00 Chrome/30.0.0000.0 Trident/10.0 Safari/600.00
+Cookie: uid=12345678901234567890; __utma=1.1234567890.1234567890.1234567890.1234567890.12; wd=2560x1600
+Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
+Accept-Language: en-US,en;q=0.5
+Connection: keep-alive
+
+Example response:
+
+HTTP/1.1 200 OK
+Content-Type: application/json; charset=UTF-8
+Content-Length: 28
+Server: Example
+Date: Wed, 17 Apr 2013 12:00:00 GMT
+{"message":"Hello, World!"}
+-->
+<!--#declaration
+static UString* pkey;
+static UString* pvalue;
+
+static void usp_init_json()
+{
+	U_TRACE(5, "::usp_init_json()")
+
+	pkey   = U_NEW(U_STRING_FROM_CONSTANT("message"));
+	pvalue = U_NEW(U_STRING_FROM_CONSTANT("Hello, World!"));
+}
+
+static void usp_end_json()
+{
+	U_TRACE(5, "::usp_end_json()")
+
+	delete pkey;
+	delete pvalue;
+}
+-->
+<!--#header
+Content-Type: application/json; charset=UTF-8
+-->
+<!--#code
+UValue json(*pkey, *pvalue);
+USP_JSON_PUTS(json);
+-->

ULib/src/plaintext.usp

@@ -0,0 +1,51 @@
+<!--#
+Test 6: Plaintext
+
+This test is an exercise of the request-routing fundamentals only, designed to demonstrate the capacity of
+high-performance platforms in particular. The response payload is still small, meaning good performance is
+still necessary in order to saturate the gigabit Ethernet of the test environment.
+
+Requirements
+
+1.  The recommended URI is /plaintext.
+
+2.  The response content type must be set to text/plain.
+
+3.  The response body must be Hello, World!.
+
+4.  The response headers must include either Content-Length or Transfer-Encoding.
+
+5.  The response headers must include Server and Date.
+
+6.  gzip compression is not permitted.
+
+7.  Server support for HTTP Keep-Alive is strongly encouraged but not required.
+
+8.  Server support for HTTP pipelining is strongly encouraged but not required.
+
+9.  If HTTP Keep-Alive is enabled, no maximum Keep-Alive timeout is specified by this test.
+
+10. The request handler will be exercised at 256, 1024, 4096, and 16,384 concurrency.
+
+11. The request handler will be exercised using GET requests.
+
+Example request:
+
+GET /plaintext HTTP/1.1
+Host: server
+User-Agent: Mozilla/5.0 (X11; Linux x86_64) Gecko/20130501 Firefox/30.0 AppleWebKit/600.00 Chrome/30.0.0000.0 Trident/10.0 Safari/600.00
+Cookie: uid=12345678901234567890; __utma=1.1234567890.1234567890.1234567890.1234567890.12; wd=2560x1600
+Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
+Accept-Language: en-US,en;q=0.5
+Connection: keep-alive
+
+Example response:
+
+HTTP/1.1 200 OK
+Content-Length: 15
+Content-Type: text/plain; charset=UTF-8
+Server: Example
+Date: Wed, 17 Apr 2013 12:00:00 GMT
+Hello, World!
+-->
+Hello, World!

ULib/src/queries.usp

@@ -0,0 +1,160 @@
+<!--#
+Test 3: Multiple database queries
+
+This test is a variation of Test #2 and also uses the World table. Multiple rows are fetched to more dramatically
+punish the database driver and connection pool. At the highest queries-per-request tested (20), this test demonstrates
+all frameworks' convergence toward zero requests-per-second as database activity increases.
+
+Requirements
+
+1.  For every request, an integer query string parameter named queries must be retrieved from the request.
+	 The parameter specifies the number of database queries to execute in preparing the HTTP response (see below).
+
+2.  The recommended URI is /queries.
+
+3.  The queries parameter must be bounded to between 1 and 500. If the parameter is missing, is not an integer,
+	 or is an integer less than 1, the value should be interpreted as 1; if greater than 500, the value should be interpreted as 500.
+
+3.  The schema for World is id (int, primary key) and randomNumber (int).
+
+4.  The request handler must retrieve a set of World objects, equal in count to the queries parameter, from the World database table.
+
+5.  Each row must be selected randomly in the same fashion as the single database query test (Test #2 above).
+
+6.  Since this test is designed to exercise multiple queries, each row must be selected individually by a query.
+	 It is not acceptable to retrieve all required rows using a SELECT ... WHERE id IN (...) clause.
+
+7.  Each World object must be added to a list or array.
+
+8.  The list or array must be serialized to JSON and sent as a response.
+
+9.  The response content type must be set to application/json.
+
+10. The response headers must include either Content-Length or Transfer-Encoding.
+
+11. The response headers must include Server and Date.
+
+12. Use of an in-memory cache of World objects or rows by the application is not permitted.
+
+13. Use of prepared statements for SQL database tests (e.g., for MySQL) is encouraged but not required.
+
+14. gzip compression is not permitted.
+
+15. Server support for HTTP Keep-Alive is strongly encouraged but not required.
+
+16. If HTTP Keep-Alive is enabled, no maximum Keep-Alive timeout is specified by this test.
+
+17. The request handler will be exercised at 256 concurrency only.
+
+18. The request handler will be exercised with query counts of 1, 5, 10, 15, and 20.
+
+19. The request handler will be exercised using GET requests.
+
+Example request:
+
+GET /queries?queries=10 HTTP/1.1
+Host: server
+User-Agent: Mozilla/5.0 (X11; Linux x86_64) Gecko/20130501 Firefox/30.0 AppleWebKit/600.00 Chrome/30.0.0000.0 Trident/10.0 Safari/600.00
+Cookie: uid=12345678901234567890; __utma=1.1234567890.1234567890.1234567890.1234567890.12; wd=2560x1600
+Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
+Accept-Language: en-US,en;q=0.5
+Connection: keep-alive
+
+Example response:
+
+HTTP/1.1 200 OK
+Content-Type: application/json; charset=UTF-8
+Content-Length: 315
+Server: Example
+Date: Wed, 17 Apr 2013 12:00:00 GMT
+
+[{"id":4174,"randomNumber":331},{"id":51,"randomNumber":6544},{"id":4462,"randomNumber":952},{"id":2221,"randomNumber":532},{"id":9276,"randomNumber":3097},{"id":3056,"randomNumber":7293},{"id":6964,"randomNumber":620},{"id":675,"randomNumber":6601},{"id":8414,"randomNumber":6569},{"id":2753,"randomNumber":4065}]
+-->
+<!--#declaration
+#include "world.h"
+
+#define AS_cpoll_cppsp_DO
+
+#ifndef AS_cpoll_cppsp_DO
+static UValue*	pvalue;
+#endif
+static UOrmSession*		psql_queries;
+static UOrmStatement*	pstmt_queries;
+static World*				pworld_queries;
+static UVector<World*>* pvworld_queries;
+
+static void usp_init_queries()
+{
+	U_TRACE(5, "::usp_init_queries()")
+
+	psql_queries  = U_NEW(UOrmSession(U_CONSTANT_TO_PARAM("hello_world")));
+	pstmt_queries = U_NEW(UOrmStatement(*psql_queries, U_CONSTANT_TO_PARAM("SELECT randomNumber FROM World WHERE id = ?")));
+
+	if (pstmt_queries == 0) U_ERROR("usp_init_queries(): we cound't connect to db, exiting...");
+
+	pworld_queries  = U_NEW(World);
+	pvworld_queries = U_NEW(UVector<World*>(500));
+
+	pstmt_queries->use( pworld_queries->id);
+	pstmt_queries->into(pworld_queries->randomNumber);
+
+#ifndef AS_cpoll_cppsp_DO
+	pvalue = U_NEW(UValue(ARRAY_VALUE));
+#endif
+}
+
+static void usp_end_queries()
+{
+	U_TRACE(5, "::usp_end_queries()")
+
+	delete pstmt_queries;
+	delete psql_queries;
+	delete pvworld_queries;
+	delete pworld_queries;
+#ifndef AS_cpoll_cppsp_DO
+	delete pvalue;
+#endif
+}
+-->
+<!--#args
+queries;
+-->
+<!--#header
+Content-Type: application/json; charset=UTF-8
+-->
+<!--#code
+int i = 0, num_queries = queries.strtol();
+
+	  if (num_queries <   1) num_queries = 1;
+else if (num_queries > 500) num_queries = 500;
+
+#ifdef AS_cpoll_cppsp_DO
+USP_PUTS_CHAR('[');
+#endif
+
+while (true)
+	{
+	pworld_queries->id = u_get_num_random(10000);
+
+	pstmt_queries->execute();
+
+#ifdef AS_cpoll_cppsp_DO
+	USP_PRINTF("{\"id\":%d,\"randomNumber\":%d}", pworld_queries->id, pworld_queries->randomNumber);
+#endif
+
+	pvworld_queries->push_back(U_NEW(World(*pworld_queries)));
+
+	if (++i == num_queries) break;
+
+#ifdef AS_cpoll_cppsp_DO
+	USP_PUTS_CHAR(',');
+#endif
+	}
+
+#ifdef AS_cpoll_cppsp_DO
+USP_PUTS_CHAR(']');
+#else
+USP_JSON_stringify(*pvalue, UVector<World*>, *pvworld_queries);
+#endif
+pvworld_queries->clear();
+-->

ULib/src/updates.usp

@@ -0,0 +1,184 @@
+<!--#
+Test 5: Database updates
+
+This test is a variation of Test #3 that exercises the ORM's persistence of
+objects and the database driver's performance at running UPDATE statements or similar.
+
+Requirements
+
+1.  The recommended URI is /updates.
+
+2.  For every request, an integer query string parameter named queries must be retrieved from the request.
+    The parameter specifies the number of rows to fetch and update in preparing the HTTP response (see below).
+
+3.  The queries parameter must be bounded to between 1 and 500. If the parameter is missing, is not an integer,
+	 or is an integer less than 1, the value should be interpreted as 1; if greater than 500, the value should be interpreted as 500.
+
+3.  The schema for World is id (int, primary key) and randomNumber (int).
+
+4.  The request handler must retrieve a set of World objects, equal in count to the queries parameter, from the World database table.
+
+5.  Each row must be selected randomly in the same fashion as the single database query test (Test #2 above).
+
+6.  At least the randomNumber field must be read from the database result set.
+
+7.  Each World object must have its randomNumber field updated to a new random integer between 1 and 10000.
+
+8.  Each World object must be persisted to the database with its new randomNumber value.
+
+9.  Use of batch updates is acceptable but not required.
+
+10. Use of transactions is acceptable but not required.
+
+11. For raw tests (that is, tests without an ORM), each updated row must receive a unique new randomNumber value.
+    It is not acceptable to change the randomNumber value of all rows to the same random number using an UPDATE ... WHERE id IN (...) clause.
+
+12. Each World object must be added to a list or array.
+
+13. The list or array must be serialized to JSON and sent as a response.
+
+14. The response content type must be set to application/json.
+
+15. The response headers must include either Content-Length or Transfer-Encoding.
+
+16. The response headers must include Server and Date.
+
+17. Use of an in-memory cache of World objects or rows by the application is not permitted.
+
+18. Use of prepared statements for SQL database tests (e.g., for MySQL) is encouraged but not required.
+
+19. gzip compression is not permitted.
+
+20. Server support for HTTP Keep-Alive is strongly encouraged but not required.
+
+21. If HTTP Keep-Alive is enabled, no maximum Keep-Alive timeout is specified by this test.
+
+22. The request handler will be exercised at 256 concurrency only.
+
+23. The request handler will be exercised with query counts of 1, 5, 10, 15, and 20.
+
+24. The request handler will be exercised using GET requests.
+
+Example request:
+
+GET /updates?queries=10 HTTP/1.1
+Host: server
+User-Agent: Mozilla/5.0 (X11; Linux x86_64) Gecko/20130501 Firefox/30.0 AppleWebKit/600.00 Chrome/30.0.0000.0 Trident/10.0 Safari/600.00
+Cookie: uid=12345678901234567890; __utma=1.1234567890.1234567890.1234567890.1234567890.12; wd=2560x1600
+Accept: text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8
+Accept-Language: en-US,en;q=0.5
+Connection: keep-alive
+
+Example response:
+
+HTTP/1.1 200 OK
+Content-Type: application/json; charset=UTF-8
+Content-Length: 315
+Server: Example
+Date: Wed, 17 Apr 2013 12:00:00 GMT
+
+[{"id":4174,"randomNumber":331},{"id":51,"randomNumber":6544},{"id":4462,"randomNumber":952},{"id":2221,"randomNumber":532},{"id":9276,"randomNumber":3097},{"id":3056,"randomNumber":7293},{"id":6964,"randomNumber":620},{"id":675,"randomNumber":6601},{"id":8414,"randomNumber":6569},{"id":2753,"randomNumber":4065}]
+-->
+<!--#declaration
+#include "world.h"
+
+#define AS_cpoll_cppsp_DO
+
+#ifndef AS_cpoll_cppsp_DO
+static UValue*	pvalue;
+#endif
+static UOrmSession*		psql_updates;
+static UOrmStatement*	pstmt1;
+static UOrmStatement*	pstmt2;
+static World*				pworld_updates;
+static UVector<World*>* pvworld_updates;
+
+static void usp_init_updates()
+{
+	U_TRACE(5, "::usp_init_updates()")
+
+	psql_updates = U_NEW(UOrmSession(U_CONSTANT_TO_PARAM("hello_world")));
+	pstmt1		 = U_NEW(UOrmStatement(*psql_updates, U_CONSTANT_TO_PARAM("SELECT randomNumber FROM World WHERE id = ?")));
+	pstmt2		 = U_NEW(UOrmStatement(*psql_updates, U_CONSTANT_TO_PARAM("UPDATE World SET randomNumber = ? WHERE id = ?")));
+
+	if (pstmt1 == 0 ||
+		 pstmt2 == 0)
+		{
+		U_ERROR("usp_init_updates(): we cound't connect to db, exiting...");
+		}
+
+	pworld_updates  = U_NEW(World);
+	pvworld_updates = U_NEW(UVector<World*>(500));
+
+	pstmt1->use( pworld_updates->id);
+	pstmt1->into(pworld_updates->randomNumber);
+	pstmt2->use( pworld_updates->randomNumber, pworld_updates->id);
+
+#ifndef AS_cpoll_cppsp_DO
+	pvalue = U_NEW(UValue(ARRAY_VALUE));
+#endif
+}
+
+static void usp_end_updates()
+{
+	U_TRACE(5, "::usp_end_updates()")
+
+	delete pstmt1;
+	delete pstmt2;
+	delete psql_updates;
+	delete pvworld_updates;
+	delete pworld_updates;
+#ifndef AS_cpoll_cppsp_DO
+	delete pvalue;
+#endif
+}
+-->
+<!--#args
+queries;
+-->
+<!--#header
+Content-Type: application/json; charset=UTF-8
+-->
+<!--#code
+int i = 0, num_queries = queries.strtol();
+
+	  if (num_queries <   1) num_queries = 1;
+else if (num_queries > 500) num_queries = 500;
+
+#ifdef AS_cpoll_cppsp_DO
+USP_PUTS_CHAR('[');
+#endif
+
+while (true)
+	{
+	pworld_updates->id = u_get_num_random(10000);
+
+	pstmt1->execute();
+
+	U_INTERNAL_DUMP("pworld_updates->randomNumber = %d", pworld_updates->randomNumber)
+
+	pworld_updates->randomNumber = u_get_num_random(10000);
+
+	pstmt2->execute();
+
+#ifdef AS_cpoll_cppsp_DO
+	USP_PRINTF("{\"id\":%d,\"randomNumber\":%d}", pworld_updates->id, pworld_updates->randomNumber);
+#endif
+
+	pvworld_updates->push_back(U_NEW(World(*pworld_updates)));
+
+	if (++i == num_queries) break;
+
+#ifdef AS_cpoll_cppsp_DO
+	USP_PUTS_CHAR(',');
+#endif
+	}
+
+#ifdef AS_cpoll_cppsp_DO
+USP_PUTS_CHAR(']');
+#else
+USP_JSON_stringify(*pvalue, UVector<World*>, *pvworld_updates);
+#endif
+
+pvworld_updates->clear();
+-->

ULib/src/world.h

@@ -0,0 +1,106 @@
+// world.h
+
+#ifndef WORLD_H
+#define WORLD_H 1
+
+#include <ulib/orm/orm.h>
+#include <ulib/json/value.h>
+
+class World {
+public:
+	// Check for memory error
+	U_MEMORY_TEST
+
+	// Allocator e Deallocator
+	U_MEMORY_ALLOCATOR
+	U_MEMORY_DEALLOCATOR
+
+	int id, randomNumber;
+
+	// CONSTRUCTOR
+
+	World()
+		{
+		U_TRACE_REGISTER_OBJECT(5, World, "")
+		}
+
+	World(const World& w) : id(w.id), randomNumber(w.randomNumber)
+		{
+		U_TRACE_REGISTER_OBJECT(5, World, "%p", &w)
+
+		U_MEMORY_TEST_COPY(w)
+		}
+
+	~World()
+		{
+		U_TRACE_UNREGISTER_OBJECT(5, World)
+		}
+
+#ifdef DEBUG
+	const char* dump(bool breset) const
+		{
+		*UObjectIO::os << "id           " << id				<< '\n'
+							<< "randomNumber " << randomNumber;
+
+		if (breset)
+			{
+			UObjectIO::output();
+
+			return UObjectIO::buffer_output;
+			}
+
+		return 0;
+		}
+#endif
+
+private:
+	World& operator=(const World&) { return *this; }
+};
+
+// ORM TEMPLATE SPECIALIZATIONS
+
+template <> class U_EXPORT UOrmTypeHandler<World> : public UOrmTypeHandler_Base {
+public:
+	explicit UOrmTypeHandler(World& val) : UOrmTypeHandler_Base(&val) {}
+
+	void bindParam(UOrmStatement* stmt) const
+		{
+		U_TRACE(0, "UOrmTypeHandler<World>::bindParam(%p)", stmt)
+
+		stmt->bindParam(U_ORM_TYPE_HANDLER(World, id,				int));
+		stmt->bindParam(U_ORM_TYPE_HANDLER(World, randomNumber,	int));
+		}
+
+	void bindResult(UOrmStatement* stmt)
+		{
+		U_TRACE(0, "UOrmTypeHandler<World>::bindResult(%p)", stmt)
+
+		stmt->bindResult(U_ORM_TYPE_HANDLER(World, id,				int));
+		stmt->bindResult(U_ORM_TYPE_HANDLER(World, randomNumber,	int));
+		}
+};
+
+// JSON TEMPLATE SPECIALIZATIONS
+
+template <> class U_EXPORT UJsonTypeHandler<World> : public UJsonTypeHandler_Base {
+public:
+	explicit UJsonTypeHandler(World& val) : UJsonTypeHandler_Base(&val) {}
+
+	void toJSON(UValue& json)
+		{
+		U_TRACE(0, "UJsonTypeHandler<World>::toJSON(%p)", &json)
+
+		json.toJSON(U_JSON_TYPE_HANDLER(World, id,				int));
+		json.toJSON(U_JSON_TYPE_HANDLER(World, randomNumber,	int));
+		}
+
+	void fromJSON(UValue& json)
+		{
+		U_TRACE(0, "UJsonTypeHandler<World>::fromJSON(%p)", &json)
+
+		json.fromJSON(U_JSON_TYPE_HANDLER(World, id,				 int));
+		json.fromJSON(U_JSON_TYPE_HANDLER(World, randomNumber, int));
+		}
+};
+
+#endif

benchmark.cfg.example

@@ -1,31 +1,32 @@
 [Defaults]
 # Available Keys: 
-# client_host='localhost'
-# client_identity_file=None
-# client_user=None
-# database_host=None
-# database_identity_file=None
-# database_os='linux'
-# database_user=None
-# duration=60
-# exclude=None
-# install='all'
-# install_error_action='continue'
-# install_software=False
-# list_test_metadata=False
-# list_tests=False
-# max_concurrency=256
-# max_queries=20
-# max_threads=8
-# mode='benchmark'
-# name='ec2'
-# os='linux'
-# parse=None
-# password_prompt=False
-# query_interval=5
-# server_host='localhost'
-# sleep=60
-# starting_concurrency=8
-# test=None
-# type='all'
-# verbose=True
+client_host=localhost
+client_identity_file=None
+client_user=localhost
+database_host=localhost
+database_identity_file=None
+database_os=linux
+database_user=tfb
+duration=60
+exclude=None
+install=server
+install_error_action=continue
+install_strategy=unified
+install_only=False
+list_test_metadata=False
+list_tests=False
+max_concurrency=256
+max_queries=20
+max_threads=8
+mode=benchmark
+name=ec2
+os=linux
+parse=None
+password_prompt=False
+query_interval=5
+server_host=localhost
+sleep=60
+starting_concurrency=8
+test=None
+type=all
+verbose=True

bottle/bash_profile.sh

@@ -0,0 +1,16 @@
+
+export PY2_ROOT=$IROOT/py2
+export PY2=$PY2_ROOT/bin/python
+export PY2_PIP=$PY2_ROOT/bin/pip
+export PY2_GUNICORN=$PY2_ROOT/bin/gunicorn
+
+export PYPY_ROOT=$IROOT/pypy
+export PYPY=$PYPY_ROOT/bin/python
+export PYPY_PIP=$PYPY_ROOT/bin/pip
+export PYPY_GUNICORN=$PYPY_ROOT/bin/gunicorn
+
+export PY3_ROOT=$IROOT/py3
+export PY3=$PY3_ROOT/bin/python
+export PY3_PIP=$PY3_ROOT/bin/pip
+export PY3_GUNICORN=$PY3_ROOT/bin/gunicorn
+

bottle/setup.py

@@ -1,19 +1,13 @@
 import subprocess
 import os
 
-BIN = os.path.expanduser('~/FrameworkBenchmarks/installs/py2/bin')
 
 proc = None
 
 
 def start(args, logfile, errfile):
     global proc
-    proc = subprocess.Popen(
-        [BIN + "/gunicorn",
-         "-c", "gunicorn_conf.py",
-         "-e", "DBHOSTNAME=" + args.database_host,
-         "app:app"],
-        cwd="bottle", stderr=errfile, stdout=logfile)
+    proc = subprocess.Popen( "$PY2_GUNICORN -c gunicorn_conf.py -e DBHOSTNAME=%s app:app" % args.database_host, cwd="bottle", shell=True, stderr=errfile, stdout=logfile)
     return 0
 
 
@@ -24,4 +18,7 @@ def stop(logfile, errfile):
     proc.terminate()
     proc.wait()
     proc = None
+
+    subprocess.call("sudo pkill gunicorn", shell=True, stderr=errfile, stdout=logfile)
+
     return 0

bottle/setup_py3.py

@@ -8,12 +8,7 @@ proc = None
 
 def start(args, logfile, errfile):
     global proc
-    proc = subprocess.Popen(
-        [BIN + "/gunicorn",
-         "-c", "gunicorn_conf.py",
-         "-e", "DBHOSTNAME=" + args.database_host,
-         "app:app"],
-        cwd="bottle", stderr=errfile, stdout=logfile)
+    proc = subprocess.Popen( "$PY3_GUNICORN -c gunicorn_conf.py -e DBHOSTNAME=%s app:app" % args.database_host, cwd="bottle", shell=True, stderr=errfile, stdout=logfile)
     return 0
 
 
@@ -24,4 +19,7 @@ def stop(logfile, errfile):
     proc.terminate()
     proc.wait()
     proc = None
+
+    subprocess.call("sudo pkill gunicorn", shell=True, stderr=errfile, stdout=logfile)
+
     return 0

bottle/setup_pypy.py

@@ -1,19 +1,12 @@
 import subprocess
 import os
 
-BIN = os.path.expanduser('~/FrameworkBenchmarks/installs/pypy/bin')
 
 proc = None
 
-
 def start(args, logfile, errfile):
     global proc
-    proc = subprocess.Popen(
-        [BIN + "/gunicorn",
-         "-c", "gunicorn_conf.py",
-         "-e", "DBHOSTNAME=" + args.database_host,
-         "app:app"],
-        cwd="bottle", stderr=errfile, stdout=logfile)
+    proc = subprocess.Popen( "$PYPY_GUNICORN -c gunicorn_conf.py -e DBHOSTNAME=%s app:app" % args.database_host, cwd="bottle", shell=True, stderr=errfile, stdout=logfile)
     return 0
 
 
@@ -24,4 +17,7 @@ def stop(logfile, errfile):
     proc.terminate()
     proc.wait()
     proc = None
+
+    subprocess.call("sudo pkill gunicorn", shell=True, stderr=errfile, stdout=logfile)
+
     return 0

cake/app/Model/World.php

@@ -1,6 +0,0 @@
-<?php
-class World extends AppModel {
-  public $useTable = 'world'; // This model uses a database table 'world'
-  public $primaryKey = 'id';
-}
-?>

cake/setup.py

@@ -1,43 +0,0 @@
-
-import subprocess
-import sys
-import os
-import setup_util
-from os.path import expanduser
-
-home = expanduser("~")
-
-def start(args, logfile, errfile):
-  setup_util.replace_text("cake/app/Config/database.php", "'host' => '.*',", "'host' => '" + args.database_host + "',")
-  setup_util.replace_text("cake/deploy/cake", "\".*\/FrameworkBenchmarks", "\"" + home + "/FrameworkBenchmarks")
-  setup_util.replace_text("cake/deploy/cake", "Directory .*\/FrameworkBenchmarks", "Directory " + home + "/FrameworkBenchmarks")
-  setup_util.replace_text("cake/deploy/nginx.conf", "root .*\/FrameworkBenchmarks", "root " + home + "/FrameworkBenchmarks")
-
-  try:
-    if os.name == 'nt':
-      setup_util.replace_text("cake/app/Config/core.php", "'Apc'", "'Wincache'")
-      subprocess.check_call('icacls "C:\\FrameworkBenchmarks\\cake" /grant "IIS_IUSRS:(OI)(CI)F"', shell=True, stderr=errfile, stdout=logfile)
-      subprocess.check_call('appcmd add site /name:PHP /bindings:http/*:8080: /physicalPath:"C:\\FrameworkBenchmarks\\cake\\app\\webroot"', shell=True, stderr=errfile, stdout=logfile)
-      return 0
-    #subprocess.check_call("sudo cp cake/deploy/cake /etc/apache2/sites-available/", shell=True)
-    #subprocess.check_call("sudo a2ensite cake", shell=True)
-    subprocess.check_call("sudo chown -R www-data:www-data cake", shell=True, stderr=errfile, stdout=logfile)
-    #subprocess.check_call("sudo /etc/init.d/apache2 start", shell=True)
-    subprocess.check_call("sudo php-fpm --fpm-config config/php-fpm.conf -g " + home + "/FrameworkBenchmarks/cake/deploy/php-fpm.pid", shell=True, stderr=errfile, stdout=logfile)
-    subprocess.check_call("sudo /usr/local/nginx/sbin/nginx -c " + home + "/FrameworkBenchmarks/cake/deploy/nginx.conf", shell=True, stderr=errfile, stdout=logfile)
-    return 0
-  except subprocess.CalledProcessError:
-    return 1
-def stop(logfile, errfile):
-  try:
-    if os.name == 'nt':
-      subprocess.call('appcmd delete site PHP', shell=True, stderr=errfile, stdout=logfile)
-      return 0
-    subprocess.call("sudo /usr/local/nginx/sbin/nginx -s stop", shell=True, stderr=errfile, stdout=logfile)
-    subprocess.call("sudo kill -QUIT $( cat cake/deploy/php-fpm.pid )", shell=True, stderr=errfile, stdout=logfile)
-    #subprocess.check_call("sudo a2dissite cake", shell=True)
-    #subprocess.check_call("sudo /etc/init.d/apache2 stop", shell=True)
-    subprocess.check_call("sudo chown -R $USER:$USER cake", shell=True, stderr=errfile, stdout=logfile)
-    return 0
-  except subprocess.CalledProcessError:
-    return 1

cake/app/Controller/FortunesController.php → cakephp/app/Controller/FortunesController.php

@@ -9,15 +9,15 @@ class FortunesController extends AppController {
 		$this->layout = 'benchmark';
 		$this->set('title_for_layout', 'Fortunes');
 
-		// using prepared query as encouraged by test rules
-		$db      = $this->Fortune->getDataSource();
-		$results = $db->fetchAll('SELECT * FROM Fortune');
+		// using ORM instead of raw SQL
+		$this->loadModel('Fortune');
+		$results = $this->Fortune->find('all');
 
 		// stuffing in the dynamic data
-		$results[]['Fortune'] = [
+		$results[]['Fortune'] = array(
 			'id'      => 0,
 			'message' => 'Additional fortune added at request time.'
-		];
+		);
 
 		// because we are performance concerned we don't use Hash::sort()
 		foreach ($results as $result) {

cake/app/Controller/WorldController.php → cakephp/app/Controller/WorldController.php

@@ -13,8 +13,16 @@ class WorldController extends AppController {
     // Read number of queries to run from URL parameter
     // http://book.cakephp.org/2.0/en/controllers/request-response.html#accessing-request-parameters
     $query_count = $this->request->query('queries');
+    $should_return_array = True;
     if ($query_count == null) {
       $query_count = 1;
+      $should_return_array = False;
+    }
+    $query_count = intval($query_count);
+    if ($query_count == 0) {
+      $query_count = 1;
+    } elseif ($query_count > 500) {
+      $query_count = 500;
     }
 
     // Create an array with the response string.
@@ -33,11 +41,18 @@ class WorldController extends AppController {
       $arr[] = array("id" => $world['World']['id'], "randomNumber" => $world['World']['randomNumber']);
     }
 
+    # Return either one object or a json list
+    if ($should_return_array == False) {
+      $this->set('worlds', $arr[0]);
+    } else {
+      $this->set('worlds', $arr);  
+    }
+
     // Use the CakePHP JSON View
     // http://book.cakephp.org/2.0/en/views/json-and-xml-views.html
-    $this->set('worlds', $arr);
-    $this->set('_serialize', array('worlds'));
+    $this->set('_serialize', 'worlds');
   }
+
 }
 ?>
 

cakephp/app/Model/World.php

@@ -0,0 +1,5 @@
+<?php
+class World extends AppModel {
+  public $useTable = 'World'; // This model uses a database table 'World'
+  public $primaryKey = 'id';
+}