commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ima...@apache.org
Subject svn commit: r169438 - /jakarta/commons/sandbox/vfs/trunk/src/java/org/apache/commons/vfs/impl/DefaultFileMonitor.java
Date Tue, 10 May 2005 08:02:45 GMT
Author: imario
Date: Tue May 10 01:02:44 2005
New Revision: 169438

URL: http://svn.apache.org/viewcvs?rev=169438&view=rev
Log:
PR: 34735
Reported By: Christopher Ottley <xknight -at- users.sourceforge.net>

added "checksPerRun"

Modified:
    jakarta/commons/sandbox/vfs/trunk/src/java/org/apache/commons/vfs/impl/DefaultFileMonitor.java

Modified: jakarta/commons/sandbox/vfs/trunk/src/java/org/apache/commons/vfs/impl/DefaultFileMonitor.java
URL: http://svn.apache.org/viewcvs/jakarta/commons/sandbox/vfs/trunk/src/java/org/apache/commons/vfs/impl/DefaultFileMonitor.java?rev=169438&r1=169437&r2=169438&view=diff
==============================================================================
--- jakarta/commons/sandbox/vfs/trunk/src/java/org/apache/commons/vfs/impl/DefaultFileMonitor.java
(original)
+++ jakarta/commons/sandbox/vfs/trunk/src/java/org/apache/commons/vfs/impl/DefaultFileMonitor.java
Tue May 10 01:02:44 2005
@@ -29,31 +29,43 @@
 import java.util.Map;
 import java.util.Stack;
 
-
 /**
  * A polling {@link FileMonitor} implementation.<br />
  * <br />
- * The DefaultFileMonitor is a Thread based polling file system monitor with a 1 second delay.<br
/>
+ * The DefaultFileMonitor is a Thread based polling file system monitor with a 1
+ * second delay.<br />
  * <br />
  * <b>Design:</b>
  * <p/>
  * There is a Map of monitors known as FileMonitorAgents. With the thread running,
- * each FileMonitorAgent object is asked to "check" on the file it is responsible for.
+ * each FileMonitorAgent object is asked to "check" on the file it is
+ * responsible for.
  * To do this check, the cache is cleared.
  * </p>
  * <ul>
- * <li>If the file existed before the refresh and it no longer exists, a delete event
is fired.</li>
- * <li>If the file existed before the refresh and it still exists, check the last modified
timestamp to see if that has changed.</li>
+ * <li>If the file existed before the refresh and it no longer exists, a delete
+ * event is fired.</li>
+ * <li>If the file existed before the refresh and it still exists, check the
+ * last modified timestamp to see if that has changed.</li>
  * <li>If it has, fire a change event.</li>
  * </ul>
  * <p/>
- * With each file delete, the FileMonitorAgent of the parent is asked to re-build its
- * list of children, so that they can be accurately checked when there are new children.<br/>
- * New files are detected during each "check" as each file does a check for new children.
- * If new children are found, create events are fired recursively if recursive descent is
+ * With each file delete, the FileMonitorAgent of the parent is asked to
+ * re-build its
+ * list of children, so that they can be accurately checked when there are new
+ * children.<br/>
+ * New files are detected during each "check" as each file does a check for new
+ * children.
+ * If new children are found, create events are fired recursively if recursive
+ * descent is
  * enabled.
  * </p>
  * <p/>
+ * For performance reasons, added a delay that increases as the number of files
+ * monitored
+ * increases. The default is a delay of 1 second for every 1000 files processed.
+ * </p>
+ * <p/>
  * <br /><b>Example usage:</b><pre>
  * FileSystemManager fsManager = VFS.getManager();
  * FileObject listendir = fsManager.resolveFile("/home/username/monitored/");
@@ -63,7 +75,8 @@
  * fm.addFile(listendir);
  * fm.start();
  * </pre>
- * <i>(where CustomFileListener is a class that implements the FileListener interface.)</i>
+ * <i>(where CustomFileListener is a class that implements the FileListener
+ * interface.)</i>
  *
  * @author <a href="mailto:xknight@users.sourceforge.net">Christopher Ottley</a>
  * @version $Revision$ $Date$
@@ -108,6 +121,11 @@
     private long delay = 1000;
 
     /**
+     * Set the number of files to check until a delay will be inserted
+     */
+    private int checksPerRun = 1000;
+
+    /**
      * A listener object that if set, is notified on file creation and deletion.
      */
     private final FileListener listener;
