Skip to content

Commit 8b23dfa

Browse files
committed
Rename pointers to javacpp MXBean object name, move check for system property org.bytedeco.javacpp.mxbean in Pointer
1 parent 7c5adc5 commit 8b23dfa

File tree

3 files changed

+14
-14
lines changed

3 files changed

+14
-14
lines changed

src/main/java/org/bytedeco/javacpp/Pointer.java

+6-1
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
import java.util.concurrent.atomic.AtomicInteger;
3535
import java.util.concurrent.atomic.AtomicLong;
3636
import org.bytedeco.javacpp.annotation.Name;
37-
import org.bytedeco.javacpp.annotation.Platform;
3837
import org.bytedeco.javacpp.tools.Generator;
38+
import org.bytedeco.javacpp.tools.PointerBufferPoolMXBean;
3939
import org.bytedeco.javacpp.tools.Logger;
4040

4141
/**
@@ -510,6 +510,11 @@ public static long parseBytes(String string, long relativeMultiple) throws Numbe
510510
} catch (Throwable t) {
511511
logger.warn("Could not load Pointer: " + t);
512512
}
513+
514+
String mx = System.getProperty("org.bytedeco.javacpp.mxbean", "false").toLowerCase();
515+
if (mx.equals("true") || mx.equals("t") || mx.equals("")) {
516+
PointerBufferPoolMXBean.register();
517+
}
513518
}
514519

515520
/** Clears, deallocates, and removes all garbage collected objects from the {@link #referenceQueue}. */

src/main/java/org/bytedeco/javacpp/tools/Logger.java

-5
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,6 @@ public static Logger create(Class cls) {
4343
static {
4444
String s = System.getProperty("org.bytedeco.javacpp.logger.debug", "false").toLowerCase();
4545
debug = s.equals("true") || s.equals("t") || s.equals("");
46-
47-
String mx = System.getProperty("org.bytedeco.javacpp.mxbean", "false").toLowerCase();
48-
if (mx.equals("true") || mx.equals("t") || mx.equals("")) {
49-
PointersBufferPoolMXBean.register();
50-
}
5146
}
5247

5348
/** Returns the "org.bytedeco.javacpp.logger.debug" system property. */

src/main/java/org/bytedeco/javacpp/tools/PointersBufferPoolMXBean.java src/main/java/org/bytedeco/javacpp/tools/PointerBufferPoolMXBean.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -6,25 +6,25 @@
66
import java.lang.management.BufferPoolMXBean;
77
import java.lang.management.ManagementFactory;
88

9-
public class PointersBufferPoolMXBean implements BufferPoolMXBean {
9+
public class PointerBufferPoolMXBean implements BufferPoolMXBean {
1010

11-
private static final Logger LOGGER = Logger.create(PointersBufferPoolMXBean.class);
12-
private static final String POINTERS_MXBEAN_NAME = "pointers";
11+
private static final Logger LOGGER = Logger.create(PointerBufferPoolMXBean.class);
12+
private static final String JAVACPP_MXBEAN_NAME = "javacpp";
1313
private static final ObjectName OBJECT_NAME;
1414

1515
static {
1616
ObjectName objectName = null;
1717
try {
18-
objectName = new ObjectName("java.nio:type=BufferPool,name=" + POINTERS_MXBEAN_NAME);
18+
objectName = new ObjectName("java.nio:type=BufferPool,name=" + JAVACPP_MXBEAN_NAME);
1919
} catch (MalformedObjectNameException e) {
20-
LOGGER.warn("Could not create OBJECT_NAME for " + POINTERS_MXBEAN_NAME);
20+
LOGGER.warn("Could not create OBJECT_NAME for " + JAVACPP_MXBEAN_NAME);
2121
}
2222
OBJECT_NAME = objectName;
2323
}
2424

2525
@Override
2626
public String getName() {
27-
return POINTERS_MXBEAN_NAME;
27+
return JAVACPP_MXBEAN_NAME;
2828
}
2929

3030
@Override
@@ -50,9 +50,9 @@ public long getMemoryUsed() {
5050
public static void register() {
5151
if (OBJECT_NAME != null) {
5252
try {
53-
ManagementFactory.getPlatformMBeanServer().registerMBean(new PointersBufferPoolMXBean(), OBJECT_NAME);
53+
ManagementFactory.getPlatformMBeanServer().registerMBean(new PointerBufferPoolMXBean(), OBJECT_NAME);
5454
} catch (InstanceAlreadyExistsException | MBeanRegistrationException | NotCompliantMBeanException e) {
55-
LOGGER.warn("Could not register " + POINTERS_MXBEAN_NAME + " BufferPoolMXBean");
55+
LOGGER.warn("Could not register " + JAVACPP_MXBEAN_NAME + " BufferPoolMXBean");
5656
}
5757
}
5858
}

0 commit comments

Comments
 (0)