Improve throughput a little

doc/changes.md

@@ -202,8 +202,11 @@ as part of K95 at this time, the default terminal remains VT220 for now.
  - The linux console terminal emulation now uses the UTF-8 character set by
    default as most linux distributions moved to UTF-8 long ago now. 
  - Upgrade OpenSSL to 3.5.7
- - Improved terminal throughput for SSH connections by around seven times, which
-   helps when you accidentally cat a large log file.
+ - Drastic improvements in terminal throughput which helps when you accidentally
+   cat a large file:
+   - SSH connections are around 33x faster
+   - Telnet and other IP connections are around 8x faster
+   - Pipe and PTY connections are around 87x faster
  - Doubled maximum terminal lines to 256 in K95G on modern systems
  - Added a new function, `\fterminalchecksum`, which produces a checksum of the
    terminal screen using the same algorithm as DECRQCRA. Parameters allow you
@@ -236,12 +239,16 @@ as part of K95 at this time, the default terminal remains VT220 for now.
    - Lucida Console
    - Courier
    - Terminal
-   - System
- - Improved throughput for pipe connections on Windows 
+   - System 
  - Upgraded to zlib 1.3.2
  - The Secondary DA response when the terminal type is set to VT220 or VT220PC
    now reports the VT220 identification code, rather than the code for VT320.
  - DECCARA supports changing color attributes the K95 terminal type
+ - Added a new \v(ntime_ms) variable which provides the current time since
+   midnight in milliseconds.
+ - The default screen update interval is now 20 milliseconds giving a frame rate
+   of 50 frames per second. The old default was 100 milliseconds (10fps), but
+   overridden by the default k95custom.ini.
 
 ### New terminal control sequences
 > [!NOTE]

kermit/k95/Makefile

@@ -143,7 +143,7 @@ OBJS =  $(OUTDIR)/ckcmai$(O)  $(OUTDIR)/ckcfns$(O)  $(OUTDIR)/ckcfn2$(O) \
 		$(OUTDIR)/cknnbi$(O)  $(OUTDIR)/ckop$(O)    $(OUTDIR)/p_callbk$(O) \
 		$(OUTDIR)/p_global$(O) $(OUTDIR)/p_omalloc$(O) $(OUTDIR)/p_error$(O) \
 		$(OUTDIR)/p_common$(O) $(OUTDIR)/p_tl$(O)   $(OUTDIR)/p_dir$(O) \
-		$(OUTDIR)/ckoads$(O)  $(OUTDIR)/ckosnd$(O)
+		$(OUTDIR)/ckoads$(O)  $(OUTDIR)/ckosnd$(O)  $(OUTDIR)/ckorbf$(O)
 
 # For SSH-enabled builds
 #OBJS = $(OBJS)  ckossh$(O) ckolssh$(O) ckorbf$(O) ckolsshs$(O)
@@ -393,7 +393,7 @@ $(OUTDIR)/ckomou$(O): ckomou.c ckocon.h ckcdeb.h ckoker.h ckclib.h ckokey.h \
 $(OUTDIR)/ckoreg$(O): ckoreg.c ckcdeb.h ckoker.h ckclib.h ckcker.h
 $(OUTDIR)/ckonet$(O): ckonet.c ckcker.h ckcdeb.h ckoker.h ckclib.h ckoker.h \
 	ckcnet.h ckctel.h ckonet.h ckotcp.h ckonbi.h ckuusr.h ckcsig.h cknwin.h \
-	ckowin.h ckuath.h ck_ssl.h ckossh.h ckossl.h ckosslc.h
+	ckowin.h ckuath.h ck_ssl.h ckossh.h ckossl.h ckosslc.h ckorbf.h
 $(OUTDIR)/ckoslp$(O): ckoslp.c ckoslp.h ckcdeb.h ckoker.h ckclib.h
 $(OUTDIR)/ckosyn$(O): ckosyn.c ckcdeb.h ckoker.h ckclib.h ckcker.h ckocon.h \
 	ckuusr.h ckntap.h

