Merge branch 'master' of github.com:treefrogframework/treefrog-framework

Author: treefrogframework

configure.bat

@@ -102,11 +102,21 @@ if not ERRORLEVEL 1 (
     set CMAKEOPT=Visual Studio 16 2019
   )
 ) else (
-  set VSVER=2017
-   if /i "%Platform%" == "x64" (
-    set CMAKEOPT=Visual Studio 15 2017 Win64
+  echo %QT_INSTALL_PREFIX% | find "msvc2017" >NUL
+  if not ERRORLEVEL 1 (
+    set VSVER=2017
+    if /i "%Platform%" == "x64" (
+      set CMAKEOPT=Visual Studio 15 2017 Win64
+    ) else (
+      set CMAKEOPT=Visual Studio 15 2017
+    )
   ) else (
-    set CMAKEOPT=Visual Studio 15 2017
+    set VSVER=2015
+    if /i "%Platform%" == "x64" (
+      set CMAKEOPT=Visual Studio 14 2015 Win64
+    ) else (
+      set CMAKEOPT=Visual Studio 14 2015
+    )
   )
 )
 

tools/tfmanager/main.cpp

@@ -160,7 +160,7 @@ bool checkArguments()
 {
     for (const auto &arg : QCoreApplication::arguments()) {
         if (arg.startsWith('-') && options()->value(arg, Invalid) == Invalid) {
-            fprintf(stderr, "invalid argument\n");
+            std::fprintf(stderr, "invalid argument\n");
             return false;
         }
     }
@@ -347,10 +347,10 @@ void showRunningAppList()
 {
     QStringList approots = runningApplicationPathList();
     if (approots.isEmpty()) {
-        printf("no running application\n");
+        std::printf("no running application\n");
     } else {
         int cnt = approots.count();
-        printf(" %d application%s running:\n", cnt, (cnt > 1 ? "s" : ""));
+        std::printf(" %d application%s running:\n", cnt, (cnt > 1 ? "s" : ""));
 
         for (const QString &path : approots) {
             QString url;
@@ -362,7 +362,7 @@ void showRunningAppList()
                 url += readJsonOfApplication(path)[JSON_UNIX_KEY].toString();
             }
 
-            printf(" * %s\n    %s\n\n", qPrintable(path), qPrintable(url));
+            std::printf(" * %s\n    %s\n\n", qPrintable(path), qPrintable(url));
         }
     }
 }
@@ -379,7 +379,7 @@ void showRoutes(const QString &path)
     if (process->waitForStarted(1000)) {
         process->waitForFinished(1000);
         auto str = process->readAll();
-        printf("%s", str.data());
+        std::printf("%s", str.data());
     }
     delete process;
 }
@@ -391,15 +391,15 @@ int killTreeFrogProcess(const QString &cmd)
 
     if (cmd == "status") {  // status command
         if (pid > 0) {
-            printf("TreeFrog server is running.  ( %s )\n", qPrintable(Tf::app()->webRootPath()));
+            std::printf("TreeFrog server is running.  ( %s )\n", qPrintable(Tf::app()->webRootPath()));
         } else {
-            printf("TreeFrog server is stopped.  ( %s )\n", qPrintable(Tf::app()->webRootPath()));
+            std::printf("TreeFrog server is stopped.  ( %s )\n", qPrintable(Tf::app()->webRootPath()));
         }
         return (pid > 0) ? 0 : 1;
     }
 
     if (pid < 0) {
-        printf("TreeFrog server not running\n");
+        std::printf("TreeFrog server not running\n");
         return 1;
     }
 
