Update from upstream (take 2)

.gitignore

@@ -7,3 +7,4 @@ cmake-build-debug/
 /test/*.class
 .vscode
 *.iml
+/src/api/**/*.class

.licenserc.yaml

@@ -0,0 +1,22 @@
+header:
+  - paths:
+      - 'src/jattach'
+    license:
+      content: |
+        Copyright The jattach authors
+        SPDX-License-Identifier: Apache-2.0
+
+    comment: on-failure
+
+  - paths:
+      - 'src'
+      - 'test'
+    paths-ignore:
+      - 'src/jattach'
+      - 'src/res'
+    license:
+      content: |
+        Copyright The async-profiler authors
+        SPDX-License-Identifier: Apache-2.0
+
+    comment: on-failure

Dockerfile

@@ -1,19 +1,41 @@
-FROM centos:7 as glibc
-RUN yum -y update && yum -y install make git gcc-c++ java-11-openjdk-devel glibc-static
-ADD ./src /asprof/src
-ADD ./Makefile ./LICENSE ./*.md ./JavaHome.class /asprof/
-WORKDIR /asprof
-RUN make release
+# Image for building async-profiler release packages
+
+# Stage 0: download and build musl
+FROM public.ecr.aws/debian/debian:10-slim
+
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    sudo libicu-dev patchelf curl make g++ openjdk-11-jdk-headless gcovr && \
+    rm -rf /var/cache/apt /var/lib/apt/lists/*
 
+ARG musl_src=musl-1.2.5
+ARG musl_sha256=a9a118bbe84d8764da0ea0d28b3ab3fae8477fc7e4085d90102b8596fc7c75e4
 
-FROM alpine:3.13 as musl
-RUN apk add gcc g++ make openjdk11 linux-headers
+ADD https://musl.libc.org/releases/${musl_src}.tar.gz /
+RUN echo ${musl_sha256} ${musl_src}.tar.gz | sha256sum -c
+
+RUN ["/bin/bash", "-c", "\
+    tar xfz ${musl_src}.tar.gz && \
+    cd /${musl_src} && \
+    ./configure --disable-shared --prefix=/usr/local/musl && \
+    make -j`nproc` && make install && make clean && \
+    ln -s /usr/include/$(arch)-linux-gnu/asm /usr/include/{asm-generic,linux} /usr/local/musl/include/"]
+
+# Stage 1: install build tools + copy musl toolchain from the previous step
+FROM public.ecr.aws/debian/debian:10-slim
+
+# The following command should be exactly the same as at stage 0 to benefit from caching.
+# libicu-dev is needed for the github actions runner
+RUN apt-get update && apt-get install -y --no-install-recommends \
+    sudo libicu-dev patchelf curl make g++ openjdk-11-jdk-headless gcovr && \
+    rm -rf /var/cache/apt /var/lib/apt/lists/*
+
+COPY --from=0 /usr/local/musl /usr/local/musl
+
+RUN mkdir -p /asprof
 ADD ./src /asprof/src
 ADD ./Makefile ./LICENSE ./*.md ./JavaHome.class /asprof/
 WORKDIR /asprof
 RUN make release
 
-
 FROM scratch
-COPY --from=glibc /asprof/*.tar.gz /
-COPY --from=musl /asprof/*.tar.gz /
+COPY --from=1 /asprof/*.tar.gz /

Makefile

@@ -1,30 +1,58 @@
-PROFILER_VERSION=3.0.0.0
+PROFILER_VERSION ?= 3.0.0.1
+
+ifeq ($(COMMIT_TAG),true)
+  PROFILER_VERSION := $(PROFILER_VERSION)-$(shell git rev-parse --short=8 HEAD)
+else ifneq ($(COMMIT_TAG),)
+  PROFILER_VERSION := $(PROFILER_VERSION)-$(COMMIT_TAG)
+endif
 
 PACKAGE_NAME=async-profiler-$(PROFILER_VERSION)-$(OS_TAG)-$(ARCH_TAG)
 PACKAGE_DIR=/tmp/$(PACKAGE_NAME)
 
-LAUNCHER=bin/asprof
+ASPROF=bin/asprof
+JFRCONV=bin/jfrconv
 LIB_PROFILER=lib/libasyncProfiler.$(SOEXT)
-API_JAR=lib/async-profiler.jar
-CONVERTER_JAR=lib/converter.jar
-
-CFLAGS=-O3 -fno-exceptions
-CXXFLAGS=-O3 -fno-exceptions -fno-omit-frame-pointer -fvisibility=hidden
+API_JAR=jar/async-profiler.jar
+CONVERTER_JAR=jar/jfr-converter.jar
+TEST_JAR=test.jar
+
+CC ?= $(CROSS_COMPILE)gcc
+CXX ?= $(CROSS_COMPILE)g++
+STRIP=$(CROSS_COMPILE)strip
+
+CFLAGS_EXTRA ?=
+CXXFLAGS_EXTRA ?=
+CFLAGS=-O3 -fno-exceptions $(CFLAGS_EXTRA)
+CXXFLAGS=-O3 -fno-exceptions -fno-omit-frame-pointer -fvisibility=hidden -std=c++11 $(CXXFLAGS_EXTRA)
+CPPFLAGS=
+DEFS=-DPROFILER_VERSION=\"$(PROFILER_VERSION)\"
 INCLUDES=-I$(JAVA_HOME)/include -Isrc/helper
 LIBS=-ldl -lpthread
 MERGE=true
+GCOV ?= gcov
 
 JAVAC=$(JAVA_HOME)/bin/javac
 JAR=$(JAVA_HOME)/bin/jar
+JAVA=$(JAVA_HOME)/bin/java
 JAVA_TARGET=8
 JAVAC_OPTIONS=--release $(JAVA_TARGET) -Xlint:-options
 
+LOG_DIR=build/test/logs
+LOG_LEVEL=
+SKIP=
+TEST_FLAGS=-DlogDir=$(LOG_DIR) -DlogLevel=$(LOG_LEVEL) -Dskip=$(SKIP)
+
 SOURCES := $(wildcard src/*.cpp)
 HEADERS := $(wildcard src/*.h)
 RESOURCES := $(wildcard src/res/*)
 JAVA_HELPER_CLASSES := $(wildcard src/helper/one/profiler/*.class)
 API_SOURCES := $(wildcard src/api/one/profiler/*.java)
 CONVERTER_SOURCES := $(shell find src/converter -name '*.java')
+TEST_SOURCES := $(shell find test -name '*.java')
+TESTS ?= $(notdir $(patsubst %/,%,$(wildcard test/test/*/)))
+CPP_TEST_SOURCES := test/native/testRunner.cpp $(shell find test/native -name '*Test.cpp')
+CPP_TEST_HEADER := test/native/testRunner.hpp
+CPP_TEST_INCLUDES := -Isrc -Itest/native
 
 ifeq ($(JAVA_HOME),)
   export JAVA_HOME:=$(shell java -cp . JavaHome)
