Changeset 420

Timestamp:

Dec 8, 2014, 3:25:53 AM (11 years ago)

Author:

pr

Message:

Add prc32KillProcessTree.

Files:

• branches/branch-1-0/include/helpers/procstat.h (modified) (5 diffs)
• branches/branch-1-0/src/helpers/procstat.c (modified) (17 diffs)
• trunk/include/helpers/procstat.h (modified) (2 diffs)
• trunk/src/helpers/procstat.c (modified) (3 diffs)

branches/branch-1-0/include/helpers/procstat.h

@@ -13 +13 @@
 
 /*
- *      This file Copyright (C) 1992-99 Ulrich M”ller,
- *                                      Kai Uwe Rommel.
+ *      This file Copyright (C) 1992-2014 Ulrich M”ller,
+ *                                        Kai Uwe Rommel.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -234 +234 @@
 
     // #pragma pack(1)
-    #pragma pack(4)         // V0.9.10 (2001-04-08) [umoeller]
 
     #define QS32_PROCESS      0x0001
@@ -276 +275 @@
     {
         ULONG   ulThreadCount;  // thread count
-        ULONG   ulProcCount;    // process count
+        // ULONG   ulProcCount;    // process count wrong V1.0.1 (2003-01-10) [umoeller]
+        ULONG   ulSem32Count;   // count of 32-bit sems?
         ULONG   ulModuleCount;  // module count
     } QGLOBAL32, *PQGLOBAL32;
@@ -806 +806 @@
      ********************************************************************/
 
+    PQTOPLEVEL32 prc32GetInfo2(ULONG fl,
+                               APIRET *parc);
+
     PQTOPLEVEL32 prc32GetInfo(APIRET *parc);
 
@@ -830 +833 @@
     PQFILEDATA32 prc32FindFileData(PQTOPLEVEL32 pInfo,
                                    USHORT usFileID);
+
+    void prc32KillProcessTree(ULONG pid);
+
+    void prc32KillProcessTree2(PQPROCESS32 pProcThis, ULONG pid);
 
 #endif

branches/branch-1-0/src/helpers/procstat.c

