Skip to contentSkip to conversation

s390x: Add linemode buffer to fix newline on every print

PATCH Thomas Huth 1 participant 1 message Jan 3, 2019 1 message not in the archive s390

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

Thomas Huth

author Reviewed-by
#1 lore raw
Quoted 67 lines · Janosch Frank

Linemode seems to add a newline for each sent message which makes reading rather hard. Hence we add a small buffer that and only print if it's full or a newline is encountered.

---
 lib/s390x/sclp-console.c | 32 ++++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)
lib/s390x/sclp-console.c +28 -2
index 6b30fab..5d2c9d8 100644
@@ -87,6 +87,9 @@ static uint8_t _ascebc[256] = {
      0x90, 0x3F, 0x3F, 0x3F, 0x3F, 0xEA, 0x3F, 0xFF
 };
 
+static char lm_buff[120];
+static unsigned char lm_buff_off;
+
 static void sclp_print_ascii(const char *str)
 {
 	int len = strlen(str);
@@ -112,17 +115,40 @@ static void sclp_print_lm(const char *str)
 	struct mdb *mdb;
 	struct mto *mto;
 	struct go *go;
+	char *nl;
+
+	/*
+	 * In contrast to the ascii console, linemode produces a new
+	 * line with every write of data. The report() function uses
+	 * several printf() calls to generate a line of data which
+	 * would all end up on different lines.
+	 *
+	 * Hence we buffer here until we encounter a \n or the buffer
+	 * is full. That means that linemode output can look a bit
+	 * different from ascii and that it takes a bit longer for
+	 * lines to appear.
+	 */
+	len = strlen(str);
+	len = len < (sizeof(lm_buff) - lm_buff_off) ? len : (sizeof(lm_buff) - lm_buff_off);
+	nl = strchr(str, '\n');
+	if ((lm_buff_off < sizeof(lm_buff) - 1)) {
+		memcpy(&lm_buff[lm_buff_off], str, len);
+		lm_buff_off += len;
+	}
+	/* Buffer not full and no newline */
+	if (lm_buff_off != sizeof(lm_buff) - 1 && !nl)
+		return;
 
 	sclp_mark_busy();
 	sccb = (struct write_sccb *) _sccb;
 	end = (unsigned char *) sccb + 4096 - 1;
 	memset(sccb, 0, sizeof(*sccb));
 	ptr = (unsigned char *) &sccb->msg.mdb.mto;
-	len = strlen(str);
+	len = strlen(lm_buff);
 	offset = 0;
 	do {
 		for (count = sizeof(*mto); offset < len; count++) {
-			ch = str[offset++];
+			ch = lm_buff[offset++];
 			if ((ch == 0x0a) || (ptr + count > end))
 				break;
 			ptr[count] = _ascebc[ch];

lib/s390x/sclp-console.c static void sclp_print_lm(const char *str) · line 179

Quoted 6 lines
lib/s390x/sclp-console.c +2 -0
@@ -148,6 +174,8 @@ static void sclp_print_lm(const char *str)
 	go->length = sizeof(*go);
 	go->type = 1;
 	sclp_service_call(SCLP_CMD_WRITE_EVENT_DATA, sccb);
+	memset(lm_buff, 0 , sizeof(lm_buff));
+	lm_buff_off = 0;
 }