summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Wu <peter@lekensteyn.nl>2015-02-20 17:40:57 +0100
committerPeter Wu <peter@lekensteyn.nl>2015-02-20 18:01:46 +0100
commit57f49edb18fb1f8591026814e2912a2a24ee9e62 (patch)
tree19b03aad948be204b1882914fd7051be4b50c128
parent9ed3db47e17fdf61a8facee1eeb5cbf4deda17bd (diff)
downloadwireshark-notes-57f49edb18fb1f8591026814e2912a2a24ee9e62.tar.gz
Switch to ninja
Ninja is awesome, it is faster than Unix Makefiles!
-rw-r--r--notes.txt8
-rwxr-xr-xsync-build.sh3
2 files changed, 10 insertions, 1 deletions
diff --git a/notes.txt b/notes.txt
index 379ba05..a843a96 100644
--- a/notes.txt
+++ b/notes.txt
@@ -191,3 +191,11 @@ This solves this error:
# Find all headers mentioning "fmt" or "fmt" pointers, but without attribute
grep --exclude=\*.c -Hnr -e '\* *\(fmt\|format\) *\([,)]\|$\)' -C2 --color=always | awk '{s=s $0"\n"}/^[0-9m\[K\x1b]*--/{ if(!att){print s} att=0;s="" } /GNUC_PRINTF/{ att=1 }'
+
+Compile benchmarks on i7-3770 (clean builddir, sources in tmpfs) using
+v1.99.3rc0-233-gbccb7f7 (3 trials)
+ total cmake make/ninja make/ninja(2nd)
+Makefile -j8 154.6s+/-.084s 21.86s+/-.082s 132.7s+/-.039s 2.01s+/-.021s
+Makefile -j10 153.1s+/-.163s 21.81s+/-.198s 131.3s+/-.323s 2.07s+/-.096s
+Makefile -j16 153.9s+/-.366s 21.89s+/-.102s 132.0s+/-.334s 2.02s+/-.011s
+Ninja (-j10) 141.0s+/-.261s 19.90s+/-.214s 121.0s+/-.073s .366s+/-.012s
diff --git a/sync-build.sh b/sync-build.sh
index a938644..5ba6111 100755
--- a/sync-build.sh
+++ b/sync-build.sh
@@ -92,6 +92,7 @@ if $force_cmake || [ ! -e $builddir/CMakeCache.txt ]; then
CC=$CC CXX=$CXX \
PKG_CONFIG_LIBDIR=$LIBDIR/pkgconfig \
cmake \
+ -GNinja \
-DCMAKE_INSTALL_PREFIX=/tmp/wsroot \
-DENABLE_GTK3=1 \
-DENABLE_PORTAUDIO=1 \
@@ -110,7 +111,7 @@ if $force_cmake || [ ! -e $builddir/CMakeCache.txt ]; then
-DCMAKE_CXX_FLAGS=$(printf %q "$CXXFLAGS") \
-DCMAKE_EXPORT_COMPILE_COMMANDS=1
fi &&
-time make -C $builddir -j\$((\$(nproc)*2))
+time ninja -C $builddir
'"