Changeset 477 for branches

Timestamp:

Jul 20, 2010, 10:50:05 AM (15 years ago)

Author:

Herwig Bauernfeind

Message:

GUI-Tools: EVFSGUI: Do not run more than 32 smbclient.exe at the same time

Location:

branches/guitools-2.0

Files:

• evfsgui/changes (modified) (1 diff)
• evfsgui/evfsgui.VRP (modified) (1 diff)
• evfsgui/evfsgui.VRX (modified) (1 diff)
• evfsgui/evfsgui.VRY (modified) ( previous)
• shared/smbtree.vrs (modified) (2 diffs)

branches/guitools-2.0/evfsgui/changes

@@ -26 +26 @@
 - Fixed: Workaround for uninitialized advance.!alwaysmp
 - Fixed: Do not crash on bad return value from *RxGetMount() in GetChildren
+- Fixed: Do not run more than 32 smbclient.exe concurrently (EVFSGUI needs
+         Paul Ratcliffe's pr1util.dll now)
          
 Version 2.0.5 2010-04-23

branches/guitools-2.0/evfsgui/evfsgui.VRP

@@ -10 +10 @@
 VRXWindow: __VREFileListWindow,1,807,11033,1506,3358
 VRXWindow: __VRESectionListWindow,1,2361,10648,8696,4794
-VRXWindow: __VREToolsWindow,1,2517,7082,6486,1665
+VRXWindow: __VREToolsWindow,1,2517,7082,6480,1669
 VRXWindow: __VREWindListWindow,1,542,8721,2650,3150
 UserFile: 1

branches/guitools-2.0/evfsgui/evfsgui.VRX

@@ -1879 +1879 @@
     CALL SysLoadFuncs
 
+    call RxFuncAdd 'PRLoadFuncs',  'PR1UTIL', 'PRLoadFuncs'
+    call PRLoadFuncs
+
+
     CALL _InitTempDir
 

branches/guitools-2.0/shared/smbtree.vrs

@@ -13 +13 @@
     if BroadCast = 1 then BroadCast = '-b'; else BroadCast = ''
 
-    say '  detach 'samba.!smbtreeexe' 'BroadCast' -S 'debuglevel' 'UserCred' >'samba.!msg
+    say       '  detach 'samba.!smbtreeexe' 'BroadCast' -S 'debuglevel' 'UserCred' >'samba.!msg
     address cmd 'detach 'samba.!smbtreeexe' 'BroadCast' -S 'debuglevel' 'UserCred' >'samba.!msg
 
@@ -172 +172 @@
 _RefreshShares:
     say time()' _RefreshShares() started'
-    RefreshID = RANDOM()
+    /* RefreshID = RANDOM() */
     smbmachine = TempDir||"smbmachine."||machine
+    MaxSmbClient = 32 /* Do not run more than MaxSmbClient instances of smbclient.exe at the same time */
+
+    Defer = 1
+    do while Defer = 1 
+        SmbCltCount = 0
+        ok = PRProcessList(proc)
+
+        do I = 1 to proc.0
+            CurProc = VRParseFileName(proc.i.name,'NE')
+            if CurProc = "SMBCLIENT.EXE" then SmbCltCount = SmbCltCount + 1
+        end
+        say '  'SmbCltCount' instance(s) of 'samba.!smbclientexe' is/are running.'
+        if SmbCltCount >= MaxSmbClient then do
+            say "  Waiting until at least "SmbCltCount-MaxSmbClient+1" instance(s) of smbclient.exe terminate(s)."
+            ok = SysSleep(1)
+        end
+        else Defer = 0
+    end
 
     if UserCred   = 'USERCRED'   | UserCred = '' | UserCred = '--user=%' then UserCred = '-N'