Jongy
commented
1 year ago $ git range-diff upstream/master..v2.8.3g5 upstream/master..v2.9g1
1: f03014d = 1: f2fd456 Replace semicolon in method descriptors to vertical bar, since a semicolon is already used to separate between methods
2: 56daea2 = 2: f611400 Remove the "Profiling started" message
3: e406f18 = 3: 63e3017 Remove the "Profiling stopped" message
4: 7a4312d = 4: b367d20 Compile statically with libstdc++
5: 52692de = 5: 2ae2635 Build jattach statically
6: e6abbed = 6: f4b205d Build fdtransfer statically
7: 4699370 = 7: 6c034cc Compile statically with libgcc
8: 1bef4f5 = 8: 866c156 Force link with memcpy@GLIBC_2.2.5 on x86_64
9: 4018ebb = 9: 203495e Fix -static-* args passed only in non-MERGE case :(
10: ee5acc1 ! 10: f9b9fda Close standard streams after forking in fdtransfer
@@ Commit message
Close standard streams after forking in fdtransfer
## src/fdtransfer/fdtransferServer.cpp ##
-@@ src/fdtransfer/fdtransferServer.cpp: static int single_pid_server(int pid) {
+@@ src/fdtransfer/fdtransferServer.cpp: static int single_pid_server(int pid, const char *path) {
// CLONE_NEWPID affects children only - so we fork here.
if (0 == fork()) {
11: 1eed7a1 < -: ------- Generate randomized fdtransfer path per async-profiler invocation (#635)
12: dcfe236 = 11: 1102ecc -static-libstdc++ only on musl
13: 7b51a01 < -: ------- Do not use ELF NODELETE flag because of glibc bug
14: da08aab ! 12: aa4669c Convert frame name format to 'function (DSO)' for LIB style (#2)
@@ Commit message
For https://github.com/Granulate/gprofiler/pull/491
## src/codeCache.cpp ##
-@@ src/codeCache.cpp: void NativeFunc::destroy(char* name) {
+@@ src/codeCache.cpp: size_t NativeFunc::usedMemory(const char* name) {
CodeCache::CodeCache(const char* name, short lib_index, const void* min_address, const void* max_address) {
_name = NativeFunc::create(name, -1);
@@ src/frameName.cpp: const char* FrameName::decodeNativeSymbol(const char* name) {
char* demangled = abi::__cxa_demangle(name, NULL, NULL, &status);
if (demangled != NULL) {
if (lib_name != NULL) {
-- snprintf(_buf, sizeof(_buf) - 1, "%s`%s", lib_name, demangled);
-+ snprintf(_buf, sizeof(_buf) - 1, "%s (%s)", demangled, lib_name);
+- _str.assign(lib_name).append("`").append(demangled);
++ _str.assign(demangled).append(" (").append(lib_name).append(")");
} else {
- strncpy(_buf, demangled, sizeof(_buf) - 1);
+ _str.assign(demangled);
}
@@ src/frameName.cpp: const char* FrameName::decodeNativeSymbol(const char* name) {
}
if (lib_name != NULL) {
-- snprintf(_buf, sizeof(_buf) - 1, "%s`%s", lib_name, name);
-+ snprintf(_buf, sizeof(_buf) - 1, "%s (%s)", name, lib_name);
- return _buf;
+- return _str.assign(lib_name).append("`").append(name).c_str();
++ return _str.assign(name).append(" (").append(lib_name).append(")").c_str();
} else {
return name;
+ }
## src/profiler.cpp ##
@@ src/profiler.cpp: const char* Profiler::getLibraryName(const char* native_symbol) {
This resolves https://github.com/Granulate/gprofiler/issues/563 because it was fixed by https://github.com/jvm-profiling-tools/async-profiler/commit/b0a44524bad111a7f18c8309c0ebec56ccfdcf2a which is included.
EDIT 29th Nov: After upgrading to 2.9, our CentOS 6 broke. We've had a old hack which forced linking with
memcpy@GLIBC_2.2.5, and it fails on 2.9, from bisecting I found the breaking commit to be https://github.com/jvm-profiling-tools/async-profiler/commit/b0a44524bad111a7f18c8309c0ebec56ccfdcf2a which, I figure, introduced lots of implicit string handling which added calls tomemcpythat were not affected by the symbol version pinning.Soooo after lots of trying around of different
.symverdirectives and other hacks such as directly passinglib.soof glibc-2.12 in the build command line (which causes gcc to take symbol versions from that DSO, but it might have adverse effects if I built against headers of version X then linked against incompatible version Y...)I ended up -
-static-libstdc++which is not supported on CentOS 6 GCC (see description in that PR). However, we've since switched to CentOS 7 (in #304) so it's no longer relevant - GCC on CentOS 7 supports it.compat-glibcand building against it with-I /usr/lib/x86_64-redhat-linux6E/include -B /usr/lib/x86_64-redhat-linux6E/lib64/.