@@ -408,10 +408,10 @@ int killTreeFrogProcess(const QString &cmd)
     if (cmd == "stop") {  // stop command
         pi.terminate();
         if (pi.waitForTerminated()) {
-            printf("TreeFrog application servers shutdown completed\n");
+            std::printf("TreeFrog application servers shutdown completed\n");
             tf_unlink(oldPidFilePath().toLatin1().data());
         } else {
-            fprintf(stderr, "TreeFrog application servers shutdown failed\n");
+            std::fprintf(stderr, "TreeFrog application servers shutdown failed\n");
         }
 
     } else if (cmd == "abort") {  // abort command
@@ -425,11 +425,11 @@ int killTreeFrogProcess(const QString &cmd)
 
         TProcessInfo::kill(pids);  // kills the server process
         tSystemInfo("Killed TreeFrog application server processes");
-        printf("Killed TreeFrog application server processes\n");
+        std::printf("Killed TreeFrog application server processes\n");
 
     } else if (cmd == "restart") {  // restart command
         pi.restart();
-        printf("Sent a restart request\n");
+        std::printf("Sent a restart request\n");
 
     } else {
         usage();
@@ -443,7 +443,7 @@ void showProcessId()
 {
     qint64 pid = readPidOfApplication();
     if (pid > 0) {
-        printf("%lld\n", pid);
+        std::printf("%lld\n", pid);
     }
 }
 
@@ -473,7 +473,7 @@ int managerMain(int argc, char *argv[])
         int cmd = options()->value(arg, Invalid);
         switch (cmd) {
         case PrintVersion:
-            printf("%s version %s (r%d) built on %s / Qt %s\n", qPrintable(QFileInfo(argv[0]).baseName()), TF_VERSION_STR, TF_SRC_REVISION, __DATE__, qVersion());
+            std::printf("%s version %s (r%d) built on %s / Qt %s\n", qPrintable(QFileInfo(argv[0]).baseName()), TF_VERSION_STR, TF_SRC_REVISION, __DATE__, qVersion());
             return 0;
             break;
 
@@ -497,7 +497,7 @@ int managerMain(int argc, char *argv[])
 
         case SendSignal:
             if (!i.hasNext()) {
-                fprintf(stderr, "Missing signal name\n");
+                std::fprintf(stderr, "Missing signal name\n");
                 return 1;
             }
             signalCmd = i.next();  // assign a command
@@ -509,7 +509,7 @@ int managerMain(int argc, char *argv[])
 
         case Port:
             if (!i.hasNext()) {
-                fprintf(stderr, "Missing port number\n");
+                std::fprintf(stderr, "Missing port number\n");
                 return 1;
             }
             listenPort = i.next().toInt();
@@ -534,7 +534,7 @@ int managerMain(int argc, char *argv[])
     }
 
     if (!app.appSettingsFileExists()) {
-        fprintf(stderr, "INI file not found [%s]\n\n", qPrintable(app.appSettingsFilePath()));
+        std::fprintf(stderr, "INI file not found [%s]\n\n", qPrintable(app.appSettingsFilePath()));
         return 1;
     }
 
@@ -558,7 +558,7 @@ int managerMain(int argc, char *argv[])
     // Check TreeFrog processes are running
     qint64 pid = runningApplicationPid();
     if (pid > 0) {
-        fprintf(stderr, "Already running  pid:%ld\n", (long)pid);
+        std::fprintf(stderr, "Already running  pid:%ld\n", (long)pid);
         return 1;
     }
 
@@ -589,7 +589,7 @@ int managerMain(int argc, char *argv[])
     // start daemon process
     if (daemonMode) {
         if (!startDaemon()) {
-            fprintf(stderr, "Failed to create process\n\n");
+            std::fprintf(stderr, "Failed to create process\n\n");
             return 1;
         }
         return 0;
@@ -634,7 +634,7 @@ int managerMain(int argc, char *argv[])
 
         if (!started) {
             tSystemError("TreeFrog application server startup failed");
-            fprintf(stderr, "TreeFrog application server startup failed\n\n");
+            std::fprintf(stderr, "TreeFrog application server startup failed\n\n");
             return 1;
         }
 

tools/tfmanager/servermanager.cpp

@@ -70,7 +70,7 @@ bool ServerManager::start(const QHostAddress &address, quint16 port)
     int sd = TApplicationServerBase::nativeListen(address, port, TApplicationServerBase::NonCloseOnExec);
     if (sd <= 0) {
         tSystemError("Failed to create listening socket");
-        fprintf(stderr, "Failed to create listening socket\n");
+        std::fprintf(stderr, "Failed to create listening socket\n");
         return false;
     }
     listeningSocket = sd;
@@ -98,7 +98,7 @@ bool ServerManager::start(const QString &fileDomain)
     int sd = TApplicationServerBase::nativeListen(fileDomain, TApplicationServerBase::NonCloseOnExec);
     if (sd <= 0) {
         tSystemError("listening socket create failed  [%s:%d]", __FILE__, __LINE__);
-        fprintf(stderr, "Failed to create listening socket of UNIX domain\n");
+        std::fprintf(stderr, "Failed to create listening socket of UNIX domain\n");
         return false;
     }
 
@@ -291,7 +291,7 @@ void ServerManager::readStandardError() const
     if (server) {
         QByteArray buf = server->readAllStandardError();
         tSystemWarn("treefrog stderr: %s", buf.constData());
-        fprintf(stderr, "treefrog stderr: %s", buf.constData());
+        std::fprintf(stderr, "treefrog stderr: %s", buf.constData());
     }
 }
 

tools/tfserver/main.cpp

@@ -21,6 +21,7 @@
 #include <TUrlRoute>
 #include <TWebApplication>
 #include <cstdlib>
+#include <cstdio>
 using namespace TreeFrog;
 
 constexpr auto DEBUG_MODE_OPTION = "--debug";
@@ -127,7 +128,7 @@ void showRoutes()
 
     auto routes = TUrlRoute::instance().allRoutes();
     if (!routes.isEmpty()) {
-        printf("Available routes:\n");
+        std::printf("Available routes:\n");
 
         for (auto &route : routes) {
             QByteArray action;
@@ -145,12 +146,12 @@ void showRoutes()
             } else {
                 action = QByteArrayLiteral("(not found)");
             }
-            printf("  %s%s  ->  %s\n", methodDef()->value(route.method).data(), qPrintable(path), qPrintable(action));
+            std::printf("  %s%s  ->  %s\n", methodDef()->value(route.method).data(), qPrintable(path), qPrintable(action));
         }
-        printf("\n");
+        std::printf("\n");
     }
 
