aa

README.md

@@ -95,4 +95,4 @@ If you have a `results.json` file that you would like to visualize, you can [do
 
 The community has consistently helped in making these tests better, and we welcome any and all changes. Reviewing our contribution practices and guidelines will help to keep us all on the same page. The [contribution guide](https://github.com/TechEmpower/FrameworkBenchmarks/wiki/Development-Contributing-Guide) can be found in the [TFB documentation](https://github.com/TechEmpower/FrameworkBenchmarks/wiki).
 
-Join in the conversation on our [mailing list](https://groups.google.com/forum/?fromgroups=#!forum/framework-benchmarks), on [Twitter](https://twitter.com/tfbenchmarks), or chat with us on [Freenode](https://webchat.freenode.net/) at `#techempower-fwbm`. 
+Join in the conversation in the [Discussions tab](https://github.com/TechEmpower/FrameworkBenchmarks/discussions), on [Twitter](https://twitter.com/tfbenchmarks), or chat with us on [Freenode](https://webchat.freenode.net/) at `#techempower-fwbm`. 

frameworks/C++/lithium/lithium.cc

@@ -9,6 +9,7 @@
 #include "symbols.hh"
 using namespace li;
 
+
 template <typename B>
 void escape_html_entities(B& buffer, const std::string_view& data)
 {
@@ -41,6 +42,12 @@ void escape_html_entities(B& buffer, const std::string_view& data)
     }
 }
 
+int g_seed = 0;
+inline int random_int() { 
+  g_seed = (214013*g_seed+2531011); 
+  return (g_seed>>16)&0x7FFF; 
+} 
+
 #ifdef PROFILE_MODE
 void siege(int port) {
   auto sockets = http_benchmark_connect(512, port);
@@ -137,7 +144,7 @@ int main(int argc, char* argv[]) {
   };
   my_api.get("/db") = [&](http_request& request, http_response& response) {
     sql_db.max_async_connections_per_thread_ = db_nconn;
-    response.write_json(*random_numbers.connect(request.fiber).find_one(s::id = 1 + rand() % 10000));
+    response.write_json(*random_numbers.connect(request.fiber).find_one(s::id = 1 + random_int() % 10000));
   };
 
   my_api.get("/queries") = [&](http_request& request, http_response& response) {
@@ -148,7 +155,7 @@ int main(int argc, char* argv[]) {
     N = std::max(1, std::min(N, 500));
 
     auto c = random_numbers.connect(request.fiber);
-    response.write_json_generator(N, [&] { return *c.find_one(s::id = 1 + rand() % 10000); });
+    response.write_json_generator(N, [&] { return *c.find_one(s::id = 1 + random_int() % 10000); });
   };
 
   random_numbers.connect().forall([&] (const auto& number) {
@@ -160,7 +167,7 @@ int main(int argc, char* argv[]) {
     int N = atoi(N_str.c_str());
 
     response.write_json_generator(std::max(1, std::min(N, 500)), 
-      [&] { return world_cache.get(1 + rand() % 10000); });
+      [&] { return world_cache.get(1 + random_int() % 10000); });
   };
 
   my_api.get("/updates") = [&](http_request& request, http_response& response) {
@@ -180,8 +187,8 @@ int main(int argc, char* argv[]) {
 #endif
       for (int i = 0; i < N; i++)
       {
-        numbers[i] = *c.find_one(s::id = 1 + rand() % 10000);
-        numbers[i].randomNumber = 1 + rand() % 10000;
+        numbers[i] = *c.find_one(s::id = 1 + random_int() % 10000);
+        numbers[i].randomNumber = 1 + random_int() % 10000;
       }
 
       std::sort(numbers.begin(), numbers.end(), [] (auto a, auto b) { return a.id < b.id; });

frameworks/C++/lithium/lithium_batch.cc

@@ -41,6 +41,12 @@ void escape_html_entities(B& buffer, const std::string_view& data)
     }
 }
 
+int g_seed = 0;
+inline int random_int() { 
+  g_seed = (214013*g_seed+2531011); 
+  return (g_seed>>16)&0x7FFF; 
+} 
+
 #ifdef PROFILE_MODE
 void siege(int port) {
   auto sockets = http_benchmark_connect(256, port);
@@ -98,7 +104,7 @@ int main(int argc, char* argv[]) {
     std::vector<decltype(orm.find_one(s::id = 1))> results;
 
     for (int i = 0; i < N; i++)
-      results.push_back(orm.find_one(s::id = 1 + (i*10000/N) + rand() % (10000/N)));
+      results.push_back(orm.find_one(s::id = 1 + (i*10000/N) + random_int() % (10000/N)));
     for (int i = 0; i < N; i++){
       // println(" read result " , i);
       numbers[i] = results[i]().value();
@@ -115,7 +121,7 @@ int main(int argc, char* argv[]) {
     response.write_json(s::message = "Hello, World!");
   };
   my_api.get("/db") = [&](http_request& request, http_response& response) {
-    response.write_json(random_numbers.connect(request.fiber).find_one(s::id = 1 + rand() % 10000)());
+    response.write_json(random_numbers.connect(request.fiber).find_one(s::id = 1 + random_int() % 10000)());
   };
 
   my_api.get("/queries") = [&](http_request& request, http_response& response) {
@@ -127,7 +133,7 @@ int main(int argc, char* argv[]) {
     auto orm = random_numbers.connect(request.fiber);
     std::vector<decltype(orm.find_one(s::id = 1))> results;
     for (int i = 0; i < N; i++)
-      results.push_back(orm.find_one(s::id = 1 + (i*10000/N) + rand() % (10000/N)));
+      results.push_back(orm.find_one(s::id = 1 + (i*10000/N) + random_int() % (10000/N)));
 
     int i = 0;
     response.write_json_generator(N, [&] { return results[i++]().value(); });
@@ -142,7 +148,7 @@ int main(int argc, char* argv[]) {
     auto numbers = select_N_random_numbers(c, N);
 
     for (int i = 0; i < N; i++)
-      numbers[i].randomNumber = 1 + rand() % 10000;
+      numbers[i].randomNumber = 1 + random_int() % 10000;
 
     auto req = c.bulk_update(numbers);
     if (N_SQL_CONNECTIONS * nthreads > 1) c.backend_connection().end_of_batch();

frameworks/C++/treefrog/benchmark_config.json

@@ -8,6 +8,7 @@
       "fortune_url": "/fortune/index",
       "update_url": "/world/updates/",
       "plaintext_url": "/world/plain",
+      "cached_query_url": "/world/cached_queries/",
       "port": 8080,
       "approach": "Realistic",
       "classification": "Fullstack",
@@ -24,16 +25,41 @@
       "versus": ""
     },
     "postgres": {
+      "json_url": "/json/json",
+      "db_url": "/world/prandom",
+      "query_url": "/world/pqueries/",
+      "fortune_url": "/fortune/index",
+      "update_url": "/world/pupdates/",
+      "plaintext_url": "/world/plain",
+      "cached_query_url": "/world/cached_pqueries/",
+      "port": 8080,
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "Postgres",
+      "framework": "treefrog",
+      "language": "C++",
+      "flavor": "None",
+      "orm": "Micro",
+      "platform": "None",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "treefrog-postgres",
+      "notes": "",
+      "versus": ""
+    },
+    "epoll": {
       "json_url": "/json/json",
       "db_url": "/world/random",
       "query_url": "/world/queries/",
       "fortune_url": "/fortune/index",
       "update_url": "/world/updates/",
       "plaintext_url": "/world/plain",
+      "cached_query_url": "/world/cached_queries/",
       "port": 8080,
       "approach": "Realistic",
       "classification": "Fullstack",
-      "database": "Postgres",
+      "database": "MySQL",
       "framework": "treefrog",
       "language": "C++",
       "flavor": "None",
@@ -42,7 +68,7 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "treefrog-postgres",
+      "display_name": "treefrog-epoll",
       "notes": "",
       "versus": ""
     },
@@ -53,6 +79,7 @@
       "fortune_url": "/fortune/mindex",
       "update_url": "/world/mupdates/",
       "plaintext_url": "/world/plain",
+      "cached_query_url": "/world/cached_mqueries/",
       "port": 8080,
       "approach": "Realistic",
       "classification": "Fullstack",

frameworks/C++/treefrog/config.toml

@@ -8,6 +8,7 @@ urls.db = "/world/random"
 urls.query = "/world/queries/"
 urls.update = "/world/updates/"
 urls.fortune = "/fortune/index"
+urls.cached_query = "/world/cached_queries/"
 approach = "Realistic"
 classification = "Fullstack"
 database = "MySQL"
@@ -25,6 +26,7 @@ urls.db = "/world/mrandom"
 urls.query = "/world/mqueries/"
 urls.update = "/world/mupdates/"
 urls.fortune = "/fortune/mindex"
+urls.cached_query = "/world/cached_mqueries/"
 approach = "Realistic"
 classification = "Fullstack"
 database = "MongoDB"
@@ -38,13 +40,32 @@ versus = "treefrog"
 [postgres]
 urls.plaintext = "/world/plain"
 urls.json = "/json/json"
+urls.db = "/world/prandom"
+urls.query = "/world/pqueries/"
+urls.update = "/world/pupdates/"
+urls.fortune = "/fortune/index"
+urls.cached_query = "/world/cached_pqueries/"
+approach = "Realistic"
+classification = "Fullstack"
+database = "Postgres"
+database_os = "Linux"
+os = "Linux"
+orm = "Micro"
+platform = "None"
+webserver = "None"
+versus = ""
+
+[epoll]
+urls.plaintext = "/world/plain"
+urls.json = "/json/json"
 urls.db = "/world/random"
 urls.query = "/world/queries/"
 urls.update = "/world/updates/"
 urls.fortune = "/fortune/index"
+urls.cached_query = "/world/cached_queries/"
 approach = "Realistic"
 classification = "Fullstack"
-database = "Postgres"
+database = "MySQL"
 database_os = "Linux"
 os = "Linux"
 orm = "Micro"

frameworks/C++/treefrog/config/application.ini

@@ -242,16 +242,16 @@ ActionMailer.smtp.DelayedDelivery=false
 
 # Specify the settings file to enable the cache module.
 # Comment out the following line.
-#Cache.SettingsFile=cache.ini
+Cache.SettingsFile=cache.ini
 
 # Specify the cache backend, such as 'sqlite', 'mongodb'
 # or 'redis'.
-Cache.Backend=sqlite
+Cache.Backend=redis
 
 # Probability of starting garbage collection (GC) for cache.
 # If 100 is specified, GC will be started at a rate of once per 100
 # sets. If 0 is specified, the GC never starts.
-Cache.GcProbability=100
+Cache.GcProbability=10000
 
 # If true, enable LZ4 compression when storing data.
-Cache.EnableCompression=true
+Cache.EnableCompression=no

frameworks/C++/treefrog/config/cache.ini

@@ -0,0 +1,30 @@
+#
+# Cache settings
+#
+
+[sqlite]
+DatabaseName=tmp/cachedb
+HostName=
+Port=
+UserName=
+Password=
+ConnectOptions=
+PostOpenStatements=PRAGMA journal_mode=WAL; PRAGMA busy_timeout=5000; PRAGMA synchronous=NORMAL; VACUUM;
+
+[redis]
+DatabaseName=
+HostName=localhost
+Port=
+UserName=
+Password=
+ConnectOptions=
+PostOpenStatements=SELECT 1;
+
+[mongodb]
+DatabaseName=mdb
+HostName=localhost
+Port=
+UserName=
+Password=
+ConnectOptions=
+PostOpenStatements=

frameworks/C++/treefrog/controllers/fortunecontroller.cpp

@@ -20,7 +20,7 @@ void FortuneController::index()
     fortune.setMessage(QStringLiteral("Additional fortune added at request time."));
     fortuneList << fortune;
     // Sort
-    qSort(fortuneList.begin(), fortuneList.end(), caseSensitiveLessThan);
+    std::sort(fortuneList.begin(), fortuneList.end(), caseSensitiveLessThan);
     texport(fortuneList);
     render();
 }
@@ -32,7 +32,7 @@ void FortuneController::mindex()
     fortune.setMessage(QStringLiteral("Additional fortune added at request time."));
     fortuneList << fortune;
     // Sort
-    qSort(fortuneList.begin(), fortuneList.end(), caseSensitiveMngFortuneLessThan);
+    std::sort(fortuneList.begin(), fortuneList.end(), caseSensitiveMngFortuneLessThan);
     texport(fortuneList);
     render("mindex");
 }