Changeset 30

Timestamp:

Jan 26, 2016, 4:27:09 PM (10 years ago)

Author:

Alex Taylor

Message:

Applied updates (from SHL) to improve stability of process listing.

Location:

rxutilex/trunk

Files:

• rxutilex.c (modified) (7 diffs)
• rxutilex.def (modified) (1 diff)

rxutilex/trunk/rxutilex.c

@@ -84 +84 @@
 #define SZ_LIBRARY_NAME         "RXUTILEX"  // Name of this library
 #define SZ_ERROR_NAME           "SYS2ERR"   // REXX variable used to store error codes
-#define SZ_VERSION              "0.1.2"     // Current version of this library
+#define SZ_VERSION              "0.1.3"     // Current version of this library
 
 // Maximum string lengths...
@@ -108 +108 @@
 // Drop list starts at index 0, load list starts at index 1
 static PSZ RxFunctionTbl[] = {
-    "Sys2LoadFuncs",                    // Drop only 2015-05-06 sSHL
+    "Sys2LoadFuncs",                    // Drop only 2015-05-06 SHL
     "Sys2DropFuncs",
     "Sys2GetClipboardText",
@@ -652 +652 @@
 ULONG Sys2QueryProcessList( PSZ pszName, ULONG argc, RXSTRING argv[], PSZ pszQueue, PRXSTRING prsResult )
 {
-#ifdef USE_DQPS
-    QSPTRREC *pBuf;                     // Data returned by DosQProcStatus()
-#else
-    QSPTRREC *pBuf;                      // Data returned by DosQuerySysState() // 2015-04-23 SHL
-#endif
+    QSPTRREC *pBuf;                      // Data returned by DosQProcStatus/DosQuerySysState() // 2015-04-23 SHL
     QSPREC *pPrec;                      // Pointer to process information block
     QSTREC *pTrec;                      // Pointer to thread information block
@@ -697 +693 @@
 
 #ifdef USE_DQPS
-    // Get running process information using DosQProcStatus()
+    // Get running process information using 16-bit DosQProcStatus()
     rc = DosQProcStatus( pBuf, UL_SSBUFSIZE );
     if ( rc != NO_ERROR ) {
@@ -704 +700 @@
         return ( 0 );
     }
-    pPrec = pBuf->pProcRec;             // 2015-04-23 SHL
 #else
-    // Get running process information using DosQuerySysState()
+    // Get running process information using 32-bit DosQuerySysState()
     rc = DosQuerySysState( QS_PROCESS, 0L, 0L, 0L, pBuf, UL_SSBUFSIZE );
     if ( rc != NO_ERROR ) {
@@ -713 +708 @@
         return ( 0 );
     }
-    pPrec = pBuf->pProcRec;
 #endif
 
     // Now get the list of processes
     ulCount = 0;
-    while ( pPrec->RecType == 1 ) {
+#   if 1 // 2015-06-12 SHL FIXME to know if can occur
+    if ( pBuf->pProcRec == NULL ) {
+        WriteErrorCode( rc, "pBuf->pProcRec NULL");
+        MAKERXSTRING( *prsResult, "", 0 );
+        return ( 0 );
+    }
+#   endif
+
+    // 2015-06-12 SHL pThrdRec can be 0 - probably when process starting or dieing
+    for (pPrec = pBuf->pProcRec;
+         ;
+         pPrec = pPrec->pThrdRec ?
+                   (QSPREC *)(pPrec->pThrdRec + pPrec->cTCB) :
+                   pPrec + 1
+        )
+
+    {
+#       if 1
+        // 2015-06-19 SHL FIXME to be gone if proven that never can occur
+        if ((ULONG)pPrec < 0x10000) {
+            fprintf(stderr, "* rxutilex#%u ulCount %u pPrec %p\n", __LINE__, ulCount, pPrec);
+            break;                      // Avoid death
+        }
+#       endif
+
+        // 2015-06-19 SHL FIXME debug was trapping here if pThrdRec NULL
+        if (pPrec->RecType != QS_PROCESS)
+            break;
+
+#       if 1
+        /* Avoid death if no threads
+           This is undocumented but probably occurs if called while process
+           is starting or terminating
+           2015-07-31 SHL
+        */
+        if (!pPrec->cTCB)
+          fprintf(stderr, "* rxutilex#%u ulCount %u pBuf %p pPrec %p pPrec->pThrdRec %p pPrec->cTCB %u\n", __LINE__, ulCount, pBuf, pPrec, pPrec->pThrdRec, pPrec->cTCB);
+        // 2015-07-31 SHL FIXME debug
+        if ((ULONG)(pPrec->pThrdRec) < 0x10000) {
+          fprintf(stderr, "* rxutilex#%u ulCount %u pBuf %p pPrec %p pPrec->pThrdRec %p pPrec->cTCB %u\n", __LINE__, ulCount, pBuf, pPrec, pPrec->pThrdRec, pPrec->cTCB);
+          break;                        // Avoid death
+        }
+#       endif
+
         ulCount++;
 
@@ -747 +784 @@
         WriteStemElement( szStem, ulCount, szPInfo );
 
-        pPrec = (QSPREC *) ( (PBYTE) (pPrec->pThrdRec) + ( pPrec->cTCB * sizeof(QSTREC) ) );
-    }
+#       if 1    // 2015-07-31 SHL FIXME debug
+        // 2015-07-31 SHL FIXME debug
+        if (!pPrec->cTCB) {
+          fprintf(stderr, "* rxutilex: szPInfo %s\n", szPInfo);
+          fprintf(stderr, "* rxutilex: ulCount %u pBuf %p pPrec %p pPrec->pThrdRec %p pPrec->cTCB %u\n", ulCount, pBuf, pPrec, pPrec->pThrdRec, pPrec->cTCB);
+          fprintf(stderr, "* rxutilex: next RecType %x\n", (pPrec + 1)->RecType);
+    }
+        // 2015-07-31 SHL FIXME debug
+        if ((ULONG)pPrec->pThrdRec < 0x10000 || !pPrec->cTCB) {
+          fprintf(stderr, "* rxutilex: szPInfo %s\n", szPInfo);
+          fprintf(stderr, "* rxutilex: ulCount %u pBuf %p pPrec %p pPrec->pThrdRec %p pPrec->cTCB %u\n", ulCount, pBuf, pPrec, pPrec->pThrdRec, pPrec->cTCB);
+          fprintf(stderr, "* rxutilex: next RecType %x\n", (pPrec + 1)->RecType);
+          break;                // Avoid death
+        }
+#       endif
+    } // for
 
     // Create the "0" stem element with the number of processes found

rxutilex/trunk/rxutilex.def

@@ -1 +1 @@
 LIBRARY     RXUTILEX INITINSTANCE TERMINSTANCE
 DATA        MULTIPLE NONSHARED
-DESCRIPTION '@#Alex Taylor:0.1.2#@##1## 27 Jan 2016 00:11:55     REINFORCE::::::@@Extended REXX Utility Functions'
+DESCRIPTION '@#Alex Taylor:0.1.3#@##1## 27 Jan 2016 00:26:24     REINFORCE::::::@@Extended REXX Utility Functions'
 
 EXPORTS     Sys2LoadFuncs