@@ -45,34 +73,27 @@ ifeq ($(OS),Darwin)
     MERGE=false
   endif
 else
-  CXXFLAGS += -Wl,-z,defs
+  CXXFLAGS += -U_FORTIFY_SOURCE -Wl,-z,defs -Wl,--exclude-libs,ALL -static-libstdc++ -static-libgcc -fdata-sections -ffunction-sections -Wl,--gc-sections
   ifeq ($(MERGE),true)
     CXXFLAGS += -fwhole-program
   endif
   LIBS += -lrt
   INCLUDES += -I$(JAVA_HOME)/include/linux
   SOEXT=so
   PACKAGE_EXT=tar.gz
-  ifeq ($(findstring musl,$(shell ldd /bin/ls)),musl)
-    OS_TAG=linux-musl
-    CXXFLAGS += -static-libgcc -static-libstdc++
-  else
-    OS_TAG=linux
-  endif
+  OS_TAG=linux
 endif
 
-ARCH:=$(shell uname -m)
-ifeq ($(ARCH),x86_64)
-  ARCH_TAG=x64
-else
-  ifeq ($(findstring arm,$(ARCH)),arm)
-    ifeq ($(findstring 64,$(ARCH)),64)
-      ARCH_TAG=arm64
-    else
-      ARCH_TAG=arm32
-    endif
-  else ifeq ($(findstring aarch64,$(ARCH)),aarch64)
+ifeq ($(ARCH_TAG),)
+  ARCH:=$(shell uname -m)
+  ifeq ($(ARCH),x86_64)
+    ARCH_TAG=x64
+  else ifeq ($(ARCH),aarch64)
     ARCH_TAG=arm64
