Changeset 528 for trunk/dll

Timestamp:

Nov 4, 2006, 9:59:06 PM (19 years ago)

Author:

root

Message:

Count thread usage

Location:

trunk/dll

Files:

• grep.c (modified) (5 diffs)
• mle.c (modified) (3 diffs)
• undel.c (modified) (6 diffs)

trunk/dll/grep.c

@@ -18 +18 @@
   26 Jul 06 SHL Check more run time errors
   19 Oct 06 SHL Correct . and .. detect
+  03 Nov 06 SHL Count thread usage
 
 ***********************************************************************/
@@ -40 +41 @@
 static PSZ pszSrcFile = __FILE__;
 
-#pragma alloc_text(GREP,SecsSince1980,match,mmatch,dogrep)
+#pragma alloc_text(GREP,SecsSince1980,match,mmatch,GrepThread)
 #pragma alloc_text(GREP,doallsubdirs,domatchingfiles)
 
@@ -235 +236 @@
 
 
-VOID dogrep (VOID *arg)
+VOID GrepThread (VOID *arg)
 {
   HAB           ghab;
@@ -258 +259 @@
     if(ghmq) {
       WinCancelShutdown(ghmq,TRUE);
+      IncrThreadUsage();
       DosSleep(128L);
       WinSetWindowText(grep.hwndCurFile,
@@ -371 +373 @@
       WinDestroyMsgQueue(ghmq);
     }
+    DecrThreadUsage();
     WinTerminate(ghab);
   }

trunk/dll/mle.c

@@ -12 +12 @@
   16 Apr 06 SHL MLEexportfile: rework to avoid wrap problems
   14 Jul 06 SHL Use Runtime_Error
+  03 Nov 06 SHL Count thread usage
 
 ***********************************************************************/
@@ -769 +770 @@
       if(thmq) {
         WinCancelShutdown(thmq,TRUE);
+        IncrThreadUsage();
         priority_normal();
         if(bkg->hex == 1)
@@ -786 +788 @@
         WinDestroyMsgQueue(thmq);
       }
+      DecrThreadUsage();
       WinTerminate(thab);
       _endthread();
     }
+    // fixme to be gone?
     PostMsg(bkg->hwndReport,bkg->msg,MPVOID,MPVOID);
   }

trunk/dll/undel.c

@@ -11 +11 @@
   17 Jul 06 SHL Use Runtime_Error
   29 Jul 06 SHL Use xfgets_bstripcr
+  03 Nov 06 SHL Count thread usage
 
 ***********************************************************************/
@@ -33 +34 @@
 static PSZ pszSrcFile = __FILE__;
 
-#pragma alloc_text(UNDELETE,FillUndelList,UndeleteDlgProc)
+#pragma alloc_text(UNDELETE,FillUndelListThread,UndeleteDlgProc)
 
 struct tempstruct {
@@ -42 +43 @@
 
 
-VOID FillUndelList (VOID *arg)
+static VOID FillUndelListThread (VOID *arg)
 {
   HWND  hwnd;
@@ -62 +63 @@
   thab = WinInitialize(0);
   thmq = WinCreateMsgQueue(thab,0);
-  WinCancelShutdown(thmq,TRUE);
-  if(thab && thmq) {
+  if (thab && thmq) {
+    WinCancelShutdown(thmq,TRUE);
+    IncrThreadUsage();
     WinSendDlgItemMsg(hwnd,UNDEL_LISTBOX,LM_DELETEALL,MPVOID,MPVOID);
     unlinkf("%s","$UDELETE.#$#");
@@ -149 +151 @@
     }
 Abort:
+    ;
+  }
+  DosForceDelete("$UDELETE.#$#");
+  if (undelinfo)
+    free(undelinfo);
+  if (thmq) {
+    PostMsg(hwnd,UM_CONTAINER_FILLED,MPVOID,MPVOID);
+    if (killme)
+      PostMsg(hwnd,WM_CLOSE,MPVOID,MPVOID);
     WinDestroyMsgQueue(thmq);
+  }
+  if (thab) {
+    DecrThreadUsage();
     WinTerminate(thab);
   }
-  DosForceDelete("$UDELETE.#$#");
-  PostMsg(hwnd,
-          UM_CONTAINER_FILLED,
-          MPVOID,
-          MPVOID);
-  if(killme)
-    PostMsg(hwnd,
-            WM_CLOSE,
-            MPVOID,
-            MPVOID);
-  if(undelinfo)
-    free(undelinfo);
 }
 
@@ -226 +228 @@
                   toupper(*undelinfo->path));
           WinSetWindowText(hwnd,s);
-          if (_beginthread(FillUndelList,NULL,65536,(PVOID)undelinfo) == -1)
+          if (_beginthread(FillUndelListThread,NULL,65536,(PVOID)undelinfo) == -1)
           {
             Runtime_Error(pszSrcFile, __LINE__,GetPString(IDS_COULDNTSTARTTHREADTEXT));