perfsonar development work

Author: michael.bischoff
Date: 2008-05-26 12:49:57 -0400 (Mon, 26 May 2008)
New Revision: 3876

Added:
   
trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/NamedthreadFactory.java
Modified:
   trunk/surfnet_java-flowsa-ma/conf/service.properties
   
trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/NfdumpControll.java
Log:
Changed service.properties to fix web-wizard
small fix of ThreadFactory

Modified: trunk/surfnet_java-flowsa-ma/conf/service.properties
===================================================================
--- trunk/surfnet_java-flowsa-ma/conf/service.properties        2008-05-26 
15:12:48 UTC (rev 3875)
+++ trunk/surfnet_java-flowsa-ma/conf/service.properties        2008-05-26 
16:49:57 UTC (rev 3876)
@@ -3,23 +3,39 @@
 # ----------------------------------------------
 
 # === Service Type ===
-#Group=ServiceType
+
+# Group=ServiceType
+# Description= no description
 service.r.type=ma
-#Group=ServiceType
+
+# Group=ServiceType
+# Description= no description
 service.r.service_type=ma
-#Group=ServiceType
+
+# Group=ServiceType
+# Description= no description
 service.r.service_name=Java flowSA MA
-#Group=ServiceType
+
+# Group=ServiceType
+# Description= no description
 service.r.ls_url=http://localhost:8080/XML-LS-1.1.2/services/LookupService
-#Group=ServiceType
+
+# Group=ServiceType
+# Description= no description
 
service.r.access_point=http://sonar1.amsterdam.surfnet.nl:8080/flowsa-ma-0.9.1/services/FlowsaMeasurementArchiveService
 
 # === Measurement Archive general properties ===
-#Group=MaGeneral
+
+# Group=MaGeneral
+# Description= no description
 
service.ma.class_name=org.perfsonar.service.measurementArchive.flowsa.FlowsaMAServiceEngine
-#Group=MaGeneral
+
+# Group=MaGeneral
+# Description= no description
 service.ma.message_types=SetupDataRequest
-#Group=MaGeneral
+
+# Group=MaGeneral
+# Description= no description
 service.ma.conf_file=config.xml
 
 # === Flowsa specific properties ===
@@ -84,41 +100,91 @@
 # --- query properties ---
 # query.timeout - timeout/max execution time of a query (value is in seconds)
 # query.max-results - if more then <value> results are encountered stop 
processing
+
+# Group=Query properties
+# Description= timeout/max execution time of a query (value is in seconds)
 service.ma.flowsa.query.timeout=60
+
+# Group=Query properties
+# Description= if more then <value> results are encountered stop processing
 service.ma.flowsa.query.max-results=1000
 
 # --- nfdump properties ---
 # nfdump.source - location of nfcapd files
 # nfdump.location - the location of the nfdump executable (including nfdump 
filename)
 # nfdump.outputreader - fully qualified name of the class used for output 
reading (expects a class implementing NfdumpOutputReader)
+
+# Group=Nfdump properties
+# Description=location of nfcapd files
 service.ma.flowsa.nfdump.source=/var/lib/surfnet_java-flowsa-ma
+
+# Group=Nfdump properties
+# Description= the location of the nfdump executable (including nfdump 
filename)
 service.ma.flowsa.nfdump.location=/usr/bin/nfdump
+
+# Group=Nfdump properties
+# Description= fully qualified name of the class used for output reading 
(expects a class implementing NfdumpOutputReader)
 
service.ma.flowsa.nfdump.ouputreader=org.perfsonar.service.measurementArchive.flowsa.nfdump.outputreaders.Nfdump1_5_5OutputReaderFactory
 
 # --- nfcapd properties ---
 # UPSUPPORTED nfcapd.start-processes - if nfcapd should start processes for 
exporters; specify false if this is done externally
 # service.ma.flowsa.nfcapd.interval - interval between nfcapd writing a new 
file.
 # nfcapd.user - as which user should nfcapd run (leave empty if happy with 
id of nfcapd.rc starter)
-service.ma.flowsa.nfcapd.start-processes=false
+# service.ma.flowsa.nfcapd.start-processes=false
+
+# Group=Nfcapd properties
+# Description=interval between nfcapd writing a new file.
 service.ma.flowsa.nfcapd.interval=5
