[X2Go-Commits] [nx-libs] 05/05: nxcomp/src/Loop.cpp: use new log continuation mechanism.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 970704ca404b8f47f929154cf4eade1019ff8ebb
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Mon Dec 25 02:19:17 2017 +0100

    nxcomp/src/Loop.cpp: use new log continuation mechanism.
    
    Especially don't flush data out mid-append.
    Doing so will lead to the next append operation failing.
    
    Should fix messages queuing up indefinitely (until they are discarded at
    program termination, at least) and missing messages in general.
    
    Fixes: ArcticaProject/nx-libs#577
    Fixes: ArcticaProject/nx-libs#611
---
 nxcomp/src/Loop.cpp | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/nxcomp/src/Loop.cpp b/nxcomp/src/Loop.cpp
index b886154..cfa175b 100644
--- a/nxcomp/src/Loop.cpp
+++ b/nxcomp/src/Loop.cpp
@@ -13449,12 +13449,12 @@ int ParseArg(const char *type, const char *name, const char *value)
     case 'm':
     case 'g':
     {
-      nxinfo << (char) toupper(*id);
+      nxinfo_append << (char) toupper(*id);
       break;
     }
   }
 
-  nxinfo << ".\n" << std::flush;
+  nxinfo_append << ".\n" << std::flush;
 
 
   double result = atof(string) * base;
@@ -14028,13 +14028,13 @@ static void handleCheckSelectInLoop(int &setFDs, fd_set &readSet,
   {
     i = 0;
 
-    nxinfo << "Loop: Selected for read are ";
+    nxinfo << "Loop: Selected for read are";
 
     for (int j = 0; j < setFDs; j++)
     {
       if (FD_ISSET(j, &readSet))
       {
-        nxinfo << "[" << j << "]" << std::flush;
+        nxinfo_append << " [" << j << "]";
 
         i++;
       }
@@ -14042,22 +14042,22 @@ static void handleCheckSelectInLoop(int &setFDs, fd_set &readSet,
 
     if (i > 0)
     {
-      nxinfo << ".\n" << std::flush;
+      nxinfo_append << ".\n" << std::flush;
     }
     else
     {
-      nxinfo << "[none].\n" << std::flush;
+      nxinfo_append << "[none].\n" << std::flush;
     }
 
     i = 0;
 
-    nxinfo << "Loop: Selected for write are ";
+    nxinfo << "Loop: Selected for write are";
 
     for (int j = 0; j < setFDs; j++)
     {
       if (FD_ISSET(j, &writeSet))
       {
-        nxinfo << "[" << j << "]" << std::flush;
+        nxinfo_append << " [" << j << "]";
 
         i++;
       }
@@ -14065,11 +14065,11 @@ static void handleCheckSelectInLoop(int &setFDs, fd_set &readSet,
 
     if (i > 0)
     {
-      nxinfo << ".\n" << std::flush;
+      nxinfo_append << ".\n" << std::flush;
     }
     else
     {
-      nxinfo << "[none].\n" << std::flush;
+      nxinfo_append << "[none].\n" << std::flush;
     }
   }
 
@@ -14109,13 +14109,13 @@ static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs,
   {
     i = 0;
 
-    nxinfo << "Loop: Selected for read are ";
+    nxinfo << "Loop: Selected for read are";
 
     for (int j = 0; j < setFDs; j++)
     {
       if (FD_ISSET(j, &readSet))
       {
-        nxinfo << "[" << j << "]" << std::flush;
+        nxinfo_append << " [" << j << "]";
 
         i++;
       }
@@ -14123,22 +14123,22 @@ static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs,
 
     if (i > 0)
     {
-      nxinfo << ".\n" << std::flush;
+      nxinfo_append << ".\n" << std::flush;
     }
     else
     {
-      nxinfo << "[none].\n" << std::flush;
+      nxinfo_append << "[none].\n" << std::flush;
     }
 
     i = 0;
 
-    nxinfo << "Loop: Selected for write are ";
+    nxinfo << "Loop: Selected for write are";
 
     for (int j = 0; j < setFDs; j++)
     {
       if (FD_ISSET(j, &writeSet))
       {
-        nxinfo << "[" << j << "]" << std::flush;
+        nxinfo_append << " [" << j << "]";
 
         i++;
       }
@@ -14146,11 +14146,11 @@ static void handleCheckResultInLoop(int &resultFDs, int &errorFDs, int &setFDs,
 
     if (i > 0)
     {
-      nxinfo << ".\n" << std::flush;
+      nxinfo_append << ".\n" << std::flush;
     }
     else
     {
-      nxinfo << "[none].\n" << std::flush;
+      nxinfo_append << "[none].\n" << std::flush;
     }
   }
 }

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/nx-libs.git