+  else ifeq ($(ARCH),arm64)
+    ARCH_TAG=arm64
+  else ifeq ($(findstring arm,$(ARCH)),arm)
+    ARCH_TAG=arm32
   else ifeq ($(ARCH),ppc64le)
     ARCH_TAG=ppc64le
   else ifeq ($(ARCH),riscv64)
@@ -84,50 +105,62 @@ else
   endif
 endif
 
+STATIC_BINARY=$(findstring musl-gcc,$(CC))
+ifneq (,$(STATIC_BINARY))
+  CFLAGS += -static -fdata-sections -ffunction-sections -Wl,--gc-sections
+endif
+
 ifneq (,$(findstring $(ARCH_TAG),x86 x64 arm64))
   CXXFLAGS += -momit-leaf-frame-pointer
 endif
 
 
-.PHONY: all release test native clean
+.PHONY: all jar release build-test test native clean coverage clean-coverage build-test-java build-test-cpp test-cpp test-java
 
-all: build/bin build/lib build/$(LIB_PROFILER) build/$(LAUNCHER) build/$(API_JAR) build/$(CONVERTER_JAR)
+all: build/bin build/lib build/$(LIB_PROFILER) build/$(ASPROF) jar build/$(JFRCONV)
 
-release: JAVA_TARGET=7
+jar: build/jar build/$(API_JAR) build/$(CONVERTER_JAR)
 
 release: $(PACKAGE_NAME).$(PACKAGE_EXT)
 
 $(PACKAGE_NAME).tar.gz: $(PACKAGE_DIR)
+	patchelf --remove-needed ld-linux-x86-64.so.2 --remove-needed ld-linux-aarch64.so.1 $(PACKAGE_DIR)/$(LIB_PROFILER)
 	tar czf $@ -C $(PACKAGE_DIR)/.. $(PACKAGE_NAME)
 	rm -r $(PACKAGE_DIR)
 
 $(PACKAGE_NAME).zip: $(PACKAGE_DIR)
-	# codesign -s "Developer ID" -o runtime --timestamp -v $(PACKAGE_DIR)/build/$(JATTACH) $(PACKAGE_DIR)/build/$(LIB_PROFILER_SO)
+	truncate -cs -`stat -f "%z" build/$(CONVERTER_JAR)` $(PACKAGE_DIR)/$(JFRCONV)
+ifneq ($(GITHUB_ACTIONS), true)
+	# codesign -s "Developer ID" -o runtime --timestamp -v $(PACKAGE_DIR)/$(ASPROF) $(PACKAGE_DIR)/$(JFRCONV) $(PACKAGE_DIR)/$(LIB_PROFILER)
+endif
+	cat build/$(CONVERTER_JAR) >> $(PACKAGE_DIR)/$(JFRCONV)
 	ditto -c -k --keepParent $(PACKAGE_DIR) $@
 	rm -r $(PACKAGE_DIR)
 
-$(PACKAGE_DIR): build/bin build/lib \
-                build/$(LIB_PROFILER) build/$(LAUNCHER) \
-                build/$(API_JAR) build/$(CONVERTER_JAR) \
-                LICENSE *.md
+$(PACKAGE_DIR): all LICENSE README.md
 	mkdir -p $(PACKAGE_DIR)
