Merge 0a20b7c into 007279c

dirk-zimoch · web-flow · commit 9222ca252a0b · 2022-08-05T15:12:30.000Z
diff --git a/modules/libcom/src/error/errlog.c b/modules/libcom/src/error/errlog.c
@@ -70,14 +70,15 @@ typedef struct listenerNode{
 
 typedef struct {
     char *base;
-    size_t pos;
+    int pos;
+    int nchar;
 } buffer_t;
 
 static struct {
     /* const after errlogInit() */
-    size_t maxMsgSize;
+    int maxMsgSize;
     /* alloc size of both buffer_t::base */
-    size_t bufSize;
+    int bufSize;
     int    errlogInitFailed;
 
     epicsMutexId listenerLock;
@@ -98,8 +99,8 @@ static struct {
 
     /* A loop counter maintained by errlogThread. */
     epicsUInt32 flushSeq;
-    size_t nFlushers;
-    size_t nLost;
+    unsigned long nFlushers;
+    unsigned long nLost;
 
     /* 'log' and 'print' combine to form a double buffer. */
     buffer_t *log;
@@ -125,9 +126,14 @@ char* msgbufAlloc(void)
 
     errlogInit(0);
     epicsMutexMustLock(pvt.msgQueueLock); /* matched in msgbufCommit() */
-    if(pvt.bufSize - pvt.log->pos >= 1+pvt.maxMsgSize) {
+    if(pvt.bufSize - pvt.log->pos - pvt.log->nchar >= 1+pvt.maxMsgSize) {
         /* there is enough space for the worst cast */
         ret = pvt.log->base + pvt.log->pos;
+        if (pvt.log->nchar) {
+            /* append to last message */
+            return ret + 1 + pvt.log->nchar;
+        }
+        /* new message */
         ret[0] = ERL_STATE_WRITE;
         ret++;
     }
@@ -140,39 +146,44 @@ char* msgbufAlloc(void)
 }
 
 static
-size_t msgbufCommit(size_t nchar, int localEcho)
+int msgbufCommit(int nchar, int localEcho)
 {
     int isOkToBlock = epicsThreadIsOkToBlock();
     int wasEmpty = pvt.log->pos==0;
     int atExit = pvt.atExit;
-    char *start = pvt.log->base + pvt.log->pos;
+    char *start = pvt.log->base + pvt.log->pos + pvt.log->nchar;
 
     /* nchar returned by snprintf() is >= maxMsgSize when truncated */
     if(nchar >= pvt.maxMsgSize) {
         const char *trunc = "<<TRUNCATED>>\n";
-        nchar = pvt.maxMsgSize - 1u;
+        nchar = pvt.maxMsgSize - 1;
 
-        strcpy(start + 1u + nchar - strlen(trunc), trunc);
-        /* assert(strlen(start+1u)==nchar); */
+        strcpy(start + 1 + nchar - strlen(trunc), trunc);
+        /* assert(strlen(start+1)==nchar); */
     }
 
-    start[1u + nchar] = '\0';
+    start[1 + nchar] = '\0';
 
     if(localEcho && isOkToBlock && atExit) {
         /* errlogThread is not running, so we print directly
          * and then abandon the buffer.
          */
         fprintf(pvt.console, "%s", start);
 
+    } else if (start[nchar] != '\n') {
+        /* incomplete message, prepare to append */
+        pvt.log->nchar += nchar;
+
     } else {
-        start[0u] = ERL_STATE_READY | (localEcho ? ERL_LOCALECHO : 0);
+        pvt.log->base[pvt.log->pos] = ERL_STATE_READY | (localEcho ? ERL_LOCALECHO : 0);
 
-        pvt.log->pos += 1u + nchar + 1u;
+        pvt.log->pos += 1 + pvt.log->nchar + nchar + 1;
+        pvt.log->nchar = 0;
     }
 
     epicsMutexUnlock(pvt.msgQueueLock); /* matched in msgbufAlloc() */
 
-    if(wasEmpty && !atExit)
+    if(wasEmpty && !atExit && !pvt.log->nchar)
         epicsEventMustTrigger(pvt.waitForWork);
 
     if(localEcho && isOkToBlock && !atExit)
@@ -185,7 +196,7 @@ static
 void errlogSequence(void)
 {
     int wakeNext = 0;
-    size_t seq;
+    epicsUInt32 seq;
 
     if (pvt.atExit)
         return;
@@ -203,7 +214,7 @@ void errlogSequence(void)
     }
 
     pvt.nFlushers--;
-    wakeNext = pvt.nFlushers!=0u;
+    wakeNext = pvt.nFlushers!=0;
     epicsMutexUnlock(pvt.msgQueueLock);
 
     if(wakeNext)
@@ -234,22 +245,19 @@ int isATTY(FILE* fp)
 static
 int isATTY(FILE* fp)
 {
+#ifdef ENABLE_VIRTUAL_TERMINAL_PROCESSING
     HANDLE hand = NULL;
     DWORD mode = 0;
     if(fp==stdout)
         hand = GetStdHandle(STD_OUTPUT_HANDLE);
     else if(fp==stderr)
         hand = GetStdHandle(STD_ERROR_HANDLE);
-#ifdef ENABLE_VIRTUAL_TERMINAL_PROCESSING
     if(hand && GetConsoleMode(hand, &mode)) {
         (void)SetConsoleMode(hand, mode|ENABLE_VIRTUAL_TERMINAL_PROCESSING);
-        mode = 0u;
+        mode = 0;
         if(GetConsoleMode(hand, &mode) && (mode&ENABLE_VIRTUAL_TERMINAL_PROCESSING))
             return 1;
     }
-#else
-    (void)hand;
-    (void)mode;
 #endif
     return 0;
 }
@@ -263,7 +271,7 @@ void errlogStripANSI(char *msg);
 
 void errlogStripANSI(char *msg)
 {
-    size_t pos = 0, shift = 0;
+    int pos = 0, shift = 0;
 
     while(1) {
         char c = msg[pos];
@@ -517,8 +525,8 @@ static void errlogExitHandler(void *raw)
 }
 
 struct initArgs {
-    size_t bufsize;
-    size_t maxMsgSize;
+    int bufsize;
+    int maxMsgSize;
 };
 
 static void errlogInitPvt(void *arg)
@@ -616,7 +624,7 @@ static void errlogThread(void)
     while (!pvt.atExit) {
         pvt.flushSeq++;
 
-        if(pvt.log->pos==0u) {
+        if(pvt.log->pos==0) {
             int wakeFlusher = pvt.nFlushers!=0;
             epicsMutexUnlock(pvt.msgQueueLock);
             if(wakeFlusher)
@@ -626,10 +634,10 @@ static void errlogThread(void)
 
         } else {
             /* snapshot and swap buffers for use while unlocked */
-            size_t nLost = pvt.nLost;
+            unsigned long nLost = pvt.nLost;
             FILE *console = pvt.toConsole ? pvt.console : NULL;
             int ttyConsole = pvt.ttyConsole;
-            size_t pos = 0u;
+            int pos = 0;
             buffer_t *print;
 
             {
@@ -638,49 +646,49 @@ static void errlogThread(void)
                 pvt.print = print = temp;
             }
 
-            pvt.nLost = 0u;
+            pvt.nLost = 0;
             epicsMutexUnlock(pvt.msgQueueLock);
 
             while(pos < print->pos) {
                 listenerNode *plistenerNode;
                 char* base = print->base + pos;
-                size_t mlen = epicsStrnLen(base+1u, pvt.bufSize - pos);
+                int mlen = (int)epicsStrnLen(base+1, pvt.bufSize - pos);
                 int stripped = 0;
 
                 if((base[0]&ERL_STATE_MASK) != ERL_STATE_READY || mlen>=pvt.bufSize - pos) {
-                    fprintf(stderr, "Logic Error: errlog buffer corruption. %02x, %zu\n",
+                    fprintf(stderr, "Logic Error: errlog buffer corruption. %02x, %u\n",
                             (unsigned)base[0], mlen);
                     /* try to reset and recover */
                     break;
                 }
 
                 if(base[0]&ERL_LOCALECHO && console) {
                     if(!ttyConsole) {
-                        errlogStripANSI(base+1u);
+                        errlogStripANSI(base+1);
                         stripped = 1;
                     }
-                    fprintf(console, "%s", base+1u);
+                    fprintf(console, "%s", base+1);
                 }
 
                 if(!stripped)
-                    errlogStripANSI(base+1u);
+                    errlogStripANSI(base+1);
 
                 epicsMutexMustLock(pvt.listenerLock);
                 plistenerNode = (listenerNode *)ellFirst(&pvt.listenerList);
                 while (plistenerNode) {
-                    (*plistenerNode->listener)(plistenerNode->pPrivate, base+1u);
+                    (*plistenerNode->listener)(plistenerNode->pPrivate, base+1);
                     plistenerNode = (listenerNode *)ellNext(&plistenerNode->node);
                 }
                 epicsMutexUnlock(pvt.listenerLock);
 
-                pos += 1u + mlen+1u;
+                pos += 1 + mlen + 1;
             }
 
             memset(print->base, 0, pvt.bufSize);
-            print->pos = 0u;
+            print->pos = 0;
 
             if(nLost && console)
-                fprintf(console, "errlog: lost %zu messages\n", nLost);
+                fprintf(console, "errlog: lost %lu messages\n", nLost);
 
             if(console)
                 fflush(console);
