Merge pull request #745 from treefrogframework/treefrogv1_7_5

Updated to TreeFrog Framework v1.7.5

toolset/setup/linux/installer.py

@@ -285,15 +285,15 @@ class Installer:
     #
     # TreeFrog Framework
     #
-    self.__run_command("sudo apt-get install qt4-qmake libqt4-dev libqt4-sql-mysql g++", True)
-    self.__download("http://downloads.sourceforge.net/project/treefrog/src/treefrog-1.7.4.tar.gz")
-    self.__run_command("tar xzf treefrog-1.7.4.tar.gz")
-    self.__run_command("rm treefrog-1.7.4.tar.gz")
-    self.__run_command("./configure", cwd="treefrog-1.7.4")
-    self.__run_command("make", cwd="treefrog-1.7.4/src")
-    self.__run_command("sudo make install", cwd="treefrog-1.7.4/src")
-    self.__run_command("make", cwd="treefrog-1.7.4/tools")
-    self.__run_command("sudo make install", cwd="treefrog-1.7.4/tools")
+    self.__run_command("sudo apt-get install qt4-qmake libqt4-dev libqt4-sql-mysql libqt4-sql-psql g++", True)
+    self.__download("http://downloads.sourceforge.net/project/treefrog/src/treefrog-1.7.5.tar.gz")
+    self.__run_command("tar xzf treefrog-1.7.5.tar.gz")
+    self.__run_command("rm treefrog-1.7.5.tar.gz")
+    self.__run_command("./configure", cwd="treefrog-1.7.5")
+    self.__run_command("make", cwd="treefrog-1.7.5/src")
+    self.__run_command("sudo make install", cwd="treefrog-1.7.5/src")
+    self.__run_command("make", cwd="treefrog-1.7.5/tools")
+    self.__run_command("sudo make install", cwd="treefrog-1.7.5/tools")
 
     #
     # Vert.x

treefrog/benchmark_config

@@ -20,7 +20,30 @@
       "webserver": "None",
       "os": "Linux",
       "database_os": "Linux",
-      "display_name": "treefrog",
+      "display_name": "treefrog-hybrid",
+      "notes": "",
+      "versus": ""
+    },
+    "thread": {
+      "setup_file": "setup-thread",
+      "json_url": "/json/json",
+      "db_url": "/world/random",
+      "query_url": "/world/queries/",
+      "fortune_url": "/fortune/index",
+      "update_url": "/world/updates/",
+      "plaintext_url": "/world/plain",
+      "port": 8080,
+      "approach": "Realistic",
+      "classification": "Fullstack",
+      "database": "MySQL",
+      "framework": "treefrog",
+      "language": "C++",
+      "orm": "Micro",
+      "platform": "Treefrog",
+      "webserver": "None",
+      "os": "Linux",
+      "database_os": "Linux",
+      "display_name": "treefrog-thread",
       "notes": "",
       "versus": ""
     }

treefrog/config/application.ini

@@ -105,8 +105,12 @@ Session.CsrfProtectionKey=_csrfId
 ## MPM Thread section
 ##
 
-# Maximum number of server threads allowed to start
-MPM.thread.MaxServers=512
+# Number of application server processes to be started.
+MPM.thread.MaxAppServers=10
+
+# Maximum number of action threads allowed to start simultaneously
+# per server process.
+MPM.thread.MaxThreadsPerAppServer=100
 
 ##
 ## MPM Prefork section
@@ -125,12 +129,12 @@ MPM.prefork.SpareServers=5
 ## MPM Hybrid section
 ##
 
-# Number of server processes to be started.
-# Specify a value of range from 1 to the number of processor.
-MPM.hybrid.MaxServers=8
+# Number of application server processes to be started.
+MPM.hybrid.MaxAppServers=10
 
-# Maximum number of worker threads allowed to start per server process.
-MPM.hybrid.MaxWorkersPerServer=128
+# Maximum number of worker threads allowed to start simultaneously
+# per server process.
+MPM.hybrid.MaxWorkersPerAppServer=100
 
 ##
 ## SystemLog settings
@@ -159,7 +163,7 @@ SystemLog.DateTimeFormat="yyyy-MM-dd hh:mm:ss"
 ##
 
 # Specify the access log file name.
-AccessLog.FilePath=/dev/null
+AccessLog.FilePath=
 
 # Specify the layout of the access log.
 #  %h : Remote host

treefrog/controllers/applicationcontroller.cpp

