Changeset 48 for trunk/src/helpers/dosh.c

Timestamp:

Mar 14, 2001, 7:57:34 PM (24 years ago)

Author:

umoeller

Message:

misc changes

File:

• trunk/src/helpers/dosh.c (modified) (7 diffs)

trunk/src/helpers/dosh.c

@@ -1661 +1661 @@
  *
  *@@added V0.9.7 (2000-12-02) [umoeller]
+ *@@changed V0.9.9 (2001-03-14) [umoeller]: added interrupt loads; thanks phaller
  */
 
@@ -1720 +1721 @@
                                 else
                                 {
-                                    pPerfSys->palLoads = (PLONG)malloc(pPerfSys->cProcessors * sizeof(LONG));
-                                    if (!pPerfSys->palLoads)
+                                    pPerfSys->padIntrPrev
+                                        = (double*)malloc(pPerfSys->cProcessors * sizeof(double));
+                                    if (!pPerfSys->padIntrPrev)
                                         arc = ERROR_NOT_ENOUGH_MEMORY;
                                     else
                                     {
-                                        for (ul = 0; ul < pPerfSys->cProcessors; ul++)
+                                        pPerfSys->palLoads = (PLONG)malloc(pPerfSys->cProcessors * sizeof(LONG));
+                                        if (!pPerfSys->palLoads)
+                                            arc = ERROR_NOT_ENOUGH_MEMORY;
+                                        else
                                         {
-                                            pPerfSys->padBusyPrev[ul] = 0.0;
-                                            pPerfSys->padTimePrev[ul] = 0.0;
-                                            pPerfSys->palLoads[ul] = 0;
+            // **patrick, this was missing...
+            // wonder if you ever tested this, this crashes in
+            // doshPerfGet otherwise ;-)
+            /*   -----------> */            pPerfSys->palIntrs = (PLONG)malloc(pPerfSys->cProcessors * sizeof(LONG));
+                                            if (!pPerfSys->palIntrs)
+                                                arc = ERROR_NOT_ENOUGH_MEMORY;
+                                            else
+                                            {
+                                                for (ul = 0; ul < pPerfSys->cProcessors; ul++)
+                                                {
+                                                    pPerfSys->padBusyPrev[ul] = 0.0;
+                                                    pPerfSys->padTimePrev[ul] = 0.0;
+                                                    pPerfSys->padIntrPrev[ul] = 0.0;
+                                                    pPerfSys->palLoads[ul] = 0;
+            /* and this one too */                  pPerfSys->palIntrs[ul] = 0;
+                                                }
+                                            }
                                         }
                                     }
@@ -1777 +1796 @@
  *
  *@@added V0.9.7 (2000-12-02) [umoeller]
+ *@@changed V0.9.9 (2001-03-14) [umoeller]: added interrupt loads; thanks phaller
  */
 
@@ -1801 +1821 @@
                 double      dBusy = LL2F(pCPUUtilThis->ulBusyHigh,
                                          pCPUUtilThis->ulBusyLow);
+                double      dIntr = LL2F(pCPUUtilThis->ulIntrHigh,
+                                         pCPUUtilThis->ulIntrLow);
 
                 double      *pdBusyPrevThis = &pPerfSys->padBusyPrev[ul];
                 double      *pdTimePrevThis = &pPerfSys->padTimePrev[ul];
+                double      *pdIntrPrevThis = &pPerfSys->padIntrPrev[ul];
 
                 // avoid division by zero
                 double      dTimeDelta = (dTime - *pdTimePrevThis);
                 if (dTimeDelta)
+                {
                     pPerfSys->palLoads[ul]
                         = (LONG)( (double)(   (dBusy - *pdBusyPrevThis)
@@ -1814 +1838 @@
                                           )
                                 );
+                    pPerfSys->palIntrs[ul]
+                        = (LONG)( (double)(   (dIntr - *pdIntrPrevThis)
+                                            / dTimeDelta
+                                            * 1000.0
+                                          )
+                                );
+                }
                 else
+                {
+                    // no clear readings are available
                     pPerfSys->palLoads[ul] = 0;
+                    pPerfSys->palIntrs[ul] = 0;
+                }
 
                 *pdTimePrevThis = dTime;
                 *pdBusyPrevThis = dBusy;
+                *pdIntrPrevThis = dIntr;
             }
         }
@@ -1832 +1868 @@
  *@@added V0.9.7 (2000-12-02) [umoeller]
  *@@changed V0.9.9 (2001-02-06) [umoeller]: removed disable; this broke the WarpCenter
+ *@@changed V0.9.9 (2001-03-14) [umoeller]: fixed memory leak
+ *@@changed V0.9.9 (2001-03-14) [umoeller]: added interrupt loads; thanks phaller
  */
 
@@ -1852 +1890 @@
         if (pPerfSys->padTimePrev)
             free(pPerfSys->padTimePrev);
+        if (pPerfSys->padIntrPrev)
+            free(pPerfSys->padIntrPrev);
+        if (pPerfSys->palLoads)             // was missing V0.9.9 (2001-03-14) [umoeller]
+            free(pPerfSys->palLoads);
+        if (pPerfSys->palIntrs)
+            free(pPerfSys->palIntrs);
 
         if (pPerfSys->hmod)