-    printf("Available controllers:\n");
+    std::printf("Available controllers:\n");
     auto keys = Tf::objectFactories()->keys();
     std::sort(keys.begin(), keys.end());
 
@@ -171,7 +172,7 @@ void showRoutes()
                 }
 
                 QByteArray action = createMethodString(ctlrDispatcher.typeName(), metaMethod);
-                printf("  %s  ->  %s\n", api.data(), action.data());
+                std::printf("  %s  ->  %s\n", api.data(), action.data());
             }
         }
     }
@@ -185,6 +186,9 @@ int main(int argc, char *argv[])
     TApplicationServerBase *server = nullptr;
     int ret = -1;
 
+    // No stdout buffering
+    std::setvbuf(stdout, nullptr, _IONBF, 0);
+
     // Setup loggers
     Tf::setupSystemLogger();
     Tf::setupAccessLogger();
@@ -232,14 +236,14 @@ int main(int argc, char *argv[])
 
     if (!webapp.webRootExists()) {
         tSystemError("No such directory");
-        fprintf(stderr, "No such directory\n");
+        std::fprintf(stderr, "No such directory\n");
         goto finish;
     }
     tSystemDebug("Web Root: %s", qPrintable(webapp.webRootPath()));
 
     if (!webapp.appSettingsFileExists()) {
         tSystemError("Settings file not found");
-        fprintf(stderr, "Settings file not found\n");
+        std::fprintf(stderr, "Settings file not found\n");
         goto finish;
     } else {
         // Sets search paths for JavaScript
@@ -262,7 +266,7 @@ int main(int argc, char *argv[])
         int port = (portNumber > 0) ? portNumber : Tf::appSettings()->value(Tf::ListenPort).toInt();
         if (port <= 0 || port > USHRT_MAX) {
             tSystemError("Invalid port number: %d", port);
-            fprintf(stderr, "Invalid port number: %d\n", port);
+            std::fprintf(stderr, "Invalid port number: %d\n", port);
             goto finish;
         }
         // Listen address
@@ -277,7 +281,7 @@ int main(int argc, char *argv[])
 
     if (sock <= 0) {
         tSystemError("Invalid socket descriptor: %d", sock);
-        fprintf(stderr, "Invalid option\n");
+        std::fprintf(stderr, "Invalid option\n");
         goto finish;
     }
 
@@ -304,7 +308,7 @@ int main(int argc, char *argv[])
     server->setAutoReloadingEnabled(reload);
     if (!server->start(debug)) {
         tSystemError("Server open failed");
-        fprintf(stderr, "Server open failed\n");
+        std::fprintf(stderr, "Server open failed\n");
         goto finish;
     }
 
@@ -331,8 +335,6 @@ int main(int argc, char *argv[])
     Tf::releaseSystemLogger();
 
 end:
-    fflush(stderr);
-    fflush(stdout);
     _exit(ret);
     return ret;
 }

