Merge branch 'sigar-1.6'

bindings/java/src/org/hyperic/sigar/Humidor.java

@@ -0,0 +1,87 @@
+/*
+ * Copyright (C) [2004-2009], Hyperic, Inc.
+ * This file is part of SIGAR.
+ * 
+ * SIGAR is free software; you can redistribute it and/or modify
+ * it under the terms version 2 of the GNU General Public License as
+ * published by the Free Software Foundation. This program is distributed
+ * in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA.
+ */
+
+package org.hyperic.sigar;
+
+import java.lang.reflect.InvocationHandler;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.Proxy;
+
+/**
+ * The Humidor provides access to a single Sigar instance.  Sigar has a
+ * high-cost setup/teardown and has a high amount of caching, used to determine
+ * things like the % of CPU used in-between calls.
+ *
+ * The Humidor also synchronizes access to all Sigar methods, so all
+ * calls will be serialized.
+ */
+public class Humidor {
+    private static final Humidor INSTANCE = new Humidor();
+    private Object LOCK = new Object();
+    private InvocationHandler _handler;
+    private SigarProxy _sigar;
+    private Sigar _impl;
+
+    private Humidor() {}
+
+    public Humidor(Sigar sigar) {
+        _impl = sigar;
+    }
+
+    private static class MyHandler implements InvocationHandler {
+        private SigarProxy _sigar;
+        private Object _lock = new Object();
+
+        public MyHandler(SigarProxy sigar) {
+            _sigar = sigar;
+        }
+
+        public Object invoke(Object proxy, Method meth, Object[] args)
+            throws Throwable
+        {
+            try {
+                synchronized (_lock) {
+                    return meth.invoke(_sigar, args);
+                }
+            } catch(InvocationTargetException e) {
+                throw e.getTargetException();
+            }
+        }
+    }
+
+    public SigarProxy getSigar() {
+        synchronized(LOCK) {
+            if (_sigar == null) {
+                if (_impl == null) {
+                    _impl = new Sigar();
+                }
+                _handler = new MyHandler(_impl);
+                _sigar = (SigarProxy)
+                    Proxy.newProxyInstance(Humidor.class.getClassLoader(),
+                                           new Class[] { SigarProxy.class },
+                                           _handler);
+            }
+            return _sigar;
+        }
+    }
+
+    public static Humidor getInstance() {
+        return INSTANCE;
+    }
+}

bindings/java/src/org/hyperic/sigar/test/SigarTestRunner.java

@@ -80,6 +80,7 @@ public class SigarTestRunner extends SigarCommandBase {
         TestUptime.class,
         TestVMware.class,
         TestWho.class,
+        TestHumidor.class
     };
 
     private static final Class[] WIN32_TESTS = {

bindings/java/src/org/hyperic/sigar/test/TestHumidor.java

@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) [2004-2009], Hyperic, Inc.
+ * This file is part of SIGAR.
+ * 
+ * SIGAR is free software; you can redistribute it and/or modify
+ * it under the terms version 2 of the GNU General Public License as
+ * published by the Free Software Foundation. This program is distributed
+ * in the hope that it will be useful, but WITHOUT ANY WARRANTY; without
+ * even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU General Public License for more
+ * details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ * USA.
+ */
+
+package org.hyperic.sigar.test;
+
+import java.util.ArrayList;
+
+import org.hyperic.sigar.CpuPerc;
+import org.hyperic.sigar.Humidor;
+import org.hyperic.sigar.Sigar;
+import org.hyperic.sigar.SigarException;
+import org.hyperic.sigar.SigarProxy;
+
+public class TestHumidor extends SigarTestCase {
+
+    public TestHumidor(String name) {
+        super(name);
+    }
+
+    private static class HumidorThread extends Thread {
+        private SigarProxy sigar;
+        private HumidorThread(SigarProxy sigar) {
+            this.sigar = sigar;
+        }
+
+        public void run() {
+            try {
+                getProcCpu(this.sigar);
+            } catch (Exception e) {
+                throw new IllegalArgumentException(e.getMessage());
+            }
+        }
+    }
+
+    private static void getProcCpu(SigarProxy sigar) throws Exception {
+        long[] pids = sigar.getProcList();
+        for (int j=0; j<10; j++) {
+            for (int i=0; i<pids.length; i++) {
+                try {
+                    double cpu = sigar.getProcCpu(pids[i]).getPercent();
+                    if (SigarTestCase.getVerbose()) {
+                        System.out.println(Thread.currentThread().getName() + 
+                                           " " + pids[i] + "=" + CpuPerc.format(cpu));
+                    }
+                } catch (SigarException e) {
+                    //ok - process may have gone away or permission denied.
+                }
+            }
+        }
+    }
+
+    private void runTests(SigarProxy sigar) throws Exception {
+        ArrayList threads = new ArrayList();
+        for (int i=0; i<3; i++) {
+            Thread t = new HumidorThread(sigar);
+            threads.add(t);
+            t.start();
+        }
+        for (int i=0; i<threads.size(); i++) {
+            Thread t = (Thread)threads.get(i);
+            t.join();
+        }
+    }
+
+    public void testGlobalInstance() throws Exception {
+        runTests(Humidor.getInstance().getSigar());
+    }
+
+    public void testInstance() throws Exception {
+        Sigar sigar = new Sigar();
+        runTests(new Humidor(sigar).getSigar());
+        sigar.close();
+    }
+
+    //uncomment to see if this test will indeed cause a segfault
+    //without the protection of the Humidor
+    //public void testUnwrapped() throws Exception {
+    //    runTests(new Sigar());
+    //}
+}