+
+# Group=Nfcapd properties
+# Description=interval between nfcapd writing a new file.
 service.ma.flowsa.nfcapd.location=/usr/bin/nfcapd
+
+# Group=Nfcapd properties
+# Description=/var/run/
 service.ma.flowsa.nfcapd.run=/var/run/surfnet_java-flowsa-ma
+
+# Group=Nfcapd properties
+# Description=as which user should nfcapd run (leave empty if happy with id 
of nfcapd.rc starter)
 service.ma.flowsa.nfcapd.user=perfsonar
+
+# Group=Nfcapd properties
+# Description=As which group should nfcapd run
 service.ma.flowsa.nfcapd.group=perfsonar
 
 # === Logger properties === 
+
+# Group=Other properties
+# Description=logging configuration file
 service.log.log4j.config=/perfsonar/conf/log4j.properties
 
 # === nmwg === 
+ 
+# Group=Other properties
+# Description=nmwg configuration file
 service.sax_parser.config=/perfsonar/conf/objects.config
 
-#=== LS registrator ===
+
+# Group=LS registration properties
+# Description=Component name
 component.registrator.scheduler_component=ma_scheduler
+# Group=LS registration properties
+# Description=Interval
 component.registrator.interval=30000
+# Group=LS registration properties
+# Description=From where should the service content be retrieved.
 service.ls.service_content_type=context
 
 #=== Authentication ===
+
+# Group=Authentication properties
+# Description=Whether authentication is activated 
 service.as.authn_active=off
+
+# Group=Authentication properties
+# Description=Which message types require authentication 
 service.as.authn_for_msg_types=SetupDataRequest
+
+# Group=Authentication properties
+# Description=AS address
 
service.as.point=http://homer.rediris.es:8080/perfSONAR-AS/services/AuthService
-

Added: 
trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/NamedthreadFactory.java

Modified: 
trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/NfdumpControll.java
===================================================================
--- 
trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/NfdumpControll.java
       2008-05-26 15:12:48 UTC (rev 3875)
+++ 
trunk/surfnet_java-flowsa-ma/src/main/java/org/perfsonar/service/measurementArchive/flowsa/nfdump/NfdumpControll.java
       2008-05-26 16:49:57 UTC (rev 3876)
@@ -1,6 +1,5 @@
 package org.perfsonar.service.measurementArchive.flowsa.nfdump;
 
-import static java.lang.Thread.MIN_PRIORITY;
 import static java.util.concurrent.TimeUnit.SECONDS;
 
 import java.io.File;
@@ -16,7 +15,6 @@
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
-import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Logger;
 
@@ -87,7 +85,7 @@
     
     private final NfdumpOutputReaderFactory readerFactory;
     private final File nfdumpExecutable;
-    private final ExecutorService executorService = 
Executors.newCachedThreadPool(new MyThreadFactory());
+    private final ExecutorService executorService = 
Executors.newCachedThreadPool(new 
NamedthreadFactory("Nfdump-workers","worker-"));
     private final int maxResults;
     private final long timeoutValue;
     private final String anonymiseKey;
@@ -435,26 +433,5 @@
         }
         return command;
     }
-    /**
-     * Mostly unimportant class, it simply ensures that the thread priority 
is not 
-     * higher than the thread that initiated. It also sets names so that 
when 
-     * profiling/debugging threads are recognizable.
-     * @author Michael Bischoff
-     */
-    private static final class MyThreadFactory implements ThreadFactory {
-        private final ThreadGroup threadGroup;
-        private volatile int i = 0;
         
-        protected MyThreadFactory() {
-            this.threadGroup = new ThreadGroup("nfdump-workers");
-            int currentThreadPrioriy = Thread.currentThread().getPriority();
-            this.threadGroup.setMaxPriority(currentThreadPrioriy == 
MIN_PRIORITY ? MIN_PRIORITY : currentThreadPrioriy -1);
-        }
-    
-        public synchronized Thread newThread(Runnable target) {
-               i++;
-            return new Thread(threadGroup, target, "nfdump-worker-thread 
"+i);
-        }
-    }
-    
 }
\ No newline at end of file