tools/tfserver/stacktrace_powerpc-inl.h

@@ -36,8 +36,8 @@
 // Linux has similar code: http://patchwork.ozlabs.org/linuxppc/patch?id=8882
 
 #include "stacktrace.h"
-#include <stdint.h>  // for uintptr_t
-#include <stdio.h>
+#include <cstdint>  // for uintptr_t
+#include <cstdio>
 
 _START_GOOGLE_NAMESPACE_
 

tools/tfserver/stacktrace_x86-inl.h

@@ -32,7 +32,7 @@
 // Produce stack trace
 
 #include <QtGlobal>
-#include <stdint.h>  // for uintptr_t
+#include <cstdint>  // for uintptr_t
 
 #if !defined(Q_OS_WIN32)
 #include <sys/mman.h>
@@ -41,12 +41,11 @@
 
 #include "gconfig.h"
 #include "stacktrace.h"
-#include <stdio.h>  // for NULL
 
 _START_GOOGLE_NAMESPACE_
 
 // Given a pointer to a stack frame, locate and return the calling
-// stackframe, or return NULL if no stackframe can be found. Perform sanity
+// stackframe, or return nullptr if no stackframe can be found. Perform sanity
 // checks (the strictness of which is controlled by the boolean parameter
 // "STRICT_UNWINDING") to reduce the chance that a bad pointer is returned.
 template <bool STRICT_UNWINDING>
@@ -60,28 +59,28 @@ static void **NextStackFrame(void **old_sp)
         // With the stack growing downwards, older stack frame must be
         // at a greater address that the current one.
         if (new_sp <= old_sp)
-            return NULL;
+            return nullptr;
         // Assume stack frames larger than 100,000 bytes are bogus.
         if ((uintptr_t)new_sp - (uintptr_t)old_sp > 100000)
-            return NULL;
+            return nullptr;
     } else {
         // In the non-strict mode, allow discontiguous stack frames.
         // (alternate-signal-stacks for example).
         if (new_sp == old_sp)
-            return NULL;
+            return nullptr;
         // And allow frames upto about 1MB.
         if ((new_sp > old_sp)
             && ((uintptr_t)new_sp - (uintptr_t)old_sp > 1000000))
-            return NULL;
+            return nullptr;
     }
     if ((uintptr_t)new_sp & (sizeof(void *) - 1))
-        return NULL;
+        return nullptr;
 #ifdef __i386__
     // On 64-bit machines, the stack pointer can be very close to
     // 0xffffffff, so we explicitly check for a pointer into the
     // last two pages in the address space
     if ((uintptr_t)new_sp >= 0xffffe000)
-        return NULL;
+        return nullptr;
 #endif
 #if !defined(Q_OS_WIN32)
     if (!STRICT_UNWINDING) {
@@ -93,7 +92,7 @@ static void **NextStackFrame(void **old_sp)
         static int page_size = getpagesize();
         void *new_sp_aligned = (void *)((uintptr_t)new_sp & ~(page_size - 1));
         if (msync(new_sp_aligned, page_size, MS_ASYNC) == -1)
-            return NULL;
+            return nullptr;
     }
 #endif
     return new_sp;