TeaSpeak/Server-Root
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Using jemalloc

Browse Source
This commit is contained in:
WolverinDEV
2018-08-25 16:42:06 +02:00
parent 6a69d12a89
commit dadefb355c
9 changed files with 63 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitmodules
+3
View File
@@ -56,3 +56,6 @@
[submodule "libraries/DataPipes"]
path = libraries/DataPipes
url = https://github.com/WolverinDEV/DataPipes.git
[submodule "libraries/jemalloc"]
path = libraries/jemalloc
url = https://github.com/jemalloc/jemalloc.git
.idea/workspace.xml
Generated
+13 -9
View File
@@ -10,10 +10,13 @@
</component>
<component name="ChangeListManager">
<list default="true" id="82f14300-bc72-4a0b-aff9-578f9bd5703c" name="Default" comment="">
<change beforePath="" afterPath="$PROJECT_DIR$/libraries/jemalloc" />
<change beforePath="$PROJECT_DIR$/.gitmodules" afterPath="$PROJECT_DIR$/.gitmodules" />
<change beforePath="$PROJECT_DIR$/Jenkinsfile" afterPath="$PROJECT_DIR$/Jenkinsfile" />
<change beforePath="$PROJECT_DIR$/TeaSpeak" afterPath="$PROJECT_DIR$/TeaSpeak" />
<change beforePath="$PROJECT_DIR$/libraries/CXXTerminal" afterPath="$PROJECT_DIR$/libraries/CXXTerminal" />
<change beforePath="$PROJECT_DIR$/libraries/StringVariable" afterPath="$PROJECT_DIR$/libraries/StringVariable" />
<change beforePath="$PROJECT_DIR$/libraries/Thread-Pool" afterPath="$PROJECT_DIR$/libraries/Thread-Pool" />
<change beforePath="$PROJECT_DIR$/libraries/boringssl" afterPath="$PROJECT_DIR$/libraries/boringssl" />
<change beforePath="$PROJECT_DIR$/libraries/build.sh" afterPath="$PROJECT_DIR$/libraries/build.sh" />
</list>
<ignored path="$PROJECT_DIR$/cmake-build-debug/" />
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -81,7 +84,7 @@
<subPane>
<expand>
<path>
<item name="TeaSpeak" type="b2602c69:ProjectViewProjectNode" />
<item name="TeaSpeak" type="dad4c3:CidrFilesViewHelper$MyProjectTreeStructure$1" />
<item name="TeaSpeak" type="462c0819:PsiDirectoryNode" />
</path>
</expand>
@@ -120,33 +123,34 @@
<option name="presentableId" value="Default" />
<updated>1533152440978</updated>
<workItem from="1533152448087" duration="49000" />
<workItem from="1535203104737" duration="22000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="49000" />
<option name="totallyTimeSpent" value="71000" />
</component>
<component name="ToolWindowManager">
<frame x="65" y="2156" width="3777" height="2172" extended-state="6" />
<frame x="107" y="2156" width="3777" height="2172" extended-state="6" />
<layout>
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="CMake" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="-1" side_tool="false" content_ui="tabs" />
<window_info id="Docker" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="CMake" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.32972974" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="true" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="combo" />
<window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
</layout>
</component>
<component name="VcsContentAnnotationSettings">
Jenkinsfile
Vendored
+2 -2
View File
@@ -19,7 +19,7 @@ pipeline {
CMAKE_MAKE_OPTIONS = '-j 12'
//Make specific flags
MAKE_OPTIONS = ''
MAKE_OPTIONS = '-j 12'
}
@@ -61,7 +61,7 @@ pipeline {
CMAKE_MAKE_OPTIONS = '-j 12'
//Make specific flags
MAKE_OPTIONS = ''
MAKE_OPTIONS = '-j 12'
}
TeaSpeak
+1 -1
Submodule TeaSpeak updated: dc16b7d0fe...c2cb037cbc
cmake-build-debug/CMakeFiles/clion-log.txt
+1
View File
@@ -0,0 +1 @@
CMakeLists.txt not found in /home/wolverindev/TeaSpeak
libraries/CXXTerminal
+1 -1
Submodule libraries/CXXTerminal updated: e2d8def235...d44e435f1e
libraries/build.sh
+3 -1
View File
@@ -17,7 +17,8 @@ mkdir -p \
tomcrypt/build \
tommath/build \
yaml-cpp/build \
protobuf/build
protobuf/build \
jemalloc/build
function exec_script {
echo "Executing ${1}"
@@ -43,3 +44,4 @@ exec_script build_stringvariable.sh
exec_script build_threadpool.sh
exec_script build_tom.sh
exec_script build_yaml.sh
exec_script build_jemalloc.sh
libraries/build_jemalloc.sh
Executable
+38
View File
@@ -0,0 +1,38 @@
#!/bin/bash
cd jemalloc/
if ! [ -f configure ]; then
autoconf
if [ $? -ne 0 || ! -f configure ]; then
echo "Failed to create configure file"
exit 1
fi
fi
cd build
../configure
if [ $? -ne 0 ]; then
echo "Failed to create makefile"
exit 1
fi
(cat Makefile | sed 's/.*$(CC) $(DSO_LDFLAGS) $(call RPATH,$(RPATH_EXTRA)) $(LDTARGET) $+ $(LDFLAGS) $(LIBS) $(EXTRA_LDFLAGS).*/ $(CXX) $(DSO_LDFLAGS) $(call RPATH,$(RPATH_EXTRA)) $(LDTARGET) $+ $(LDFLAGS) $(LIBS) $(EXTRA_LDFLAGS)/') > tmp
rm Makefile
mv tmp Makefile
make -j 12 LIBS="-pthread -static-libgcc -static-libstdc++ -fPIC" CFLAGS="-static-libgcc -static-libstdc++ -fPIC" CXXFLAGS="-static-libgcc -static-libstdc++ -fPIC"
#make -j 12 LIBS="-pthread -static-libgcc -static-libstdc++" CFLAGS="-fPIC" CXXFLAGS="-fPIC"
#make -j 12 LIBS="-pthread -lm -l/usr/lib/gcc/x86_64-linux-gnu/5/libstdc++.a" ${MAKE_OPTIONS} CFLAGS="-shared -static-libstdc++ -static-libgcc -fPIC" CXXFLAGS="-static-libstdc++ -static-libgcc -shared -fPIC"
if [ $? -ne 0 ]; then
echo "Failed to build jemalloc"
exit 1
fi
sudo make install &>/dev/null
if [ $? -ne 0 ]; then #Workaround because the install fails
exit 0
fi
make -j 12 LIBS="-pthread -static-libgcc -static-libstdc++" CFLAGS="-fPIC" CXXFLAGS="-fPIC"
libraries/jemalloc
Submodule
+1
Submodule libraries/jemalloc added at 4c548a61c8