-	cp -RP build/* LICENSE *.md $(PACKAGE_DIR)/
+	cp -RP build/bin build/lib build/jar LICENSE README.md $(PACKAGE_DIR)/
 	chmod -R 755 $(PACKAGE_DIR)
-	chmod 644 $(PACKAGE_DIR)/lib/* $(PACKAGE_DIR)/LICENSE $(PACKAGE_DIR)/*.md
+	chmod 644 $(PACKAGE_DIR)/lib/* $(PACKAGE_DIR)/LICENSE $(PACKAGE_DIR)/README.md
 
 build/%:
 	mkdir -p $@
 
-build/$(LAUNCHER): src/launcher/* src/jattach/* src/fdtransfer.h
-	$(CC) $(CPPFLAGS) $(CFLAGS) -DPROFILER_VERSION=\"$(PROFILER_VERSION)\" -o $@ src/launcher/*.cpp src/jattach/*.c
-	strip $@
+build/$(ASPROF): src/main/* src/jattach/* src/fdtransfer.h
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFS) -o $@ src/main/*.cpp src/jattach/*.c
+	$(STRIP) $@
+
+build/$(JFRCONV): src/launcher/* build/$(CONVERTER_JAR)
+	$(CC) $(CPPFLAGS) $(CFLAGS) $(DEFS) -o $@ src/launcher/*.cpp
+	$(STRIP) $@
+	cat build/$(CONVERTER_JAR) >> $@
 
 build/$(LIB_PROFILER): $(SOURCES) $(HEADERS) $(RESOURCES) $(JAVA_HELPER_CLASSES)
 ifeq ($(MERGE),true)
 	for f in src/*.cpp; do echo '#include "'$$f'"'; done |\
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROFILER_VERSION=\"$(PROFILER_VERSION)\" $(INCLUDES) -fPIC -shared -o $@ -xc++ - $(LIBS)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEFS) $(INCLUDES) -fPIC -shared -o $@ -xc++ - $(LIBS)
 else
-	$(CXX) $(CPPFLAGS) $(CXXFLAGS) -DPROFILER_VERSION=\"$(PROFILER_VERSION)\" $(INCLUDES) -fPIC -shared -o $@ $(SOURCES) $(LIBS)
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEFS) $(INCLUDES) -fPIC -shared -o $@ $(SOURCES) $(LIBS)
 endif
 
 build/$(API_JAR): $(API_SOURCES)
@@ -143,21 +176,54 @@ build/$(CONVERTER_JAR): $(CONVERTER_SOURCES) $(RESOURCES)
 	$(RM) -r build/converter
 
 %.class: %.java
-	$(JAVAC) -source $(JAVA_TARGET) -target $(JAVA_TARGET) -Xlint:-options -g:none $^
+	$(JAVAC) -source 7 -target 7 -Xlint:-options -g:none $^
 
-test: all
-	test/smoke-test.sh
-	test/thread-smoke-test.sh
-	test/alloc-smoke-test.sh
-	test/load-library-test.sh
-	test/fdtransfer-smoke-test.sh
-	echo "All tests passed"
+build/test/cpptests: $(CPP_TEST_SOURCES) $(CPP_TEST_HEADER) $(SOURCES) $(HEADERS) $(RESOURCES) $(JAVA_HELPER_CLASSES)
+	mkdir -p build/test
+
+ifeq ($(MERGE),true)
+	for f in src/*.cpp test/native/*.cpp; do echo '#include "'$$f'"'; done |\
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEFS) $(INCLUDES) $(CPP_TEST_INCLUDES) -fPIC -o $@ -xc++ - $(LIBS)
+else
+	$(CXX) $(CPPFLAGS) $(CXXFLAGS) $(DEFS) $(INCLUDES) $(CPP_TEST_INCLUDES) -fPIC -o $@ $(SOURCES) $(CPP_TEST_SOURCES) $(LIBS)
+endif
+
+build-test-java: all build/$(TEST_JAR)
+
+build-test-cpp: build/test/cpptests
+
+build-test: build-test-cpp build-test-java
+
+test-cpp: build-test-cpp
+	echo "Running cpp tests..."
+	build/test/cpptests
+
+test-java: build-test-java
+	echo "Running tests against $(LIB_PROFILER)"
+	$(JAVA) $(TEST_FLAGS) -ea -cp "build/test.jar:build/jar/*:build/lib/*" one.profiler.test.Runner $(TESTS)
+
+coverage: override FAT_BINARY=false
+coverage: clean-coverage
+	$(MAKE) test-cpp CXXFLAGS_EXTRA="-fprofile-arcs -ftest-coverage -fPIC -O0 --coverage"
+	mkdir -p build/test/coverage
+	cd build/test/ && gcovr -r ../.. --html-details --gcov-executable "$(GCOV)" -o coverage/index.html
+	rm -rf -- -.gc*
+
+test: test-cpp test-java
+
+build/$(TEST_JAR): $(TEST_SOURCES) build/$(CONVERTER_JAR)
+	mkdir -p build/test
+	$(JAVAC) -source $(JAVA_TARGET) -target $(JAVA_TARGET) -Xlint:-options -cp "build/jar/*:build/converter/*" -d build/test $(TEST_SOURCES)
+	$(JAR) cf $@ -C build/test .
 
 native:
 	mkdir -p native/linux-x64 native/linux-arm64 native/macos
 	tar xfO async-profiler-$(PROFILER_VERSION)-linux-x64.tar.gz */build/libasyncProfiler.so > native/linux-x64/libasyncProfiler.so
 	tar xfO async-profiler-$(PROFILER_VERSION)-linux-arm64.tar.gz */build/libasyncProfiler.so > native/linux-arm64/libasyncProfiler.so