@@ -33 +33 @@
 /*
  *      Copyright (C) 1992-1994 Kai Uwe Rommel.
- *      Copyright (C) 1998-2000 Ulrich M”ller.
+ *      Copyright (C) 1998-2014 Ulrich M”ller.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -52 +52 @@
 #define INCL_DOSMODULEMGR
 #define INCL_DOSERRORS
+#define INCL_DOSPROCESS
 #include <os2.h>
 
@@ -94 +95 @@
 
     if (!ppps)
-        return (ERROR_INVALID_PARAMETER);
+        return ERROR_INVALID_PARAMETER;
 
     // changed allocation V0.9.10 (2001-04-08) [umoeller]:
@@ -187 +188 @@
     }
 
-    return (pReturn);
+    return pReturn;
 }
 
@@ -222 +223 @@
     }
 
-    return (pReturn);
+    return pReturn;
 }
 
@@ -300 +301 @@
     }
 
-    return (rc);
+    return rc;
 }
 
@@ -349 +350 @@
     }
 
-    return (ulrc);
+    return ulrc;
 }
 
@@ -394 +395 @@
     }
 
-    return (ulrc);
+    return ulrc;
 }
 
@@ -483 +484 @@
     if (prc16QueryThreadInfo(pps, usPID, usTID, &prct))
         ulrc = prct.ulPriority;
-    return (ulrc);
+    return ulrc;
 }
 
@@ -497 +498 @@
 
 /*
+ *@@ prc32GetInfo2:
+ *      nifty interface to DosQuerySysState, the 32-bit
+ *      version of DosQProcStat.
+ *
+ *      This returns the head of a newly allocated buffer
+ *      which has plenty of pointers for subsequent browing.
+ *
+ *      As opposed to prc32GetInfo, with this call you can
+ *      specify the information that would like to retrieve.
+ *
+ *      Use prc32FreeInfo to free the buffer.
+ *
+ *@@added V1.0.1 (2003-01-10) [umoeller]
+ */
+
+PQTOPLEVEL32 prc32GetInfo2(ULONG fl,        // in: QS32_* flags
+                           APIRET *parc)    // out: error, ptr can be NULL
+{
+    APIRET          arc;
+    PQTOPLEVEL32    pReturn = NULL;
+
+    #define BUFSIZE (1024 * 1024) // 1 meg
+
+    if (!(arc = DosAllocMem((PVOID*)&pReturn,
+                            BUFSIZE,
+                            PAG_READ | PAG_WRITE | PAG_COMMIT | OBJ_TILE)))
+    {
+        if (arc = DosQuerySysState(fl,
+                                   fl,      // this was missing V0.9.10 (2001-04-08) [umoeller]
+                                   0, 0,
+                                   (PCHAR)pReturn,
+                                   BUFSIZE))
+        {
+            DosFreeMem(pReturn);
+            pReturn = NULL;
+        }
+    }
+
+    if (parc)
+        *parc = arc;
+
+    return pReturn;
+}
+
+/*
  *@@ prc32GetInfo:
- *      nifty interface to DosQuerySysState,
- *      the 32-bit version of DosQProcStat.
- *      This returns the head of a newly
- *      allocated buffer which has plenty
- *      of pointers for subsequent browing.
+ *      nifty interface to DosQuerySysState, the 32-bit
+ *      version of DosQProcStat.
+ *
+ *      This returns the head of a newly allocated buffer
+ *      which has plenty of pointers for subsequent browing.
  *
  *      Use prc32FreeInfo to free the buffer.
@@ -513 +559 @@
 PQTOPLEVEL32 prc32GetInfo(APIRET *parc)     // out: error, ptr can be NULL
 {
-    #define BUFSIZE (1024 * 1024) // 1 meg
-
-    PCHAR pBuf = NULL; // (PCHAR)malloc(BUFSIZE);
-
-    if (DosAllocMem((PVOID*)&pBuf,
-                    BUFSIZE,
-                    PAG_READ | PAG_WRITE | PAG_COMMIT | OBJ_TILE)
-            == NO_ERROR)
-        if (pBuf)
-        {
-            APIRET arc = DosQuerySysState(QS32_SUPPORTED,
-                                          QS32_SUPPORTED,       // this was missing
-                                                                // V0.9.10 (2001-04-08) [umoeller]
-                                          0, 0,
-                                          (PCHAR)pBuf,
-                                          BUFSIZE);
-            if (parc)
-                *parc = arc;
-
-            if (arc == NO_ERROR)
-                return ((PQTOPLEVEL32)pBuf);
-            else
-                DosFreeMem(pBuf);
-        }
-
-    return NULL;
+    return prc32GetInfo2(QS32_SUPPORTED,
+                         parc);
 }
 
@@ -594 +616 @@
 
     if (pProcThis->ulRecType == 1)
-        return (pProcThis);
-    else
-        return NULL;
+        return pProcThis;
+
+    return NULL;
 }
 
@@ -649 +671 @@
     {
         if (i == usSemID)
-            return (pSemThis);
+            return pSemThis;
 
         i++;
@@ -678 +700 @@
     {
         if (pSemThis->usIndex == usSemID)
-            return (pSemThis);
+            return pSemThis;
 
         pSemThis = pSemThis->pNext;
@@ -704 +726 @@
     {
         if (pShrMem->usHandle == usShrMemID)
-            return (pShrMem);
+            return pShrMem;
         pShrMem = pShrMem->pNext;
     }
@@ -759 +781 @@
         {
             if (pFile->paFiles[ul].usSFN == usFileID)
-                return (pFile);
+                return pFile;
         }
 
@@ -768 +790 @@
 }
 
-
+/*
+ *@@ prc32KillProcessTree:
+ *
+ *@@added XWP V1.0.10 (2014-12-07) [pr]
+ */
+
+void prc32KillProcessTree(ULONG pid)
+{
+    APIRET arc;
+    PQTOPLEVEL32 pInfo = prc32GetInfo2(QS32_PROCESS, &arc);
+
+    if (arc == NO_ERROR)
+    {
+        prc32KillProcessTree2(pInfo->pProcessData, pid);
+        DosKillProcess(DKP_PROCESS, pid);
+        prc32FreeInfo(pInfo);
+    }
+}
+
+/*
+ *@@ prc32KillProcessTree2:
+ *
+ *@@added XWP V1.0.10 (2014-12-07) [pr]
+ */
+
+void prc32KillProcessTree2(PQPROCESS32 pProcThis, ULONG pid)
+{
+    while (pProcThis && pProcThis->ulRecType == 1)
+    {
+        PQTHREAD32 t = pProcThis->pThreads;
+
+        if (pProcThis->usPPID == pid)
+        {
+            prc32KillProcessTree2(pProcThis, pProcThis->usPID);
+            DosKillProcess(DKP_PROCESS, pProcThis->usPID);
+        }
+
+        // for next process, skip the threads info;
+        // the next process block comes after the threads
+        t += pProcThis->usThreadCount;
+        pProcThis = (PQPROCESS32)t;
+    }
+}
+

