X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=bundles%2Forg.simantics.db.common%2Fsrc%2Forg%2Fsimantics%2Fdb%2Fcommon%2Fservice%2FServiceActivityMonitorImpl.java;h=1858e87ddea8af1249af7343f95cb1a2037548ae;hb=0ae2b770234dfc3cbb18bd38f324125cf0faca07;hp=1f6f69e12317ade1da034776f4f39fceb42d12b5;hpb=24e2b34260f219f0d1644ca7a138894980e25b14;p=simantics%2Fplatform.git diff --git a/bundles/org.simantics.db.common/src/org/simantics/db/common/service/ServiceActivityMonitorImpl.java b/bundles/org.simantics.db.common/src/org/simantics/db/common/service/ServiceActivityMonitorImpl.java index 1f6f69e12..1858e87dd 100644 --- a/bundles/org.simantics.db.common/src/org/simantics/db/common/service/ServiceActivityMonitorImpl.java +++ b/bundles/org.simantics.db.common/src/org/simantics/db/common/service/ServiceActivityMonitorImpl.java @@ -1,64 +1,64 @@ -package org.simantics.db.common.service; - -import java.util.concurrent.Semaphore; -import java.util.concurrent.TimeUnit; -import java.util.concurrent.atomic.AtomicInteger; - -import org.simantics.db.service.ServiceActivityMonitor; - -import gnu.trove.map.TObjectIntMap; -import gnu.trove.map.hash.TObjectIntHashMap; - -public class ServiceActivityMonitorImpl implements ServiceActivityMonitor { - - public static final long REPORTING_PERIOD = 5L; - - Semaphore sem = new Semaphore(1); - AtomicInteger ref = new AtomicInteger(); - TObjectIntMap ids = new TObjectIntHashMap<>(); - - @Override - public void registerActivity(Object id) { - if (ref.getAndIncrement() == 0) - sem.acquireUninterruptibly(1); - synchronized (ids) { - ids.adjustOrPutValue(id, 1, 1); - } - } - - @Override - public void unregisterActivity(Object id) { - synchronized (ids) { - int refs = ids.get(id); - if (refs == 1) { - ids.remove(id); - } else { - ids.put(id, refs-1); - } - } - if (ref.decrementAndGet() == 0) - sem.release(); - } - - @Override - public void waitForCompletion() throws InterruptedException { - while(true) { - if(waitForCompletion(REPORTING_PERIOD, TimeUnit.SECONDS)) - return; - synchronized (ids) { - System.err.println("ServiceActivityMonitorImpl.waitForCompletion: " + ids); - } - } - } - - @Override - public boolean waitForCompletion(long timeout, TimeUnit unit) throws InterruptedException { - if(sem.tryAcquire(timeout, unit)) { - sem.release(); - return true; - } - else - return false; - } - +package org.simantics.db.common.service; + +import java.util.concurrent.Semaphore; +import java.util.concurrent.TimeUnit; +import java.util.concurrent.atomic.AtomicInteger; + +import org.simantics.db.service.ServiceActivityMonitor; + +import gnu.trove.map.TObjectIntMap; +import gnu.trove.map.hash.TObjectIntHashMap; + +public class ServiceActivityMonitorImpl implements ServiceActivityMonitor { + + public static final long REPORTING_PERIOD = 5L; + + Semaphore sem = new Semaphore(1); + AtomicInteger ref = new AtomicInteger(); + TObjectIntMap ids = new TObjectIntHashMap<>(); + + @Override + public void registerActivity(Object id) { + if (ref.getAndIncrement() == 0) + sem.acquireUninterruptibly(1); + synchronized (ids) { + ids.adjustOrPutValue(id, 1, 1); + } + } + + @Override + public void unregisterActivity(Object id) { + synchronized (ids) { + int refs = ids.get(id); + if (refs == 1) { + ids.remove(id); + } else { + ids.put(id, refs-1); + } + } + if (ref.decrementAndGet() == 0) + sem.release(); + } + + @Override + public void waitForCompletion() throws InterruptedException { + while(true) { + if(waitForCompletion(REPORTING_PERIOD, TimeUnit.SECONDS)) + return; + synchronized (ids) { + System.err.println("ServiceActivityMonitorImpl.waitForCompletion: " + ids); + } + } + } + + @Override + public boolean waitForCompletion(long timeout, TimeUnit unit) throws InterruptedException { + if(sem.tryAcquire(timeout, unit)) { + sem.release(); + return true; + } + else + return false; + } + } \ No newline at end of file