[Wisp] ResourceContainerMXBean

Summary: Add ResourceContainerMXBean, currently only
support CPU resource amount.

Test Plan: jtreg test/com/alibaba/

Reviewed-by: yuleil, zhengxiaolinX

Issue: dragonwell-project/dragonwell8#206

src/linux/classes/com/alibaba/wisp/engine/WispControlGroup.java

@@ -85,6 +85,10 @@ private WispControlGroup(int cfsQuotaUs, int cfsPeriodUs) {
  private final AtomicLong currentPeriodStart;
  private final AtomicLong remainQuota;
  volatile Boolean destroyed = false;
+ /**
+ * totalConsume provides a rough calculation for total cpu time consumed in this group
+ */
+ private long totalConsume = 0;
  CountDownLatch destroyLatch = new CountDownLatch(1);
 
  private static class CpuLimit {
@@ -142,6 +146,7 @@ long calcCpuTicks(WispTask task) {
  long usage = System.nanoTime() - task.enterTs;
  remainQuota.addAndGet(-usage);
  task.enterTs = 0;
+ totalConsume += usage;
  return usage;
  }
 
@@ -276,6 +281,13 @@ public void destroy() {
  }
  }
 
+ @Override
+ public Long getConsumedAmount(ResourceType resourceType) {
+ if (resourceType != ResourceType.CPU_PERCENT)
+ return 0L;
+ return totalConsume;
+ }
+
  @Override
  protected void attach() {
  super.attach();

src/share/classes/com/alibaba/management/ResourceContainerMXBean.java

@@ -0,0 +1,31 @@
+package com.alibaba.management;
+
+import java.lang.management.PlatformManagedObject;
+import java.util.List;
+
+
+/**
+ * Platform-specific management interface for the resource container
+ * of the Java virtual machine.
+ */
+public interface ResourceContainerMXBean extends PlatformManagedObject {
+ /**
+ * Get all running containers uniq id as List
+ * @return all active containers' id
+ */
+ List<Long> getAllContainerIds();
+
+ /**
+ * Get a specific container's constraints by id
+ * @param id container id
+ * @return constraints as list
+ */
+ List<Long> getConstraintsById(long id);
+
+ /**
+ * Get the total cpu time consumed by id specified container
+ * @param id container id
+ * @return consumed cpu time by nanosecond
+ */
+ long getCPUResourceConsumedAmount(long id);
+}

src/share/classes/com/alibaba/rcm/ResourceContainer.java

@@ -207,4 +207,8 @@ static ResourceContainer current() {
  * Then the container state will become {@link State#DEAD}.
  */
  void destroy();
+
+ Long getId();
+
+ Long getConsumedAmount(ResourceType resourceType);
 }

src/share/classes/com/alibaba/rcm/ResourceContainerMXBeanImpl.java

@@ -0,0 +1,34 @@
+package com.alibaba.rcm;
+
+import com.alibaba.management.ResourceContainerMXBean;
+import sun.management.Util;
+
+import javax.management.ObjectName;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class ResourceContainerMXBeanImpl implements ResourceContainerMXBean {
+ private final static String TENANT_CONTAINER_MXBEAN_NAME = "com.alibaba.management:type=ResourceContainer";
+
+ @Override
+ public List<Long> getAllContainerIds() {
+ return ResourceContainerMonitor.getAllContainerIds();
+ }
+
+ @Override
+ public List<Long> getConstraintsById(long id) {
+ return ResourceContainerMonitor.getConstraintsById(id).stream().map(c -> c.getValues()[0]).collect(Collectors.toList());
+ }
+
+
+ @Override
+ public long getCPUResourceConsumedAmount(long id) {
+ ResourceContainer container = ResourceContainerMonitor.getContainerById(id);
+ return container.getConsumedAmount(ResourceType.CPU_PERCENT);
+ }
+
+ @Override
+ public ObjectName getObjectName() {
+ return Util.newObjectName(TENANT_CONTAINER_MXBEAN_NAME);
+ }
+}

src/share/classes/com/alibaba/rcm/ResourceContainerMonitor.java

@@ -0,0 +1,38 @@
+package com.alibaba.rcm;
+
+import com.alibaba.rcm.internal.AbstractResourceContainer;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.StreamSupport;
+
+public class ResourceContainerMonitor {
+ private static Map<Long, ResourceContainer> resourceContainerMap = new HashMap<>();
+ private static long idGen = 0;
+
+ public synchronized static long register(ResourceContainer resourceContainer) {
+ long id = idGen++;
+ resourceContainerMap.put(id, resourceContainer);
+ return id;
+ }
+
+ public synchronized static ResourceContainer getContainerById(long id) {
+ return resourceContainerMap.get(id);
+ }
+
+ public synchronized static List<Long> getAllContainerIds() {
+ return new ArrayList<>(resourceContainerMap.keySet());
+ }
+
+ public synchronized static List<Constraint> getConstraintsById(long id) {
+ AbstractResourceContainer resourceContainer = (AbstractResourceContainer) resourceContainerMap.get(id);
+ if (resourceContainer == null)
+ throw new IllegalArgumentException("Invalid ResourceContainer id : " + id);
+ return StreamSupport
+ .stream(resourceContainer.getConstraints().spliterator(), false)
+ .collect(Collectors.toList());
+ }
+}

src/share/classes/com/alibaba/rcm/internal/AbstractResourceContainer.java

@@ -24,7 +24,10 @@
 
 import com.alibaba.rcm.Constraint;
 import com.alibaba.rcm.ResourceContainer;
+import com.alibaba.rcm.ResourceContainerMonitor;
+import com.alibaba.rcm.ResourceType;
 import sun.misc.SharedSecrets;
+import sun.misc.VM;
 
 import java.util.Collections;
 
@@ -40,14 +43,21 @@
 public abstract class AbstractResourceContainer implements ResourceContainer {
 
  protected final static AbstractResourceContainer ROOT = new RootContainer();
+ final long id;
+
+ protected AbstractResourceContainer() {
+ id = ResourceContainerMonitor.register(this);
+ }
 
  public static AbstractResourceContainer root() {
  return ROOT;
  }
 
  public static AbstractResourceContainer current() {
- if (!sun.misc.VM.isBooted()) {
- return root();
+ if (!VM.isBooted()) {
+ // JLA will be available only after full VM bootstrap.
+ // before that stage, we assume VM is running in ROOT container.
+ return ROOT;
  }
  return SharedSecrets.getJavaLangAccess().getResourceContainer(Thread.currentThread());
  }
@@ -60,17 +70,17 @@ public void run(Runnable command) {
  ResourceContainer container = current();
  if (container == this) {
  command.run();
-  return;
- }
- if (container != root()) {
- throw new IllegalStateException("must be in root container " +
-  "before running into non-root container.");
- }
- attach();
- try {
- command.run();
- } finally {
- detach();
+ } else {
+  if (container != ROOT) {
+  throw new IllegalStateException("must be in root container " +
+  "before running into non-root container.");
+ }
+  attach();
+  try {
+  command.run();
+ } finally {
+  detach();
+ }
  }
  }
 
@@ -86,6 +96,11 @@ protected void attach() {
  SharedSecrets.getJavaLangAccess().setResourceContainer(Thread.currentThread(), this);
  }
 
+ @Override
+ public Long getId() {
+ return id;
+ }
+
  /**
  * Detach from this resource container and return to root container.
  * <p>
@@ -100,7 +115,7 @@ private static class RootContainer extends AbstractResourceContainer {
  @Override
  public void run(Runnable command) {
  AbstractResourceContainer container = current();
- if (container == root()) {
+ if (container == ROOT) {
  command.run();
  return;
  }
@@ -141,5 +156,15 @@ public Iterable<Constraint> getConstraints() {
  public void destroy() {
  throw new UnsupportedOperationException("destroy() is not supported by root container");
  }
+
+ @Override
+ public Long getId() {
+ return id;
+ }
+
+ @Override
+ public Long getConsumedAmount(ResourceType resourceType) {
+ return 0L;
+ }
  }
 }

src/share/classes/com/alibaba/tenant/TenantResourceContainer.java

@@ -148,6 +148,11 @@ public void destroy() {
  throw new UnsupportedOperationException("Should not call TenantResourceContainer::destroy() directly");
  }
 
+ @Override
+ public Long getConsumedAmount(ResourceType resourceType) {
+ throw new UnsupportedOperationException();
+ }
+
  void destroyImpl() {
  if (jgroup != null) {
  jgroup.destory();

src/share/classes/java/lang/management/PlatformComponent.java

@@ -35,9 +35,7 @@
 import javax.management.MBeanServerConnection;
 import javax.management.ObjectName;
 
-import com.alibaba.management.TenantContainerMXBean;
-import com.alibaba.management.ElasticHeapMXBean;
-import com.alibaba.management.WispCounterMXBean;
+import com.alibaba.management.*;
 import com.sun.management.HotSpotDiagnosticMXBean;
 import com.sun.management.UnixOperatingSystemMXBean;
 
@@ -307,6 +305,20 @@ public List<ElasticHeapMXBean> getMXBeans() {
  }),
 
  /**
+ * Resource Container.
+ */
+ RESOURCE_CONTAINER(
+ "com.alibaba.management.ResourceContainerMXBean",
+ "com.alibaba.management", "ResourceContainerMXBean", defaultKeyProperties(),
+ true,
+ new MXBeanFetcher<ResourceContainerMXBean>() {
+ public List<ResourceContainerMXBean> getMXBeans() {
+ return Collections.singletonList(ManagementFactoryHelper.getResourceContainerMXBean());
+ }
+ }),
+
+
+ /**
  * Wisp Counter.
  */
  WISP_COUNTER(

src/share/classes/sun/management/ManagementFactoryHelper.java

@@ -39,9 +39,8 @@
 import java.security.PrivilegedActionException;
 import java.security.PrivilegedExceptionAction;
 
-import com.alibaba.management.TenantContainerMXBean;
-import com.alibaba.management.ElasticHeapMXBean;
-import com.alibaba.management.WispCounterMXBean;
+import com.alibaba.management.*;
+import com.alibaba.rcm.ResourceContainerMXBeanImpl;
 import com.alibaba.tenant.TenantContainerMXBeanImpl;
 import com.alibaba.jvm.gc.ElasticHeapMXBeanImpl;
 import com.alibaba.wisp.engine.WispCounterMXBeanImpl;
@@ -74,6 +73,7 @@ public class ManagementFactoryHelper {
  private static TenantContainerMXBeanImpl tenantContainerMBean = null;
  private static ElasticHeapMXBeanImpl elasticHeapMXBean = null;
  private static WispCounterMXBeanImpl wispCounterMBean = null;
+ private static ResourceContainerMXBean resourceContainerMXBean = null;
 
  public static synchronized ClassLoadingMXBean getClassLoadingMXBean() {
  if (classMBean == null) {
@@ -137,6 +137,12 @@ public static synchronized WispCounterMXBean getWispCounterMXBean() {
  }
  return wispCounterMBean;
  }
+ public static synchronized ResourceContainerMXBean getResourceContainerMXBean() {
+ if (resourceContainerMXBean == null) {
+ resourceContainerMXBean = new ResourceContainerMXBeanImpl();
+ }
+ return resourceContainerMXBean;
+ }
 
  public static List<MemoryPoolMXBean> getMemoryPoolMXBeans() {
  MemoryPoolMXBean[] pools = MemoryImpl.getMemoryPools();