Stylistic changes after async-profiler#1628

Author: apangin

Makefile

@@ -69,8 +69,8 @@ SOURCES := $(sort $(wildcard src/*.cpp))
 HEADERS := $(wildcard src/*.h)
 RESOURCES := $(wildcard src/res/*)
 JAVA_HELPER_CLASSES := $(wildcard src/helper/one/profiler/*.class)
-API_SOURCE_PATH := src/api/one/profiler
-API_SOURCES := $(wildcard $(API_SOURCE_PATH)/*.java)
+API_SOURCES := $(wildcard src/api/one/profiler/*.java)
+JAR_MANIFEST := src/api/one/profiler/MANIFEST.MF
 CONVERTER_SOURCES := $(shell find src/converter -name '*.java')
 TEST_SOURCES := $(shell find test -name '*.java' ! -path 'test/stubs/*')
 TESTS ?=
@@ -197,10 +197,10 @@ build/$(ASPROF_HEADER): src/asprof.h
 	mkdir -p build/include
 	cp -f $< build/include
 
-build/$(API_JAR): $(API_SOURCES)
+build/$(API_JAR): $(API_SOURCES) $(JAR_MANIFEST)
 	mkdir -p build/api
 	$(JAVAC) $(JAVAC_OPTIONS) -d build/api $(API_SOURCES)
-	$(JAR) cfm $@ $(API_SOURCE_PATH)/MANIFEST.MF -C build/api .
+	$(JAR) cfm $@ $(JAR_MANIFEST) -C build/api .
 	$(RM) -r build/api
 
 build/$(CONVERTER_JAR): $(CONVERTER_SOURCES) $(RESOURCES)

src/api/one/profiler/Agent.java

@@ -5,9 +5,8 @@
 
 package one.profiler;
 
-import java.lang.management.ManagementFactory;
-
 import javax.management.ObjectName;
+import java.lang.management.ManagementFactory;
 
 public class Agent {
 
@@ -16,13 +15,12 @@ public static void premain(String args) throws Exception {
     }
 
     public static void agentmain(String args) throws Exception {
-        AsyncProfiler instance = AsyncProfiler.getInstance();
+        AsyncProfiler profiler = AsyncProfiler.getInstance();
         ManagementFactory.getPlatformMBeanServer().registerMBean(
-                instance,
+                profiler,
                 new ObjectName(AsyncProfilerMXBean.OBJECT_NAME));
         if (args != null && !args.isEmpty()) {
-            instance.execute(args);
+            profiler.execute(args);
         }
     }
-
 }

src/api/one/profiler/AsyncProfilerMXBean.java

@@ -17,7 +17,7 @@
  * }</pre>
  */
 public interface AsyncProfilerMXBean {
-    public static final String OBJECT_NAME = "one.profiler:type=AsyncProfiler";
+    String OBJECT_NAME = "one.profiler:type=AsyncProfiler";
 
     void start(String event, long interval) throws IllegalStateException;
     void resume(String event, long interval) throws IllegalStateException;

test/test/api/ApiTests.java

@@ -42,12 +42,12 @@ public void metrics(TestProcess p) throws Exception {
     @Test(
         mainClass = JavaAgent.class,
         output = true,
-        jvmArgs = "-javaagent:build/jar/async-profiler.jar=start,event=cpu,interval=1000000,file=%f.collapsed"
+        jvmArgs = "-javaagent:build/jar/async-profiler.jar=start,event=cpu,interval=1ms,file=%f.collapsed"
     )
     public void javaAgent(TestProcess p) throws Exception {
         Output out = p.waitForExit(TestProcess.STDOUT);
         assert p.exitCode() == 0;
-        assert out.contains("async-profiler version:");
+        assert out.contains("async-profiler version: \\d+");
         Output profile = p.readFile("%f");
         assert profile.contains("BusyLoops.method1;");
         assert profile.contains("BusyLoops.method2;");

test/test/api/JavaAgent.java

@@ -5,30 +5,25 @@
 
 package test.api;
 
-import java.lang.management.ManagementFactory;
+import one.profiler.Counter;
 
-import javax.management.AttributeNotFoundException;
-import javax.management.InstanceNotFoundException;
-import javax.management.MBeanException;
-import javax.management.MalformedObjectNameException;
 import javax.management.MBeanServer;
 import javax.management.ObjectName;
-import javax.management.ReflectionException;
+import java.lang.management.ManagementFactory;
 
-import one.profiler.Counter;
+public class JavaAgent {
 
-public class JavaAgent extends BusyLoops {
     public static void main(String[] args) throws Exception {
         MBeanServer mbs = ManagementFactory.getPlatformMBeanServer();
         ObjectName obj = new ObjectName("one.profiler:type=AsyncProfiler");
 
         String version = (String) mbs.getAttribute(obj, "Version");
         System.out.println(String.format("async-profiler version: %s", version));
 
-        for (int i = 0; i < 5; i++) {
-            method1();
-            method2();
-            method3();
+        for (int i = 0; i < 3; i++) {
+            BusyLoops.method1();
+            BusyLoops.method2();
+            BusyLoops.method3();
         }
 
         String profile = (String) mbs.invoke(