@@ -151,7 +169,8 @@
         {
             if (this.monitorMap.get(file.getName()) == null)
             {
-                this.monitorMap.put(file.getName(), new FileMonitorAgent(this, file));
+                this.monitorMap.put(file.getName(), new FileMonitorAgent(this,
+                        file));
 
                 try
                 {
@@ -236,7 +255,33 @@
      */
     public void setDelay(long delay)
     {
-        this.delay = delay;
+        if (delay > 0)
+        {
+            this.delay = delay;
+        }
+        else
+        {
+            this.delay = 1000;
+        }
+    }
+
+    /**
+     * get the number of files to check per run
+     */
+    public int getChecksPerRun()
+    {
+        return checksPerRun;
+    }
+
+    /**
+     * set the number of files to check per run.
+     * a additional delay will be added if there are more files to check
+     *  
+     * @param checksPerRun a value less than 1 will disable this feature
+     */
+    public void setChecksPerRun(int checksPerRun)
+    {
+        this.checksPerRun = checksPerRun;
     }
 
     /**
@@ -274,7 +319,8 @@
      */
     public void run()
     {
-        mainloop: while (!Thread.currentThread().isInterrupted() && this.shouldRun)
+        mainloop:
+        while (!Thread.currentThread().isInterrupted() && this.shouldRun)
         {
             while (!this.deleteStack.empty())
             {
@@ -287,7 +333,8 @@
             {
                 fileNames = this.monitorMap.keySet().toArray();
             }
-            for (int iterFileNames = 0; iterFileNames < fileNames.length; iterFileNames++)
+            for (int iterFileNames = 0; iterFileNames < fileNames.length;
+                 iterFileNames++)
             {
                 FileName fileName = (FileName) fileNames[iterFileNames];
                 FileMonitorAgent agent;
@@ -300,6 +347,21 @@
                     agent.check();
                 }
 
+                if (getChecksPerRun() > 0)
+                {
+                    if ((iterFileNames % getChecksPerRun()) == 0)
+                    {
+                        try
+                        {
+                            Thread.sleep(getDelay());
+                        }
+                        catch (InterruptedException e)
+                        {
+
+                        }
+                    }
+                }
+
                 if (Thread.currentThread().isInterrupted() || !this.shouldRun)
                 {
                     continue mainloop;
@@ -374,7 +436,8 @@
                     FileObject[] childrenList = this.file.getChildren();
                     for (int i = 0; i < childrenList.length; i++)
                     {
-                        this.children.put(childrenList[i].getName(), new Object()); // null?
+                        this.children.put(childrenList[i].getName(), new
+                            Object()); // null?
                     }
                 }
             }
@@ -423,7 +486,8 @@
             // Remove it because a listener is added in the queueAddFile
             if (this.fm.getFileListener() != null)
             {
-                child.getFileSystem().removeListener(child, this.fm.getFileListener());
+                child.getFileSystem().removeListener(child,
+                    this.fm.getFileListener());
             }
 
             this.fm.queueAddFile(child); // Add
@@ -469,9 +533,11 @@
 
                         for (int i = 0; i < newChildren.length; i++)
                         {
-                            newChildrenMap.put(newChildren[i].getName(), new Object()); //
null ?
+                            newChildrenMap.put(newChildren[i].getName(), new
+                                Object()); // null ?
                             // If the child's not there
-                            if (!this.children.containsKey(newChildren[i].getName()))
+                            if
+                            (!this.children.containsKey(newChildren[i].getName()))
                             {
                                 missingChildren.push(newChildren[i]);
                             }
@@ -485,7 +551,8 @@
 
                             while (!missingChildren.empty())
                             {
-                                FileObject child = (FileObject) missingChildren.pop();
+                                FileObject child = (FileObject)
+                                    missingChildren.pop();
                                 this.fireAllCreate(child);
                             }
                         }
@@ -500,7 +567,8 @@
                         }
                         for (int i = 0; i < newChildren.length; i++)
                         {
-                            this.children.put(newChildren[i].getName(), new Object()); //
null?
+                            this.children.put(newChildren[i].getName(), new
+                                Object()); // null?
                             this.fireAllCreate(newChildren[i]);
                         }
                     }
@@ -526,7 +594,8 @@
 
                     // Fire delete event
 
-                    ((AbstractFileSystem) this.file.getFileSystem()).fireFileDeleted(this.file);
+                    ((AbstractFileSystem)
+                        this.file.getFileSystem()).fireFileDeleted(this.file);
 
                     // Remove listener in case file is re-created. Don't want to fire twice.
                     if (this.fm.getFileListener() != null)
@@ -542,16 +611,19 @@
                 {
 
                     // Check the timestamp to see if it has been modified
-                    if (this.timestamp != this.file.getContent().getLastModifiedTime())
+                    if (this.timestamp !=
+                            this.file.getContent().getLastModifiedTime())
                     {
-                        this.timestamp = this.file.getContent().getLastModifiedTime();
+                        this.timestamp =
+                            this.file.getContent().getLastModifiedTime();
                         // Fire change event
 
                         // Don't fire if it's a folder because new file children
                         // and deleted files in a folder have their own event triggered.
                         if (this.file.getType() != FileType.FOLDER)
                         {
-                            ((AbstractFileSystem) this.file.getFileSystem()).fireFileChanged(this.file);
+                            ((AbstractFileSystem)
+                                this.file.getFileSystem()).fireFileChanged(this.file);
                         }
                     }
 
@@ -568,5 +640,4 @@
 
     }
 
-}
-
+}
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message