Revert "Refactor profiling"

This reverts commit 0b462407ae.
2019-07-29 14:09:20 -07:00 · 2019-07-29 14:09:20 -07:00 · 1a0503367b
commit 1a0503367b
parent 0b462407ae
8 changed files with 1453 additions and 1504 deletions
--- a/Makefile.in
+++ b/Makefile.in
@ -117,7 +117,6 @@ C_SRCS := $(srcroot)src/jemalloc.c \
 	$(srcroot)src/pages.c \
 	$(srcroot)src/prng.c \
 	$(srcroot)src/prof.c \
-	$(srcroot)src/prof_data.c \
 	$(srcroot)src/prof_log.c \
 	$(srcroot)src/rtree.c \
 	$(srcroot)src/safety_check.c \
--- a/include/jemalloc/internal/prof_externs.h
+++ b/include/jemalloc/internal/prof_externs.h
@ -4,11 +4,6 @@
 #include "jemalloc/internal/mutex.h"

 extern malloc_mutex_t	bt2gctx_mtx;
-extern malloc_mutex_t	tdatas_mtx;
-extern malloc_mutex_t	prof_dump_mtx;
-
-malloc_mutex_t *prof_gctx_mutex_choose(void);
-malloc_mutex_t *prof_tdata_mutex_choose(uint64_t thr_uid);

 extern bool	opt_prof;
 extern bool	opt_prof_active;
@ -115,13 +110,4 @@ bool prof_log_rep_check(void);
 void prof_log_dummy_set(bool new_value);
 #endif

-/* Functions in prof_data.c only accessed in prof.c */
-bool prof_data_init(tsd_t *tsd);
-bool prof_dump(tsd_t *tsd, bool propagate_err, const char *filename,
-    bool leakcheck);
-prof_tdata_t * prof_tdata_init_impl(tsd_t *tsd, uint64_t thr_uid,
-    uint64_t thr_discrim, char *thread_name, bool active);
-void prof_tdata_detach(tsd_t *tsd, prof_tdata_t *tdata);
-void prof_tctx_destroy(tsd_t *tsd, prof_tctx_t *tctx);
-
 #endif /* JEMALLOC_INTERNAL_PROF_EXTERNS_H */
--- a/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj
+++ b/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj
@ -58,7 +58,6 @@
    <ClCompile Include="..\..\..\..\src\pages.c" />
    <ClCompile Include="..\..\..\..\src\prng.c" />
    <ClCompile Include="..\..\..\..\src\prof.c" />
-    <ClCompile Include="..\..\..\..\src\prof_data.c" />
    <ClCompile Include="..\..\..\..\src\prof_log.c" />
    <ClCompile Include="..\..\..\..\src\rtree.c" />
    <ClCompile Include="..\..\..\..\src\sc.c" />
--- a/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters
+++ b/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters
@ -67,9 +67,6 @@
    <ClCompile Include="..\..\..\..\src\prof.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\prof_data.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\..\..\src\prof_log.c">
      <Filter>Source Files</Filter>
    </ClCompile>
--- a/msvc/projects/vc2017/jemalloc/jemalloc.vcxproj
+++ b/msvc/projects/vc2017/jemalloc/jemalloc.vcxproj
@ -58,7 +58,6 @@
    <ClCompile Include="..\..\..\..\src\pages.c" />
    <ClCompile Include="..\..\..\..\src\prng.c" />
    <ClCompile Include="..\..\..\..\src\prof.c" />
-    <ClCompile Include="..\..\..\..\src\prof_data.c" />
    <ClCompile Include="..\..\..\..\src\prof_log.c" />
    <ClCompile Include="..\..\..\..\src\rtree.c" />
    <ClCompile Include="..\..\..\..\src\sc.c" />
--- a/msvc/projects/vc2017/jemalloc/jemalloc.vcxproj.filters
+++ b/msvc/projects/vc2017/jemalloc/jemalloc.vcxproj.filters
@ -67,9 +67,6 @@
    <ClCompile Include="..\..\..\..\src\prof.c">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\..\..\src\prof_data.c">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\..\..\src\prof_log.c">
      <Filter>Source Files</Filter>
    </ClCompile>
--- a/src/prof.c
+++ b/src/prof.c
--- a/src/prof_data.c
+++ b/src/prof_data.c