project-base/server-skynet-source-3rd-jemalloc
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Prefer /proc/<pid>/task/<pid>/maps over /proc/<pid>/maps on Linux.

Browse Source 
This resolves #227.
This commit is contained in:
Jason Evans 2015-05-01 09:03:20 -07:00
parent f1f2b45429
commit 8e33c21d2d
1 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/prof.c
View File

@ -1338,21 +1338,40 @@ label_return:
return (ret); return (ret);
} }
JEMALLOC_ATTR(format(printf, 1, 2))
static int
prof_open_maps(const char *format, ...)
{
int mfd;
va_list ap;
char filename[PATH_MAX + 1];
va_start(ap, format);
malloc_vsnprintf(filename, sizeof(filename), format, ap);
va_end(ap);
mfd = open(filename, O_RDONLY);
return (mfd);
}
static bool static bool
prof_dump_maps(bool propagate_err) prof_dump_maps(bool propagate_err)
{ {
bool ret; bool ret;
int mfd; int mfd;
char filename[PATH_MAX + 1];
cassert(config_prof); cassert(config_prof);
#ifdef __FreeBSD__ #ifdef __FreeBSD__
malloc_snprintf(filename, sizeof(filename), "/proc/curproc/map"); mfd = prof_open_maps("/proc/curproc/map");
#else #else
malloc_snprintf(filename, sizeof(filename), "/proc/%d/maps", {
(int)getpid()); int pid = getpid();
mfd = prof_open_maps("/proc/%d/task/%d/maps", pid, pid);
if (mfd == -1)
mfd = prof_open_maps("/proc/%d/maps", pid);
}
#endif #endif
mfd = open(filename, O_RDONLY);
if (mfd != -1) { if (mfd != -1) {
ssize_t nread; ssize_t nread;