@@ -22,16 +22,19 @@ bool ApplicationController::preFilter()
 
 QString ApplicationController::jsonEncode(const QVariantMap &obj)
 {
+    const QString JSON_OBJ_INT("\"%1\":%2, ");
+    const QString JSON_OBJ_STR("\"%1\":\"%2\", ");
     QString ret("{");
+
     for (QMap<QString, QVariant>::const_iterator i = obj.begin(); i != obj.end(); ++i) {
         switch (i.value().type()) {
         case QVariant::UInt:
         case QVariant::Int:
-            ret += QString("\"%1\":%2, ").arg(i.key()).arg(i.value().toInt());
+            ret += JSON_OBJ_INT.arg(i.key()).arg(i.value().toInt());
             break;
         default:
-            ret += QString("\"%1\":\"%2\", ").arg(i.key()).arg(i.value().toString());
-            break; 
+            ret += JSON_OBJ_STR.arg(i.key()).arg(i.value().toString());
+            break;
         }
     }
     ret.chop(2);
@@ -42,6 +45,7 @@ QString ApplicationController::jsonEncode(const QVariantMap &obj)
 QString ApplicationController::jsonEncode(const QList<QVariantMap> &lst)
 {
     QString ret("[");
+
     for (QListIterator<QVariantMap> it(lst); it.hasNext(); ) {
         ret += jsonEncode(it.next());
         ret += QLatin1String(", ");

treefrog/controllers/applicationcontroller.h

@@ -21,7 +21,7 @@ public slots:
     void staticInitialize();
 
 protected:
-    virtual bool preFilter();    
+    virtual bool preFilter();
 };
 
 T_DECLARE_CONTROLLER(ApplicationController, applicationcontroller)

treefrog/controllers/fortunecontroller.cpp

@@ -1,6 +1,10 @@
 #include "fortunecontroller.h"
 #include "fortune.h"
 
+static bool caseSensitiveLessThan(const Fortune &f1, const Fortune &f2)
+{
+    return f1.message() < f2.message();
+}
 
 FortuneController::FortuneController(const FortuneController &)
     : ApplicationController()
@@ -9,6 +13,11 @@ FortuneController::FortuneController(const FortuneController &)
 void FortuneController::index()
 {
     QList<Fortune> fortuneList = Fortune::getAll();
+    Fortune fortune;
+    fortune.setMessage(QLatin1String("Additional fortune added at request time."));
+    fortuneList << fortune;
+    // Sort
+    qSort(fortuneList.begin(), fortuneList.end(), caseSensitiveLessThan);
     texport(fortuneList);
     render();
 }

treefrog/controllers/worldcontroller.cpp

@@ -25,14 +25,19 @@ void WorldController::show(const QString &pk)
     render();
 }
 
+void WorldController::queries()
+{
+    queries("1");
+}
+
 void WorldController::queries(const QString &num)
 {
     QList<QVariantMap> worlds;
-    int d = num.toInt();
+    int d = qMin(qMax(num.toInt(), 1), 500);
+
     for (int i = 0; i < d; ++i) {
         int id = Tf::random(9999) + 1;
-        World world = World::get(id);
-        worlds << world.toVariantMap();
+        worlds << World::get(id).toVariantMap();
     }
     setContentType("application/json; charset=UTF-8");
     renderText(jsonEncode(worlds), false);
@@ -124,9 +129,11 @@ void WorldController::updates(const QString &num)
 {
     QList<QVariantMap> worlds;
     int d = num.toInt();
+    World world;
+
     for (int i = 0; i < d; ++i) {
         int id = Tf::random(9999) + 1;
-        World world = World::get(id);
+        world = World::get(id);
         world.setRandomNumber( Tf::random(9999) + 1 );
         world.update();
 	worlds << world.toVariantMap();

treefrog/controllers/worldcontroller.h

@@ -17,6 +17,7 @@ public slots:
     void index();
     void plain();
     void show(const QString &pk);
+    void queries();
     void queries(const QString &num);
     void random();
     void entry();

treefrog/models/fortune.cpp

@@ -4,7 +4,9 @@
 
 Fortune::Fortune()
     : TAbstractModel(), d(new FortuneObject)
-{ }
+{
+    d->id = 0;
+}
 
 Fortune::Fortune(const Fortune &other)
     : TAbstractModel(), d(new FortuneObject(*other.d))
@@ -67,9 +69,24 @@ Fortune Fortune::get(uint id)
     return Fortune(mapper.findByPrimaryKey(id));
 }
 
+int Fortune::count()
+{
+    TSqlORMapper<FortuneObject> mapper;
+    return mapper.findCount();
+}
+
 QList<Fortune> Fortune::getAll()
 {
-    return tfGetModelListByCriteria<Fortune, FortuneObject>(TCriteria());
+    TSqlQueryORMapper<FortuneObject> mapper;
+    mapper.prepare("SELECT * from Fortune");
+
+    QList<Fortune> fortunes;
+    if (mapper.exec()) {
+        while (mapper.next()) {
+            fortunes << Fortune(mapper.value());
+        }
+    }
+    return fortunes;
 }
 
 TModelObject *Fortune::modelData()

treefrog/models/fortune.h

@@ -25,9 +25,15 @@ public:
     void setMessage(const QString &message);
     Fortune &operator=(const Fortune &other);
 
+    bool create() { return TAbstractModel::create(); }
+    bool update() { return TAbstractModel::update(); }
+    bool save()   { return TAbstractModel::save(); }
+    bool remove() { return TAbstractModel::remove(); }
+
     static Fortune create(const QString &message);
     static Fortune create(const QVariantMap &values);
     static Fortune get(uint id);
+    static int count();
     static QList<Fortune> getAll();
 
 private:

treefrog/models/world.cpp

@@ -5,6 +5,7 @@
 World::World()
     : TAbstractModel(), d(new WorldObject)
 {
+    d->id = 0;
     d->randomNumber = 0;
 }
 
@@ -43,6 +44,14 @@ World &World::operator=(const World &other)
     return *this;
 }
 
+bool World::update()
+{
+    TSqlQueryORMapper<WorldObject> mapper;
+    mapper.prepare("UPDATE World SET randomNumber=? WHERE id=?");
+    mapper.addBind(randomNumber()).addBind(id());
+    return mapper.exec();
+}
+
 World World::create(int randomNumber)
 {
     WorldObject obj;
@@ -64,9 +73,17 @@ World World::create(const QVariantMap &values)
 }
 
 World World::get(uint id)
+{
+    TSqlQueryORMapper<WorldObject> mapper;
+    mapper.prepare("SELECT * from World WHERE id=?");
+    mapper.addBind(id);
+    return World(mapper.execFirst());
+}
+
+int World::count()
 {
     TSqlORMapper<WorldObject> mapper;
-    return World(mapper.findByPrimaryKey(id));
+    return mapper.findCount();
 }
 
 QList<World> World::getAll()

treefrog/models/world.h

@@ -25,9 +25,15 @@ public:
     void setRandomNumber(int randomNumber);
     World &operator=(const World &other);
 
+    bool create() { return TAbstractModel::create(); }
+    bool update();
+    bool save()   { return TAbstractModel::save(); }
+    bool remove() { return TAbstractModel::remove(); }
+
     static World create(int randomNumber);
     static World create(const QVariantMap &values);
     static World get(uint id);
+    static int count();
     static QList<World> getAll();
 
 private:

treefrog/setup-thread.py

@@ -0,0 +1,38 @@
+
+import subprocess
+import sys
+import setup_util
+from os.path import expanduser
+
+home = expanduser("~")
+
+##############
+# start(args)
+##############
+def start(args, logfile, errfile):
+  setup_util.replace_text("treefrog/config/database.ini", "HostName=.*", "HostName=" + args.database_host)
+  setup_util.replace_text("treefrog/config/application.ini", "MultiProcessingModule=.*", "MultiProcessingModule=thread")
+
+  # 1. Generate Makefile
+  # 2. Compile applicaton
+  # 3. Clean log files
+  # 4. Start TreeFrog
+  try:
+    subprocess.check_call("qmake -r CONFIG+=release", shell=True, cwd="treefrog", stderr=errfile, stdout=logfile)
+    subprocess.check_call("make clean", shell=True, cwd="treefrog", stderr=errfile, stdout=logfile)
+    subprocess.check_call("make -j8", shell=True, cwd="treefrog", stderr=errfile, stdout=logfile)
+    subprocess.check_call("rm -f log/*.log", shell=True, cwd="treefrog", stderr=errfile, stdout=logfile)
+    subprocess.check_call("treefrog -d " + home + "/FrameworkBenchmarks/treefrog", shell=True, stderr=errfile, stdout=logfile)
+    return 0
+  except subprocess.CalledProcessError:
+    return 1
+
+##############
+# stop()
+##############
+def stop(logfile, errfile):
+  try:
+    subprocess.call("treefrog -k abort " + home + "/FrameworkBenchmarks/treefrog", shell=True, stderr=errfile, stdout=logfile)
+    return 0
+  except subprocess.CalledProcessError:
+    return 1

treefrog/setup.py

@@ -11,6 +11,7 @@ home = expanduser("~")
 ##############
 def start(args, logfile, errfile):
   setup_util.replace_text("treefrog/config/database.ini", "HostName=.*", "HostName=" + args.database_host)
+  setup_util.replace_text("treefrog/config/application.ini", "MultiProcessingModule=.*", "MultiProcessingModule=hybrid")
 
   # 1. Generate Makefile
   # 2. Compile applicaton