trunk/include/helpers/procstat.h

@@ -13 +13 @@
 
 /*
- *      This file Copyright (C) 1992-99 Ulrich M”ller,
- *                                      Kai Uwe Rommel.
+ *      This file Copyright (C) 1992-2014 Ulrich M”ller,
+ *                                        Kai Uwe Rommel.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -834 +834 @@
                                    USHORT usFileID);
 
+    void prc32KillProcessTree(ULONG pid);
+
+    void prc32KillProcessTree2(PQPROCESS32 pProcThis, ULONG pid);
+
 #endif
 

trunk/src/helpers/procstat.c

@@ -33 +33 @@
 /*
  *      Copyright (C) 1992-1994 Kai Uwe Rommel.
- *      Copyright (C) 1998-2000 Ulrich M”ller.
+ *      Copyright (C) 1998-2014 Ulrich M”ller.
  *      This file is part of the "XWorkplace helpers" source package.
  *      This is free software; you can redistribute it and/or modify
@@ -52 +52 @@
 #define INCL_DOSMODULEMGR
 #define INCL_DOSERRORS
+#define INCL_DOSPROCESS
 #include <os2.h>
 
@@ -789 +790 @@
 }
 
-
+/*
+ *@@ prc32KillProcessTree:
+ *
+ *@@added XWP V1.0.10 (2014-12-07) [pr]
+ */
+
+void prc32KillProcessTree(ULONG pid)
+{
+    APIRET arc;
+    PQTOPLEVEL32 pInfo = prc32GetInfo2(QS32_PROCESS, &arc);
+
+    if (arc == NO_ERROR)
+    {
+        prc32KillProcessTree2(pInfo->pProcessData, pid);
+        DosKillProcess(DKP_PROCESS, pid);
+        prc32FreeInfo(pInfo);
+    }
+}
+
+/*
+ *@@ prc32KillProcessTree2:
+ *
+ *@@added XWP V1.0.10 (2014-12-07) [pr]
+ */
+
+void prc32KillProcessTree2(PQPROCESS32 pProcThis, ULONG pid)
+{
+    while (pProcThis && pProcThis->ulRecType == 1)
+    {
+        PQTHREAD32 t = pProcThis->pThreads;
+
+        if (pProcThis->usPPID == pid)
+        {
+            prc32KillProcessTree2(pProcThis, pProcThis->usPID);
+            DosKillProcess(DKP_PROCESS, pProcThis->usPID);
+        }
+
+        // for next process, skip the threads info;
+        // the next process block comes after the threads
+        t += pProcThis->usThreadCount;
+        pProcThis = (PQPROCESS32)t;
+    }
+}
+