Fixed newline timestamping so that the timestamp is associated with the first

  char output on the line instead of the preceding newline transition char.

Author: dun

ChangeLog

@@ -1,5 +1,13 @@
+2003-10-03  Chris Dunlap  <cdunlap@llnl.gov>
+
+	* server-logfile.c, server-obj.c, server.h: Fixed newline timestamping
+	so that the timestamp is associated with the first character output on
+	the line instead of the preceding newline transition character.
+
 2003-10-01  Chris Dunlap  <cdunlap@llnl.gov>
 
+	* : Released 0.1.8.7.
+
 	* client-tty.c, common.h, server-conf.c, server-esc.c,
 	server-logfile.c, server-obj.c, server.h, etc/conman.conf,
 	man/conman.1.in, man/conman.conf.5.in: Changed console log newline
@@ -27,7 +35,7 @@
 2003-09-22  Chris Dunlap  <cdunlap@llnl.gov>
 
 	* common.c, man/conman.1.in, man/conman.conf.5.in, man/conmand.8.in:
-	  Updated copyright.
+	Updated copyright.
 
 2003-07-24  Chris Dunlap  <cdunlap@llnl.gov>
 

server-logfile.c

@@ -1,5 +1,5 @@
 /*****************************************************************************\
- *  $Id: server-logfile.c,v 1.11.2.5 2003/10/01 23:22:10 dun Exp $
+ *  $Id: server-logfile.c,v 1.11.2.6 2003/10/04 02:00:22 dun Exp $
  *****************************************************************************
  *  Copyright (C) 2001-2002 The Regents of the University of California.
  *  Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
@@ -165,6 +165,8 @@ int open_logfile_obj(obj_t *logfile, int gotTrunc)
     free(now);
     free(msg);
 
+    logfile->aux.logfile.lineState = CONMAN_LOG_LINE_INIT;
+
     DPRINTF((10, "Opened %s%slogfile \"%s\" for console [%s].\n",
         (logfile->aux.logfile.opts.enableSanitize ? "SANITIZED " : ""),
         (logfile->aux.logfile.opts.enableTimestamp ? "TIMESTAMPED " : ""),
@@ -239,30 +241,43 @@ int write_log_data(obj_t *log, const void *src, int len)
          *    lonely CR to prevent characters from being overwritten.
          */
         if (*p == '\r') {
-            if (log->aux.logfile.lineState == CONMAN_LOG_LINE_IN)
+            if (log->aux.logfile.lineState == CONMAN_LOG_LINE_DATA) {
                 log->aux.logfile.lineState = CONMAN_LOG_LINE_CR;
-            else
+            }
+            else if (log->aux.logfile.lineState == CONMAN_LOG_LINE_INIT) {
+                if (log->aux.logfile.opts.enableTimestamp)
+                    q += write_time_string(0, q, qLast - q);
+                log->aux.logfile.lineState = CONMAN_LOG_LINE_CR;
+            }
+            else {
                 ; /* ignore */
+            }
         }
         else if (*p == '\n') {
-            log->aux.logfile.lineState = CONMAN_LOG_LINE_LF;
+            if (  (log->aux.logfile.lineState == CONMAN_LOG_LINE_INIT)
+               || (log->aux.logfile.lineState == CONMAN_LOG_LINE_LF) ) {
+                if (log->aux.logfile.opts.enableTimestamp)
+                    q += write_time_string(0, q, qLast - q);
+            }
             *q++ = '\r';
             *q++ = '\n';
-            if (log->aux.logfile.opts.enableTimestamp)
-                q += write_time_string(0, q, qLast - q);
+            log->aux.logfile.lineState = CONMAN_LOG_LINE_LF;
         }
         else if (  (*p == '\0')
-                && (log->aux.logfile.lineState != CONMAN_LOG_LINE_IN) ) {
+                && (  (log->aux.logfile.lineState == CONMAN_LOG_LINE_CR)
+                   || (log->aux.logfile.lineState == CONMAN_LOG_LINE_LF) ) ) {
             ; /* ignore */
         }
         else {
             if (log->aux.logfile.lineState == CONMAN_LOG_LINE_CR) {
                 *q++ = '\r';
                 *q++ = '\n';
+            }
+            if (log->aux.logfile.lineState != CONMAN_LOG_LINE_DATA) {
                 if (log->aux.logfile.opts.enableTimestamp)
                     q += write_time_string(0, q, qLast - q);
             }
-            log->aux.logfile.lineState = CONMAN_LOG_LINE_IN;
+            log->aux.logfile.lineState = CONMAN_LOG_LINE_DATA;
 
             if (log->aux.logfile.opts.enableSanitize) {
 

server-obj.c

@@ -1,5 +1,5 @@
 /*****************************************************************************\
- *  $Id: server-obj.c,v 1.70.2.5 2003/10/01 23:22:10 dun Exp $
+ *  $Id: server-obj.c,v 1.70.2.6 2003/10/04 02:00:22 dun Exp $
  *****************************************************************************
  *  Copyright (C) 2001-2002 The Regents of the University of California.
  *  Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
@@ -186,7 +186,7 @@ obj_t * create_logfile_obj(server_conf_t *conf, char *name,
     }
     logfile = create_obj(conf, name, -1, CONMAN_OBJ_LOGFILE);
     logfile->aux.logfile.console = console;
-    logfile->aux.logfile.lineState = CONMAN_LOG_LINE_IN;
+    logfile->aux.logfile.lineState = CONMAN_LOG_LINE_INIT;
     logfile->aux.logfile.opts = *opts;
 
     if (   (logfile->aux.logfile.opts.enableSanitize)
@@ -1376,6 +1376,14 @@ int write_obj_data(obj_t *obj, const void *src, int len, int isInfo)
     assert(obj->bufOutPtr < &obj->buf[MAX_BUF_SIZE]);
 
     x_pthread_mutex_unlock(&obj->bufLock);
+
+    /*  If an informational message has been added to the log,
+     *    re-initialize the console log's newline state.
+     */
+    if (isInfo && is_logfile_obj(obj)) {
+        obj->aux.logfile.lineState = CONMAN_LOG_LINE_INIT;
+    }
+
     return(len);
 }
 

server.h

@@ -1,5 +1,5 @@
 /*****************************************************************************\
- *  $Id: server.h,v 1.55.2.4 2003/10/01 23:22:10 dun Exp $
+ *  $Id: server.h,v 1.55.2.5 2003/10/04 02:00:22 dun Exp $
  *****************************************************************************
  *  Copyright (C) 2001-2002 The Regents of the University of California.
  *  Produced at Lawrence Livermore National Laboratory (cf, DISCLAIMER).
@@ -83,7 +83,8 @@ typedef struct logfile_opt {            /* LOGFILE OBJ OPTIONS:              */
 } logopt_t;
 
 typedef enum logfile_line_state {       /* log CR/LF newline state (2 bits)  */
-    CONMAN_LOG_LINE_IN,
+    CONMAN_LOG_LINE_INIT,
+    CONMAN_LOG_LINE_DATA,
     CONMAN_LOG_LINE_CR,
     CONMAN_LOG_LINE_LF
 } log_line_state_t;