Changeset 426 for trunk/dll/arccnrs.c

Timestamp:

Aug 3, 2006, 4:01:23 AM (19 years ago)

Author:

root

Message:

Add logic to stop processing large archives

File:

• trunk/dll/arccnrs.c (modified) (8 diffs)

trunk/dll/arccnrs.c

@@ -28 +28 @@
   29 Jul 06 SHL Use xfgets_bstripcr
   31 Jul 06 SHL Lower priority for archives with more than 1000 entries
+  02 Aug 06 SHL Add logic to stop processing large archives
 
 ***********************************************************************/
@@ -296 +297 @@
 
 static INT FillArcCnr(HWND hwndCnr,CHAR *arcname,ARC_TYPE **arcinfo,
-                      ULONGLONG *pullTotalBytes)
+                      ULONGLONG *pullTotalBytes, volatile PCHAR pStopFlag)
 {
   FILE         *fp;
@@ -433 +434 @@
       gotstart = !info->startlist || !*info->startlist; // If list has no start marker
 
-      while(!feof(fp) && !gotend) {
+      while(!feof(fp) && !gotend && !*pStopFlag) {
         if (!xfgets_bstripcr(s,sizeof(s),fp,pszSrcFile,__LINE__))
           break;
@@ -615 +616 @@
                 lastpai = pai;
               }
-              // Avoid hogging system if large archive
-              if (numarcfiles == 1000)
-                  priority_idle();
+              // Avoid hogging system for large archive
+              if (numarcfiles == 100)
+                priority_idle();
             }
           }
@@ -625 +626 @@
       fclose(fp);
 
-      if (!numarcfiles || !gotstart || (!gotend && info->endlist && *info->endlist))
+      if (*pStopFlag)
+        numarcfiles = 0;                // Request close
+      else if (!numarcfiles || !gotstart || (!gotend && info->endlist && *info->endlist))
       {
         // Oops
@@ -675 +678 @@
       }
     } // if opened
+
     DosError(FERR_DISABLEHARDERR);
     DosForceDelete(arctemp);
   }
 
-  if (numarcfiles >= 500)
+  if (numarcfiles)
     priority_normal();
 
@@ -1337 +1341 @@
                                      dcd->arcname,
                                      &dcd->info,
-                                     &dcd->ullTotalBytes);
+                                     &dcd->ullTotalBytes,
+                                     &dcd->stopflag);
         if (!dcd->totalfiles)
           PostMsg(dcd->hwndCnr,WM_CLOSE,MPVOID,MPVOID);
@@ -2719 +2724 @@
                                          dcd->arcname,
                                          &dcd->info,
-                                         &dcd->ullTotalBytes);
+                                         &dcd->ullTotalBytes,
+                                         &dcd->stopflag);
             PostMsg(dcd->hwndCnr,UM_RESCAN,MPVOID,MPVOID);
             PostMsg(dcd->hwndCnr,UM_SETUP2,MPVOID,MPVOID);