-	unzip -p async-profiler-$(PROFILER_VERSION)-macos.zip */build/libasyncProfiler.so > native/macos/libasyncProfiler.so
+	unzip -p async-profiler-$(PROFILER_VERSION)-macos.zip */build/libasyncProfiler.dylib > native/macos/libasyncProfiler.dylib
+
+clean-coverage:
+	$(RM) -rf build/test/cpptests build/test/coverage
 
 clean:
 	$(RM) -r build

README.md

@@ -12,9 +12,8 @@ async-profiler can trace the following kinds of events:
  - Allocations in Java Heap
  - Contented lock attempts, including both Java object monitors and ReentrantLocks
 
-See our [Wiki](https://github.com/async-profiler/async-profiler/wiki) or
-[3 hours playlist](https://www.youtube.com/playlist?list=PLNCLTEx3B8h4Yo_WvKWdLvI9mj1XpTKBr)
-to learn about all features. 
+See our [3 hours playlist](https://www.youtube.com/playlist?list=PLNCLTEx3B8h4Yo_WvKWdLvI9mj1XpTKBr)
+to learn about more features. 
 
 ## Download
 
@@ -31,6 +30,10 @@ Current release (3.0):
 async-profiler also comes bundled with IntelliJ IDEA Ultimate 2018.3 and later.  
 For more information refer to [IntelliJ IDEA documentation](https://www.jetbrains.com/help/idea/cpu-and-allocation-profiling-basic-concepts.html).
 
+[Nightly releases](https://github.com/async-profiler/async-profiler/releases/tag/nightly) (published on each commit to master)
+
+For the build corresponding to a previous commit, go to the corresponding `Publish Nightly Builds` Github Action and scroll down to the artifacts section. These binaries are kept for 30 days.
+
 ## Supported platforms
 
 |           | Officially maintained builds | Other available ports                     |
@@ -350,11 +353,10 @@ $ asprof -d 30 -f /tmp/flamegraph.html 8983
   Useful for finding Java heap memory leaks.
 
 * `--lock N` - lock profiling threshold in nanoseconds (or other units).
-  In lock profiling mode, record contended locks that the JVM has waited for
-  longer than the specified duration.
+  In lock profiling mode, sample contended locks when total lock duration
+  overflows the threshold.
 
-* `-j N` - sets the Java stack profiling depth. This option will be ignored if N is greater
-  than default 2048.  
+* `-j N` - sets the maximum stack depth. The default is 2048.  
   Example: `asprof -j 30 8983`
 
 * `-t` - profile threads separately. Each stack trace will end with a frame
@@ -456,6 +458,11 @@ $ asprof -d 30 -f /tmp/flamegraph.html 8983
   only events between the safepoint request and the start of the VM operation
   will be recorded.
 
+* `--jfropts OPTIONS` - comma separated list of JFR recording options.
+  Currently, the only available option is `mem` supported on Linux 3.17+.
+  `mem` enables accumulating events in memory instead of flushing
+  synchronously to a file.
+
 * `--jfrsync CONFIG` - start Java Flight Recording with the given configuration
   synchronously with the profiler. The output .jfr file will include all regular
   JFR events, except that execution samples will be obtained from async-profiler.