kermit/k95/ckcnet.c

@@ -406,6 +406,7 @@ extern char ttname[];
 #ifdef CK_AUTHENTICATION
 #include "ckuusr.h"
 #endif /* CK_AUTHENTICATION */
+int le_hasdata();
 #endif /* OS2 */
 
 #ifdef NT
@@ -6449,7 +6450,11 @@ netinc(timo) int timo;
     }
 
 #ifdef LEBUF
-    if (le_inbuf() > 0) {               /* If data was inserted into the */
+    if (
+    #ifdef OS2
+            le_hasdata() &&
+    #endif /* OS2 */
+            le_inbuf() > 0) {               /* If data was inserted into the */
         if (le_getchar((CHAR *)&c) > 0) {/* Local Echo buffer while the   */
 #ifdef OS2                               /* was taking place do not mix   */
           ReleaseTCPIPMutex();           /* the le data with the net data */

kermit/k95/ckoco2.c

@@ -1780,6 +1780,14 @@ VscrnIsDirty( int vmode )
     extern int k95stdout;
     if ( k95stdout )
         return 0;
+#ifdef KUIDIRTY
+   /* Just having a number that constantly changes is a bit cheaper than
+    * semaphores. KUI is on a different thread, so it just needs to check if the
+    * number has changed since last it checked to know if its dirty. KUI never
+    * waited on the semaphore, so there wasn't much value in the extra overhead
+    * it has. */
+   vscrn[vmode].dirty++;
+#else /* KUIDIRTY */
 #ifdef OLDDIRTY
    RequestVscrnDirtyMutex( vmode, SEM_INDEFINITE_WAIT );
    if ( !isdirty[vmode] )
@@ -1790,11 +1798,13 @@ VscrnIsDirty( int vmode )
    ReleaseVscrnDirtyMutex(vmode);
 #else
     rc = PostVscrnDirtySem(vmode) ;
-#endif 
+#endif
+#endif /* KUIDIRTY */
    return rc ;
 }
 
 
+#ifndef KUIDIRTY
 APIRET
 IsVscrnDirty( int vmode )
 {
@@ -1824,9 +1834,11 @@ VscrnClean( int vmode )
 #else
     rc = IsVscrnDirty(vmode);
     ResetVscrnDirtySem(vmode);
-#endif 
+#endif
     return rc ;
 }
+#endif /* KUIDIRTY */
+
 /*----------------------------------------------------------+----------------*/
 /* VscrnScrollLf                                            | Page: Cursor   */
 /*----------------------------------------------------------+----------------*/
@@ -2071,7 +2083,8 @@ VscrnWrtCell( BYTE vmode, viocell Cell, vtattrib att, USHORT Row, USHORT Col )
     if ( vmode == VTERM && decsasd == SASD_STATUS )
         vmode = VSTATUS ;
 
-    line = VscrnGetLineFromTop( vmode, Row, FALSE ) ;
+    line = VscrnGetPageLineFromTop( vmode, Row,
+				vscrn_current_page_number(vmode, FALSE) ) ;
 
     if (line->width == 0) {
         line->width = VscrnGetWidth(vmode)  ;
@@ -2569,7 +2582,8 @@ VscrnGetLineVtAttr( BYTE vmode, SHORT y ) /* zero based */
     if ( vmode == VTERM && decsasd == SASD_STATUS )
         vmode = VSTATUS ;
 
-    return VscrnGetLineFromTop(vmode,y,FALSE)->vt_line_attr ;
+	return VscrnGetPageLineFromTop(
+		vmode, y, vscrn_current_page_number(vmode, FALSE))->vt_line_attr;
 }
 
 /*---------------------------------------------------------------------------*/
@@ -2997,17 +3011,17 @@ VscrnGetEnd( BYTE vmode, BOOL orStatusLine, BOOL view_page )
 /* VscrnSetPageTop                                          | Page: Specified*/
 /*----------------------------------------------------------+----------------*/
 LONG
-VscrnSetPageTop( BYTE vmode, LONG y, BOOL orStatusLine, int page )
+VscrnSetPageTop( BYTE vmode, LONG y, BOOL orStatusLine, int page, BOOL haveMutex )
 {
     if ( vmode == VTERM && decsasd == SASD_STATUS && orStatusLine )
         vmode = VSTATUS ;
 
     while ( y < 0 )
         y += vscrn[vmode].pages[page].linecount ;
 
-    RequestVscrnMutex( vmode, SEM_INDEFINITE_WAIT ) ;
+	if (!haveMutex) RequestVscrnMutex( vmode, SEM_INDEFINITE_WAIT ) ;
     vscrn[vmode].pages[page].top = y%vscrn[vmode].pages[page].linecount ;
-    ReleaseVscrnMutex( vmode );
+    if (!haveMutex) ReleaseVscrnMutex( vmode );
     return vscrn[vmode].pages[page].top ;
 }
 
@@ -3018,7 +3032,7 @@ LONG
 VscrnSetTop( BYTE vmode, LONG y, BOOL orStatusLine, BOOL view )
 {
     return VscrnSetPageTop(vmode, y, orStatusLine,
-		vscrn_current_page_number(vmode, view));
+		vscrn_current_page_number(vmode, view), FALSE);
 }
 
 
@@ -3066,6 +3080,7 @@ VscrnSetScrollHorz( BYTE vmode, LONG h )
 /*----------------------------------------------------------+----------------*/
 /* VscrnSetPageBegin                                        | Page: Specified*/
 /*----------------------------------------------------------+----------------*/
+/* You must acquire the Vscrn mutex before calling! */
 LONG
 VscrnSetPageBegin( BYTE vmode, LONG y, int page )
 {
@@ -3076,25 +3091,14 @@ VscrnSetPageBegin( BYTE vmode, LONG y, int page )
     while ( y < 0 )
         y += vscrn[vmode].pages[page].linecount ;
 
-    RequestVscrnMutex( vmode, SEM_INDEFINITE_WAIT ) ;
     vscrn[vmode].pages[page].beg = y%vscrn[vmode].pages[page].linecount ;
-    ReleaseVscrnMutex( vmode );
     return vscrn[vmode].pages[page].beg ;
 }
 
-/*----------------------------------------------------------+----------------*/
-/* VscrnSetBegin                                            | Page: Specified*/
-/*----------------------------------------------------------+----------------*/
-LONG
-VscrnSetBegin( BYTE vmode, LONG y, BOOL view )
-{
-   return VscrnSetPageBegin(
-		vmode, y, vscrn_current_page_number(vmode, view));
-}
-
 /*----------------------------------------------------------+----------------*/
 /* VscrnSetPageEnd                                          | Page: Specified*/
 /*----------------------------------------------------------+----------------*/
+/* You must acquire the Vscrn mutex before calling! */
 LONG
 VscrnSetPageEnd( BYTE vmode, LONG y, int page )
 {
@@ -3104,22 +3108,10 @@ VscrnSetPageEnd( BYTE vmode, LONG y, int page )
     while ( y < 0 )
         y += vscrn[vmode].pages[page].linecount ;
 
-    RequestVscrnMutex( vmode, SEM_INDEFINITE_WAIT ) ;
     vscrn[vmode].pages[page].end = y%vscrn[vmode].pages[page].linecount ;
-    ReleaseVscrnMutex( vmode );
     return vscrn[vmode].pages[page].end ;
 }
 
-/*----------------------------------------------------------+----------------*/
-/* VscrnSetEnd                                              | Page: Specified*/
-/*----------------------------------------------------------+----------------*/
-LONG
-VscrnSetEnd( BYTE vmode, LONG y, BOOL view )
-{
-    return VscrnSetPageEnd(
-		vmode, y, vscrn_current_page_number(vmode, view));
-}
-
 /*----------------------------------------------------------+----------------*/
 /* VscrnGetPageBufferSize                                   | Page: Specified*/
 /*----------------------------------------------------------+----------------*/
@@ -3808,7 +3800,7 @@ VscrnScrollPage(BYTE vmode, int updown, int topmargin, int bottommargin,
 #endif /* KUI */
                 }
 
-                VscrnSetPageTop( vmode,ntop, TRUE, page ) ;
+                VscrnSetPageTop( vmode,ntop, TRUE, page, TRUE ) ;
                 if ( bottommargin != VscrnGetHeight(vmode)
                                         -(tt_status[vmode]?2:1) )
                     VscrnScrollPage(vmode,DOWNWARD, bottommargin, VscrnGetHeight(vmode)

kermit/k95/ckoco3.c

@@ -17982,10 +17982,12 @@ cwrite(unsigned short ch) {             /* Used by ckcnet.c for */
    New code supporting auto-download for Zmodem and Kermit protocols.
 */
 
-    debugses( ch ) ;                    /* Session debugging */
+	if (debses)
+    	debugses( ch ) ;                    /* Session debugging */
 
 #ifdef CKLEARN
-    learnnet(ch);
+    if (learning)
+    	learnnet(ch);
 #endif /* CKLEARN */
 
 #ifndef NOXFER
@@ -19262,7 +19264,7 @@ lgotoxy(BYTE vmode, int x, int y) {
     wrapit = FALSE;
 
     if ( markmodeflag[vmode] == notmarking )
-      VscrnSetCurPos( vmode, x - 1, y - 1 ) ;
+      VscrnSetCurPosEx( vmode, x - 1, y - 1, TRUE ) ;
 #ifdef COMMENT
     debug(F111,"lgotoxy","vmode",vmode);
     debug(F111,"lgotoxy","x",x);

kermit/k95/ckocon.h

@@ -1371,6 +1371,9 @@ typedef struct vscrn_struct {
     int           display_height;
     BOOL          page_cursor_coupling;
     BOOL          allow_alt_buf; /* Allow switching to alternate buffer? */
+#ifdef KUIDIRTY
+	int           dirty;
+#endif /* KUI */
 } vscrn_t;
 
 
@@ -1657,14 +1660,12 @@ _PROTOTYP( ULONG VscrnGetPageBegin, ( BYTE, BOOL, int ) ) ;
 _PROTOTYP( ULONG VscrnGetBegin, ( BYTE, BOOL, BOOL ) ) ;
 _PROTOTYP( ULONG VscrnGetPageEnd, ( BYTE, BOOL, int ) ) ;
 _PROTOTYP( ULONG VscrnGetEnd, ( BYTE, BOOL, BOOL ) ) ;
-_PROTOTYP( LONG VscrnSetPageTop, ( BYTE, LONG, BOOL, int ) ) ;
+_PROTOTYP( LONG VscrnSetPageTop, ( BYTE, LONG, BOOL, int, BOOL ) ) ;
 _PROTOTYP( LONG VscrnSetTop, ( BYTE, LONG, BOOL, BOOL ) ) ;
 _PROTOTYP( LONG VscrnSetScrollTop, ( BYTE, LONG ) ) ;
 /*_PROTOTYP( LONG VscrnSetScrollHorz, ( BYTE, LONG ) ) ;*/
 _PROTOTYP( LONG VscrnSetPageBegin, ( BYTE, LONG, int ) ) ;
-_PROTOTYP( LONG VscrnSetBegin, ( BYTE, LONG, BOOL ) ) ;
 _PROTOTYP( LONG VscrnSetPageEnd, ( BYTE, LONG, int ) ) ;
-_PROTOTYP( LONG VscrnSetEnd, ( BYTE, LONG, BOOL ) ) ;
 _PROTOTYP( ULONG VscrnGetPageBufferSize, ( BYTE, BOOL, int ) ) ;
 _PROTOTYP( ULONG VscrnGetBufferSize, ( BYTE, BOOL, BOOL ) ) ;
 _PROTOTYP( VOID VscrnSetWidth, ( BYTE, int ) ) ;

kermit/k95/ckoker.mak

@@ -87,8 +87,7 @@ COMMON_CFLAGS = /MD
 # Visual C++ 2002 and newer
 COMMON_CFLAGS = $(COMMON_CFLAGS) /RTCsu
 !else
-# Enable most speed optimizations
-COMMON_OPTS = /Ox
+COMMON_OPTS = /O2
 !endif
 
 # These are:
@@ -494,7 +493,7 @@ msvc-sshdll:
     OPT="$(COMMON_OPTS)" \
     DEBUG="-DNDEBUG" \
     DLL="" \
-    CFLAGS=" $(COMMON_CFLAGS) $(CFLAG_GF) /J /DWIN32=1 /D_WIN32 /D_WIN32_WINNT=$(WIN32_VERSION) /D_CONSOLE /D__32BIT__ /W2 /Fm /F65536" \
+    CFLAGS=" $(COMMON_CFLAGS) $(CFLAG_GF) /J /DWIN32=1 /D_WIN32 /D_WIN32_WINNT=$(WIN32_VERSION) /D_CONSOLE /D__32BIT__ /W2 /Fm /F65536 /DCK_SSH_DLL" \
     LDFLAGS="" \
     PLATFORM="NT" \
     NOLINK="/c" \
@@ -507,7 +506,7 @@ msvc-sshdlld:
     OPT="$(COMMON_OPTS)" \
     DEBUG="$(DEBUG_COPT)" \
     DLL="" \
-    CFLAGS=" $(COMMON_CFLAGS) $(CFLAG_GF) /J /DWIN32=1 /D_WIN32 /D_WIN32_WINNT=$(WIN32_VERSION) /D_CONSOLE /D__32BIT__ /W2 /Fm /F65536" \
+    CFLAGS=" $(COMMON_CFLAGS) $(CFLAG_GF) /J /DWIN32=1 /D_WIN32 /D_WIN32_WINNT=$(WIN32_VERSION) /D_CONSOLE /D__32BIT__ /W2 /Fm /F65536 /DCK_SSH_DLL" \
     LDFLAGS="" \
     PLATFORM="NT" \
     NOLINK="/c" \
@@ -633,7 +632,7 @@ k95gd:
 	OPT="" \
     DEBUG="$(DEBUG_COPT) /Odi" \
     DLL="" \
-    CFLAGS=" $(COMMON_CFLAGS) /J /DKUI /DK95G /DCK_WIN /DWIN32 /D_WIN32_WINNT=$(WIN32_VERSION) /D_CONSOLE /D__32BIT__ /W2 -I." \
+    CFLAGS=" $(COMMON_CFLAGS) /J /DKUI /DKUIDIRTY /DK95G /DCK_WIN /DWIN32 /D_WIN32_WINNT=$(WIN32_VERSION) /D_CONSOLE /D__32BIT__ /W2 -I." \
     LDFLAGS="" \
     PLATFORM="NT" \
     NOLINK="-c" \
@@ -648,7 +647,7 @@ k95g:
     OPT="$(COMMON_OPTS)" \
     DEBUG="-DNDEBUG" \
     DLL="" \
-	CFLAGS=" $(COMMON_CFLAGS) /J /DKUI /DK95G /DCK_WIN /DWIN32 /D_WIN32_WINNT=$(WIN32_VERSION) /D_CONSOLE /D__32BIT__ /W2 /I." \
+	CFLAGS=" $(COMMON_CFLAGS) /J /DKUI /DKUIDIRTY /DK95G /DCK_WIN /DWIN32 /D_WIN32_WINNT=$(WIN32_VERSION) /D_CONSOLE /D__32BIT__ /W2 /I." \
     LDFLAGS="" \
     PLATFORM="NT" \
     NOLINK="-c" \
@@ -1053,6 +1052,7 @@ OBJS =  ckcmai$(O) ckcfns$(O) ckcfn2$(O) ckcfn3$(O) ckcnet$(O) ckcpro$(O) \
         ckuusy$(O) ckuxla$(O) ckclib$(O) ckctel$(O) ckcuni$(O) ckcftp$(O) \
 !if "$(PLATFORM)" == "NT"
         cknsig$(O) cknalm$(O) ckntap$(O) cknwin$(O) cknprt$(O) cknpty$(O) \
+        ckorbf$(O) \
 !else
         ckusig$(O) \
 !endif
@@ -1064,7 +1064,7 @@ OBJS =  ckcmai$(O) ckcfns$(O) ckcfn2$(O) ckcfn3$(O) ckcnet$(O) ckcpro$(O) \
 !if ("$(CKF_SSH)" == "yes")
         ckossh$(O) \
 !if ("$(CKF_DYNAMIC_SSH)" != "yes")
-        ckolssh$(O) ckorbf$(O) ckolsshs$(O) \
+        ckolssh$(O) ckolsshs$(O) \
 !endif
 !endif
         ckocon$(O) ckoco2$(O) ckoco3$(O) ckoco4$(O) ckoco5$(O) \
@@ -1427,9 +1427,9 @@ nullssh.dll: ckonssh.obj ckoker.mak
 !endif
 !endif
 
-k95ssh.dll: ckolssh.obj ckolsshs.obj ckorbf.obj k95ssh.res ckoker.mak
+k95ssh.dll: ckolssh.obj ckolsshs.obj ckorbfd.obj k95ssh.res ckoker.mak
 	link /dll /debug /def:k95ssh.def /out:$@ ckolssh.obj ckolsshs.obj \
-	    ckorbf.obj k95ssh.res $(SSH_LIB) ws2_32.lib
+	    ckorbfd.obj k95ssh.res $(SSH_LIB) ws2_32.lib
 
 k2crypt.dll: ck_crp.obj ck_des.obj ckclib.obj k2crypt.def ckoker.mak
 	ilink /nologo /noi /exepack:1 /align:16 /base:0x10000 k2crypt.def \
@@ -1627,7 +1627,7 @@ ckctel$(O):	ckctel.c ckcker.h ckcdeb.h ckoker.h ckclib.h ckctel.h ckcnet.h ckoco
                 ckossl.h ckosslc.h
 ckonet$(O):	    ckonet.c ckcker.h ckcdeb.h ckoker.h ckclib.h ckoker.h ckcnet.h ckctel.h ckonet.h \
                 ckotcp.h ckonbi.h ckuusr.h ckcsig.h cknwin.h ckowin.h ckuath.h ckossh.h \
-                ck_ssl.h ckossl.h ckosslc.h
+                ck_ssl.h ckossl.h ckosslc.h ckorbf.h
 !if "$(PLATFORM)" == "NT"
 cknnbi$(O):     cknnbi.c ckonbi.h ckcdeb.h ckoker.h ckclib.h 
 !else
@@ -1673,6 +1673,11 @@ ckolssh$(O):    ckolsshs.h ckolsshs.h ckorbf.h ckcdeb.h ckoker.h ckclib.h ckossl
 ckolsshs$(O):   ckolsshs.c ckolsshs.h ckorbf.h ckcdeb.h ckcker.h ckocon.h
 ckorbf$(O):     ckorbf.c ckorbf.h ckcdeb.h
 
+# A variant of the ring buffer for use in DLLs. This comes with its own msleep
+# implementatino and a few other things.
+ckorbfd$(O):    ckorbf.c ckorbf.h ckcdeb.h
+    $(CC) $(CC2) $(CFLAGS) /DCK_SSH_DLL $(DEBUG) $(OPT) $(DEFINES) $(NOLINK) /Fockorbfd$(O) -c ckorbf.c
+
 ckossh$(O):     ckossh.c ckossh.h ckcdeb.h ckuusr.h ckcker.h ckocon.h ckoreg.h
 
 ckonssh$(O):    ckonssh.c ckossh.h ckcdeb.h