Rename _push_raw method to _push_back_raw method (Cleaner semantic)

Fix bug reported by florommel on dict's reserve
Update links
2025-07-26 10:35:48 +02:00 · 2025-07-18 20:11:13 +02:00 · 2025-07-01 22:17:49 +02:00 · 2025-06-10 22:18:24 +02:00 · 2025-06-10 22:15:34 +02:00 · 2025-05-31 00:11:49 +02:00
216 changed files with 32076 additions and 26448 deletions
@@ -10,7 +10,9 @@ jobs:
    runs-on: ${{ matrix.platform }}
    
    steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
+    - name: CPU Information
+      run:  lscpu || sysctl -a|grep cpu || echo "CPU information not available"
    - name: make check C99
      run: make clean && make check -j 2 CC="cc -std=c99 -Wno-unknown-warning-option -Werror"
    - name: make check C11
@@ -24,11 +26,13 @@ jobs:
    runs-on: ubuntu-latest
    
    steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
    - name: update package list
      run: sudo apt-get update
    - name: install multilib
      run: sudo apt-get install gcc-multilib g++-multilib
+    - name: CPU Information
+      run:  lscpu || echo "CPU information not available"
    - name: make check C99 (32bits)
      working-directory: ./tests
      run: make clean && make check -j 2 CC="gcc -m32 -std=c99 -Wno-unknown-warning-option -Werror"
@@ -46,7 +50,9 @@ jobs:
    runs-on: ubuntu-latest
    
    steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
+    - name: CPU Information
+      run:  lscpu || echo "CPU information not available"
    - name: Clone TCC
      shell: bash
      run:  git clone https://repo.or.cz/tinycc.git
@@ -58,13 +64,22 @@ jobs:
      run: make depend
    - name: make check
      shell: bash
-      run: make CC="/tmp/tcc/bin/tcc -std=c99" check
+      run: make CC="/tmp/tcc/bin/tcc -std=c99" check -j4 || make CC="/tmp/tcc/bin/tcc -std=c99" check -j2 || make CC="/tmp/tcc/bin/tcc -std=c99" check
+
+  build_linux_sanitize:
+    runs-on: ubuntu-latest
+    
+    steps:
+    - uses: actions/checkout@v4
+    - name: make sanitize
+      working-directory: ./tests
+      run: make sanitize -j 2

  build_windows_mingw:
    runs-on: windows-latest
    
    steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
    - name: make check
      shell: bash
      run: mingw32-make -j 2 CC="gcc -std=c99 -D__USE_MINGW_ANSI_STDIO=1" check
@@ -75,7 +90,7 @@ jobs:
      run:
        shell: msys2 {0}    
    steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
    - uses: msys2/setup-msys2@v2
      with:
          msystem: MINGW64
@@ -88,7 +103,7 @@ jobs:
    runs-on: windows-latest
    
    steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
    - name: make check
      shell: cmd
      working-directory: ./tests
@@ -98,9 +113,111 @@ jobs:
    runs-on: windows-latest
    
    steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
    - name: make check
      shell: cmd
      working-directory: ./tests
      run: Make-check-cl.bat clang-cl

+    # The host should always be linux
+  build_freebsd:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Test in FreeBSD
+      id: test
+      uses: vmactions/freebsd-vm@v1
+      timeout-minutes: 60
+      with:
+        usesh: true
+        run: |
+             freebsd-version
+             cd tests
+             make check -j 2 CC="cc -std=c99 -Wno-unknown-warning-option -Werror" && make clean && make check -j 2 CC="cc -std=c11 -Wno-unknown-warning-option -Werror" LDFLAGS="-lstdthreads" && make clean
+
+    # The host should always be linux
+  build_aarch64:
+    runs-on: ubuntu-latest
+    name: Build on aarch64
+    steps:
+      - uses: actions/checkout@v4
+      - uses: uraimo/run-on-arch-action@v3
+        name: Run commands on aarch64
+        id: make
+        timeout-minutes: 60
+        with:
+          arch: aarch64
+          distro: bullseye
+          # Not required, but speeds up builds
+          githubToken: ${{ github.token }}
+          shell: /bin/sh
+          run: |
+            apt-get update -q -y
+            apt-get install -q -y  build-essential git gcc
+            lscpu
+            cd tests && make check -j 2 && make clean
+
+    # The host should always be linux
+  build_armv6:
+    runs-on: ubuntu-latest
+    name: Build on armv6
+    steps:
+      - uses: actions/checkout@v4
+      - uses: uraimo/run-on-arch-action@v3
+        name: Run commands on armv6
+        id: make
+        timeout-minutes: 60
+        with:
+          arch: armv6
+          distro: alpine_latest
+          # Not required, but speeds up builds
+          githubToken: ${{ github.token }}
+          shell: /bin/sh
+          run: |
+            apk update
+            apk add build-base gcc make
+            cd tests && make check -j 2 && make clean
+
+  # The host should always be linux
+  build_riscv64:
+    runs-on: ubuntu-latest
+    name: Build on riscv64
+    steps:
+      - uses: actions/checkout@v4
+      - uses: uraimo/run-on-arch-action@v3
+        name: Run commands on riscv64
+        id: make
+        timeout-minutes: 60
+        with:
+          arch: riscv64
+          distro: ubuntu22.04
+          # Not required, but speeds up builds
+          githubToken: ${{ github.token }}
+          shell: /bin/sh
+          run: |
+            apt-get update -q -y
+            apt-get install -q -y  build-essential git gcc
+            lscpu
+            cd tests && make check -j 2 && make clean
+
+    # The host should always be linux
+  build_ppc64le: 
+    runs-on: ubuntu-latest
+    name: Build on ppc64le
+    steps:
+      - uses: actions/checkout@v4
+      - uses: uraimo/run-on-arch-action@v3
+        name: Run commands on ppc64le
+        id: make
+        timeout-minutes: 60
+        with:
+          arch: ppc64le
+          distro: ubuntu22.04
+          # Not required, but speeds up builds
+          githubToken: ${{ github.token }}
+          shell: /bin/sh
+          run: |
+            apt-get update -q -y
+            apt-get install -q -y  build-essential git gcc
+            lscpu
+            cd tests && make check -j 2 && make clean
@@ -28,7 +28,7 @@ jobs:

    steps:
    - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
      with:
        # We must fetch at least the immediate parents so that if this is
        # a pull request then we can checkout the head.
@@ -36,7 +36,7 @@ jobs:

    # Initializes the CodeQL tools for scanning.
    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v1
+      uses: github/codeql-action/init@v2
      with:
        languages: ${{ matrix.language }}
        # If you wish to specify custom queries, you can do so here or in a config file.
@@ -50,4 +50,4 @@ jobs:
      run:  make exe

    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v1
+      uses: github/codeql-action/analyze@v2
@@ -38,8 +38,13 @@ depend
 other/
 a*.dat
 config
+config.*
 *.log
 .vscode
 .vs
 tmp-serial.*
 *~
+*.gcda
+*.gcno
+*.gcov
+*.synt
@@ -1,6 +1,6 @@
 BSD 2-Clause License

-Copyright (c) 2017-2021, Patrick Pelissier
+Copyright (c) 2017-2025, Patrick Pelissier
 All rights reserved.

 Redistribution and use in source and binary forms, with or without
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2021, Patrick Pelissier
+# Copyright (c) 2017-2025, Patrick Pelissier
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without
@@ -34,14 +34,14 @@ DESTDIR=

 # Package name & version.
 PACKAGE=m_lib-$(VERSION)
-VERSION=0.6.0
+VERSION=0.8.1

 # Define the contain of the distribution tarball
-HEADER=m-algo.h m-array.h m-atomic.h m-bitset.h m-bptree.h m-buffer.h m-c-mempool.h m-concurrent.h m-core.h m-deque.h m-dict.h m-funcobj.h m-genint.h m-i-list.h m-i-shared.h m-list.h m-mempool.h m-mutex.h m-prioqueue.h m-rbtree.h m-serial-bin.h m-serial-json.h m-shared.h m-snapshot.h m-string.h m-tuple.h m-variant.h m-worker.h
+HEADER=m-algo.h m-array.h m-atomic.h m-bitset.h m-bptree.h m-buffer.h m-core.h m-deque.h m-dict.h m-funcobj.h m-generic.h m-genint.h m-i-list.h m-list.h m-thread.h m-prioqueue.h m-rbtree.h m-serial-bin.h m-serial-json.h m-snapshot.h m-string.h m-tree.h m-try.h m-tuple.h m-variant.h m-worker.h m-bstring.h m-shared-ptr.h m-queue.h
 DOC1=LICENSE README.md
-DOC2=doc/API.txt doc/Container.html doc/Container.ods doc/depend.png doc/DEV.md doc/ISSUES.org doc/oplist.odp doc/oplist.png
-EXAMPLE=example/ex11-algo01.c example/ex11-algo02.c example/ex11-json01.c example/ex11-section.c example/ex-algo02.c example/ex-algo03.c example/ex-algo04.c example/ex-array00.c example/ex-array01.c example/ex-array02.c example/ex-array03.c example/ex-array04.c example/ex-array05.c example/ex-bptree01.c example/ex-buffer01.c example/ex-dict01.c example/ex-dict02.c example/ex-dict03.c example/ex-dict04.c example/ex-grep01.c example/ex-list01.c example/ex-mph.c example/ex-multi01.c example/ex-multi02.c example/ex-multi03.c example/ex-multi04.c example/ex-multi05.c example/ex-rbtree01.c example/ex11-algo02.json example/ex11-json01.json example/Makefile example/ex-defer01.c example/ex-string01.c example/ex-string02.c example/ex-astar.c example/ex-string03.c example/ex11-tstc.c
-TEST=tests/test-malgo.c tests/test-marray.c tests/test-mbitset.c tests/test-mbptree.c tests/test-mbuffer.c tests/test-mcmempool.c tests/test-mconcurrent.c tests/test-mcore.c tests/test-mdeque.c tests/test-mdict.c tests/test-mfuncobj.c tests/test-mgenint.c tests/test-milist.c tests/test-mlist.c tests/test-mmempool.c tests/test-mmutex.c tests/test-mprioqueue.c tests/test-mrbtree.c tests/test-mserial-bin.c tests/test-mserial-json.c tests/test-mshared.c tests/test-msnapshot.c tests/test-mstring.c tests/test-mtuple.c tests/test-mvariant.c tests/test-mworker.c tests/tgen-bitset.c tests/tgen-marray.c tests/tgen-mdict.c tests/tgen-mlist.c tests/tgen-mstring.c tests/tgen-openmp.c tests/tgen-queue.c tests/tgen-shared.c tests/tgen-mserial.c tests/Makefile tests/coverage.h tests/test-obj.h tests/dict.txt tests/fail-chain-oplist.c  tests/fail-incompatible.c  tests/fail-no-oplist.c tests/test-mishared.c tests/check-array.cpp tests/check-deque.cpp tests/check-dplist.cpp tests/check-list.cpp tests/check-rbtree.cpp tests/check-uset.cpp tests/check-generic.hpp
+DOC2=doc/API.txt doc/Container.html doc/Container.ods doc/depend.png doc/DEV.md doc/ISSUES.org doc/oplist.odp doc/oplist.png doc/bench-array-log.png doc/bench-array.png doc/bench-list-log.png doc/bench-list.png doc/bench-oset-log.png doc/bench-oset.png doc/bench-umap-log.png doc/bench-umap.png doc/cc.sh
+EXAMPLE=example/ex11-algo01.c example/ex11-algo02.c example/ex11-json01.c example/ex11-section.c example/ex-algo02.c example/ex-algo03.c example/ex-algo04.c example/ex-array00.c example/ex-array01.c example/ex-array02.c example/ex-array03.c example/ex-array04.c example/ex-array05.c example/ex-bptree01.c example/ex-buffer01.c example/ex-dict01.c example/ex-dict02.c example/ex-dict03.c example/ex-dict04.c example/ex-grep01.c example/ex-list01.c example/ex-mph.c example/ex-multi01.c example/ex11-multi02.c example/ex-multi03.c example/ex-multi04.c example/ex-multi05.c example/ex-rbtree01.c example/ex11-algo02.json example/ex11-json01.json example/Makefile example/ex-defer01.c example/ex-string01.c example/ex-string02.c example/ex-astar.c example/ex-string03.c example/ex11-tstc.c example/ex-no-stdio.c example/ex11-count-lines.c example/ex11-json-net.c example/ex11-rbtree02.c example/ex-curl.c example/ex-dict05.c example/ex-dict06.c  example/exm-lib.c example/exm-main.c example/exn-lib.c example/exn-main.c example/exm-header.h example/exn-header.h example/ex-alloc1.c example/ex-alloc2.c example/ex-try01.c example/ex11-generic01.c example/ex-bptree02.c example/ex-i-list.c example/ex11-generic02.c example/ex11-small-name.c example/ex11-variant01.c example/ex11-use-pool.c
+TEST=tests/test-malgo.c tests/test-marray.c tests/test-mbitset.c tests/test-mbptree.c tests/test-mbuffer.c tests/test-mcore.c tests/test-mdeque.c tests/test-mdict.c tests/test-mfuncobj.c tests/test-mgenint.c tests/test-milist.c tests/test-mlist.c tests/test-mmutex.c tests/test-mprioqueue.c tests/test-mrbtree.c tests/test-mserial-bin.c tests/test-mserial-json.c tests/test-msnapshot.c tests/test-mstring.c tests/test-mtuple.c tests/test-mvariant.c tests/test-mworker.c tests/tgen-bitset.c tests/tgen-marray.c tests/tgen-mdict.c tests/tgen-mlist.c tests/tgen-mstring.c tests/tgen-openmp.c tests/tgen-queue.c tests/tgen-mserial.c tests/Makefile tests/coverage.h tests/test-obj.h tests/dict.txt tests/fail-chain-oplist.c  tests/fail-incompatible.c  tests/fail-no-oplist.c tests/check-array.cpp tests/check-deque.cpp tests/check-dplist.cpp tests/check-list.cpp tests/check-rbtree.cpp tests/check-uset.cpp tests/check-generic.hpp tests/test-mtree.c tests/check-bptree-map.cpp tests/check-bptree-set.cpp tests/check-prioqueue.cpp tests/check-umap.cpp tests/test-mtry.c tests/tgen-mmap.c tests/tgen-try.c tests/tgen-tuple.c tests/test-mgeneric.c tests/test-mbstring.c tests/except-array.c tests/except-bitset.c tests/except-deque.c tests/except-list.c tests/except-string.c tests/test-mshared-ptr.c tests/test-mshared-ptr.h tests/test-obj-except.h tests/test-mqueue.c

 .PHONY: all test check doc clean distclean depend install uninstall dist

@@ -66,10 +66,9 @@ doc:	html doc/depend.png
 clean:
 	cd tests && $(MAKE) clean
 	cd example && $(MAKE) clean
-	cd bench && $(MAKE) clean
 	$(RM) README.html depend.dot
-	$(RM) -r 'm*lib-$(VERSION)'
-	$(RM) 'm*lib-$(VERSION).tar.bz2'
+	$(RM) -r 'm_lib-$(VERSION)'
+	$(RM) 'm_lib-$(VERSION).tar.bz2'

 distclean: clean
 	cd tests && $(MAKE) distclean
@@ -1,448 +0,0 @@
-# Copyright (c) 2017-2021, Patrick Pelissier
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-# + Redistributions of source code must retain the above copyright
-#   notice, this list of conditions and the following disclaimer.
-# + Redistributions in binary form must reproduce the above copyright
-#   notice, this list of conditions and the following disclaimer in the
-#   documentation and/or other materials provided with the distribution.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
-# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-CC=cc -std=c11
-CXX=c++ -std=c++11
-CFLAGS=-O2 -march=native -Wall
-XCFLAGS=
-CPPFLAGS=-I..
-N=4
-BENCH_DEF=
-RM=rm -rf
-
-.PHONY: all pgo container queue mempool string plain bench-mlib bench-mlib-mempool bench-stl bench-qt bench-glib bench-klib bench-libdynamic bench-sparsepp bench-collectionc bench-tommyds bench-flathashmap bench-emilib bench-hopscotchmap bench-mlib-thread bench-liblfds bench-concurrentqueue bench-boost bench-mempool bench-string bench-plain bench-rigtorp-mpmc-queue bench-cmc
-
-all: container queue mempool string plain
-
-pgo:
-	$(MAKE) all XCFLAGS="-fprofile-generate=pgo"
-	$(MAKE) all XCFLAGS="-fprofile-use=pgo"
-
-#########################################################################
-
-container: bench-mlib bench-mlib-mempool bench-stl bench-qt bench-glib bench-klib bench-libdynamic bench-cmc bench-sparsepp bench-densehashmap bench-collectionc bench-tommyds bench-flathashmap bench-emilib bench-hopscotchmap bench-uthash bench-qlibc bench-libsrt bench-nedtries bench-rigtorp-hashmap bench-ctl
-	@echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-
-queue: bench-mlib-thread bench-liblfds bench-concurrentqueue bench-boost bench-rigtorp-mpmc-queue
-	@echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-
-mempool: bench-mempool
-	@echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-
-string: bench-string
-	@echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-
-plain: bench-plain
-	@echo "@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"
-
-
-
-#########################################################################
-
-
-bench-mlib:
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -pthread bench-mlib.c common.c -o bench-mlib.exe
-	@./bench-mlib.exe 10
-	@./bench-mlib.exe 11
-	@./bench-mlib.exe 20
-	@./bench-mlib.exe 30
-	@./bench-mlib.exe 31
-	@./bench-mlib.exe 40
-	@./bench-mlib.exe 41
-	@./bench-mlib.exe 42
-	@./bench-mlib.exe 46
-	@./bench-mlib.exe 47
-	@./bench-mlib.exe 43
-	@./bench-mlib.exe 50
-	@./bench-mlib.exe 51
-
-bench-mlib-mempool:
-	$(CC) $(CFLAGS) $(CPPFLAGS) bench-mlib.c common.c -DUSE_MEMPOOL -pthread -o bench-mlib-mempool.exe
-	@./bench-mlib-mempool.exe 10
-	@./bench-mlib-mempool.exe 11
-	@./bench-mlib-mempool.exe 20
-	@./bench-mlib-mempool.exe 30
-	@./bench-mlib-mempool.exe 31
-	@./bench-mlib-mempool.exe 40
-	@./bench-mlib-mempool.exe 41
-	@./bench-mlib-mempool.exe 42
-	@./bench-mlib-mempool.exe 46
-	@./bench-mlib-mempool.exe 47
-	@./bench-mlib-mempool.exe 43
-	@./bench-mlib-mempool.exe 50
-	@./bench-mlib-mempool.exe 51
-
-bench-mlib-thread:
-	$(CC) $(CFLAGS) $(CPPFLAGS) bench-mlib.c common.c -DMULTI_THREAD_MEASURE -pthread -o bench-mlib-thread.exe
-	@./bench-mlib-thread.exe 60
-	@./bench-mlib-thread.exe 61
-	@./bench-mlib-thread.exe 62
-	@./bench-mlib-thread.exe 63
-	@./bench-mlib-thread.exe 64
-	@./bench-mlib-thread.exe 65
-	@./bench-mlib-thread.exe 66
-
-bench-stl:
-	$(CXX) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) bench-stl.cpp common.c -o bench-stl.exe
-	@./bench-stl.exe 10
-	@./bench-stl.exe 20
-	@./bench-stl.exe 30
-	@./bench-stl.exe 40
-	@./bench-stl.exe 41
-	@./bench-stl.exe 42
-	@./bench-stl.exe 46
-	@./bench-stl.exe 43
-	@./bench-stl.exe 50
-	@./bench-stl.exe 51
-
-# QT shall point to the the directory containing the file .pc are stored
-bench-qt:
-	@if test -n "$${QT}" ; then $(MAKE) bench-qt0 ; else echo "Nothing to be done for QT." ; fi
-bench-qt0:
-	$(CXX) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -fPIC `PKG_CONFIG_PATH="$${QT}" pkg-config --libs --cflags Qt5Core` bench-qt.cpp common.c -o bench-qt.exe
-	@./bench-qt.exe 10
-	@./bench-qt.exe 20
-	@./bench-qt.exe 30
-	@./bench-qt.exe 40
-	@./bench-qt.exe 41
-	@./bench-qt.exe 42
-	@./bench-qt.exe 50
-
-# GLIB shall point to the the directory containing the file .pc are stored
-bench-glib:
-	@if test -n "$${GLIB}" ; then $(MAKE) bench-glib0 ; else echo "Nothing to be done for GLIB." ; fi
-bench-glib0:
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) bench-glib.c common.c -o bench-glib.exe `PKG_CONFIG_PATH="$${GLIB}" pkg-config --libs --cflags glib-2.0`
-	@./bench-glib.exe 10
-	@./bench-glib.exe 20
-	@./bench-glib.exe 30
-	@./bench-glib.exe 40
-	@./bench-glib.exe 41
-	@./bench-glib.exe 50
-
-# KLIB shall point to the directory where the headers are
-bench-klib:
-	@if test -n "$${KLIB}" ; then $(MAKE) bench-klib0 ; else echo "Nothing to be done for KLIB." ; fi
-
-bench-klib0:
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -I $${KLIB} bench-klib.c common.c -o bench-klib.exe
-	@./bench-klib.exe 10
-	@./bench-klib.exe 20
-	@./bench-klib.exe 30
-	@./bench-klib.exe 40
-	@./bench-klib.exe 41
-	@./bench-klib.exe 50
-
-# CMC shall point to the directory where the CMC main header is
-bench-cmc:
-	@if test -n "$${CMC}" ; then $(MAKE) bench-cmc0 ; else echo "Nothing to be done for CMC." ; fi
-
-bench-cmc0:
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -I $${CMC} bench-cmc.c common.c -o bench-cmc.exe
-	@./bench-cmc.exe 20
-	@./bench-cmc.exe 30
-	@./bench-cmc.exe 40
-
-# LIBDYNAMIC shall point to the the directory containing the file libdynamic.pc
-bench-libdynamic:
-	@if test -n "$${LIBDYNAMIC}" ; then $(MAKE) bench-libdynamic0 ; else echo "Nothing to be done for LIBDYNAMIC." ; fi
-
-bench-libdynamic0:
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) bench-libdynamic.c common.c -o bench-libdynamic.exe `PKG_CONFIG_PATH="$${LIBDYNAMIC}" pkg-config --libs --cflags libdynamic` 
-	@./bench-libdynamic.exe 20
-	@./bench-libdynamic.exe 40
-	@./bench-libdynamic.exe 41
-
-# SPARSEPP shall point to the directory where the headers are
-bench-sparsepp:
-	@if test -n "$${SPARSEPP}" ; then $(MAKE) bench-sparsepp0 ; else echo "Nothing to be done for SPARSEPP." ; fi
-
-bench-sparsepp0:
-	$(CXX) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -I "$${SPARSEPP}"  -I "$${SPARSEPP}/.." bench-sparsepp.cpp common.c -o bench-sparsepp.exe
-	@./bench-sparsepp.exe 41
-	@./bench-sparsepp.exe 42
-	@./bench-sparsepp.exe 43
-
-# DENSEHASHMAP shall point to the directory where the src are
-bench-densehashmap:
-	@if test -n "$${DENSEHASHMAP}" ; then $(MAKE) bench-densehashmap0 ; else echo "Nothing to be done Google DENSEHASHMAP." ; fi
-
-bench-densehashmap0:
-	$(CXX) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -I "$${DENSEHASHMAP}"  -I "$${DENSEHASHMAP}/.." bench-densehashmap.cpp common.c -o bench-densehashmap.exe
-	@./bench-densehashmap.exe 41
-	@./bench-densehashmap.exe 42
-	@./bench-densehashmap.exe 43
-
-# COLLECTIONC shall point to the directory where it is installed
-bench-collectionc:
-	@if test -n "$${COLLECTIONC}" ; then $(MAKE) bench-collectionc0 ; else echo "Nothing to be done for COLLECTIONC." ; fi
-
-bench-collectionc0:
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -I "$${COLLECTIONC}/include/collectc"  bench-collectionc.c common.c "$${COLLECTIONC}/lib/libcollectc.a" -o bench-collectionc.exe
-	@./bench-collectionc.exe 10
-	@./bench-collectionc.exe 20
-	@./bench-collectionc.exe 30
-	@./bench-collectionc.exe 40
-	@./bench-collectionc.exe 41
-	@./bench-collectionc.exe 50
-
-# TOMMYDS shall point to the source directory.
-bench-tommyds:
-	@if test -n "$${TOMMYDS}" ; then $(MAKE) bench-tommyds0 ; else echo "Nothing to be done for TOMMYDS." ; fi
-
-bench-tommyds0:
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -I "$${TOMMYDS}" bench-tommyds.c $${TOMMYDS}/tommyds/tommyarray.c $${TOMMYDS}/tommyds/tommylist.c $${TOMMYDS}/tommyds/tommytree.c $${TOMMYDS}/tommyds/tommyhashlin.c common.c -o bench-tommyds.exe
-	@./bench-tommyds.exe 10
-	@./bench-tommyds.exe 20
-	@./bench-tommyds.exe 30
-	@./bench-tommyds.exe 40
-	@./bench-tommyds.exe 41
-
-# FLATHASHMAP shall point to the directory where the headers are
-bench-flathashmap:
-	@if test -n "$${FLATHASHMAP}" ; then $(MAKE) bench-flathashmap0 ; else echo "Nothing to be done for FLATHASHMAP." ; fi
-
-bench-flathashmap0:
-	$(CXX) -std=c++14 $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -I "$${FLATHASHMAP}" bench-flathashmap.cpp common.c -o bench-flathashmap.exe
-	@./bench-flathashmap.exe 41
-	@./bench-flathashmap.exe 42
-	@./bench-flathashmap.exe 46
-	@./bench-flathashmap.exe 43
-
-# EMILIB shall point to the directory where the headers are
-bench-emilib:
-	@if test -n "$${EMILIB}" ; then $(MAKE) bench-emilib0 ; else echo "Nothing to be done for EMILIB." ; fi
-
-bench-emilib0:
-	$(CXX) -std=c++14 $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -I "$${EMILIB}" bench-emilib.cpp common.c -o bench-emilib.exe
-	@./bench-emilib.exe 41
-	@./bench-emilib.exe 42
-	@./bench-emilib.exe 46
-	@./bench-emilib.exe 43
-
-# HOPSCOTCHMAP shall point to the directory where the source are
-bench-hopscotchmap:
-	@if test -n "$${HOPSCOTCHMAP}" ; then $(MAKE) bench-hopscotchmap0 ; else echo "Nothing to be done for HOPSCOTCHMAP." ; fi
-
-bench-hopscotchmap0:
-	$(CXX) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -I "$${HOPSCOTCHMAP}/include/tsl" bench-hopscotchmap.cpp common.c -o bench-hopscotchmap.exe
-	@./bench-hopscotchmap.exe 41
-	@./bench-hopscotchmap.exe 42
-	@./bench-hopscotchmap.exe 43
-
-# UTHASH shall point to the directory where the source are
-bench-uthash:
-	@if test -n "$${UTHASH}" ; then $(MAKE) bench-uthash0 ; else echo "Nothing to be done for UTHASH." ; fi
-
-bench-uthash0:
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -I "$${UTHASH}" bench-uthash.c common.c -o bench-uthash.exe
-	@./bench-uthash.exe 10
-	@./bench-uthash.exe 20
-	@./bench-uthash.exe 40
-	@./bench-uthash.exe 41
-	@./bench-uthash.exe 50
-
-# QLIBC shall point to the directory where the library is installed.
-bench-qlibc:
-	@if test -n "$${QLIBC}" ; then $(MAKE) bench-qlibc0 ; else echo "Nothing to be done for QLIBC." ; fi
-
-bench-qlibc0:
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -I "$${QLIBC}/include" -L "$${QLIBC}/lib" -lqlibc -pthread bench-qlibc.c common.c -o bench-qlibc.exe
-	@LD_LIBRARY_PATH="$${QLIBC}/lib:$${LD_LIBRARY_PATH}" ./bench-qlibc.exe 10
-	@LD_LIBRARY_PATH="$${QLIBC}/lib:$${LD_LIBRARY_PATH}" ./bench-qlibc.exe 20
-	@LD_LIBRARY_PATH="$${QLIBC}/lib:$${LD_LIBRARY_PATH}" ./bench-qlibc.exe 30
-
-# LIBSRT shall point to the directory where it is installed
-bench-libsrt:
-	@if test -n "$${LIBSRT}" ; then $(MAKE) bench-libsrt0 ; else echo "Nothing to be done for LIBSRT." ; fi
-
-bench-libsrt0:
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -I "$${LIBSRT}/include/libsrt" bench-libsrt.c common.c -o bench-libsrt.exe $${LIBSRT}/lib/libsrt.a 
-	@./bench-libsrt.exe 20
-	@./bench-libsrt.exe 50
-
-
-# LIBLFDS shall point to the directory where the bin/build/inc/obj/src directories are
-# The library shall be built.
-bench-liblfds:
-	@if test -n "$${LIBLFDS}" ; then $(MAKE) bench-liblfds0 ; else echo "Nothing to be done for LIBLFDS." ; fi
-bench-liblfds0:
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -I "$${LIBLFDS}/inc" -Wno-unknown-pragmas bench-liblfds.c common.c -DMULTI_THREAD_MEASURE -o bench-liblfds.exe $${LIBLFDS}/bin/liblfds711.a -lpthread
-	@LD_LIBRARY_PATH="$${LIBLFDS}/bin:$${LD_LIBRARY_PATH}" ./bench-liblfds.exe 60
-
-
-# CONCURRENTQUEUE shall point to the directory where the bin/build/inc/obj/src directories are
-# The library shall be built.
-bench-concurrentqueue:
-	@if test -n "$${CONCURRENTQUEUE}" ; then $(MAKE) bench-concurrentqueue0 ; else echo "Nothing to be done for CONCURRENTQUEUE." ; fi
-bench-concurrentqueue0:
-	$(CXX) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -I "$${CONCURRENTQUEUE}/" bench-concurrentqueue.cpp common.c -DMULTI_THREAD_MEASURE  -o bench-concurrentqueue.exe -lpthread
-	@./bench-concurrentqueue.exe 60
-
-
-# XXHASH shall point to the source directory of xxhash
-# The library shall be built.
-bench-xxhash:
-	@if test -n "$${XXHASH}" ; then $(MAKE) bench-xxhash0 ; else echo "Nothing to be done for XXHASH." ; fi
-bench-xxhash0:
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -I "$${XXHASH}/" bench-xxhash.c common.c "$${XXHASH}/libxxhash.a" -o bench-xxhash.exe
-	@./bench-xxhash.exe 70
-
-# BOOST shall point to the header location.
-bench-boost:
-	@if test -n "$${BOOST}" ; then $(MAKE) bench-boost0 ; else echo "Nothing to be done for BOOST." ; fi
-bench-boost0:
-	$(CXX) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -I "$${BOOST}" bench-boost.cpp common.c -DMULTI_THREAD_MEASURE -o bench-boost.exe -lpthread
-	@./bench-boost.exe 60
-
-# NEDTRIES shall point to the header location.
-bench-nedtries:
-	@if test -n "$${NEDTRIES}" ; then $(MAKE) bench-nedtries0 ; else echo "Nothing to be done for NEDTRIES." ; fi
-bench-nedtries0:
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -I "$${NEDTRIES}" bench-nedtries.c common.c -o bench-nedtries.exe
-	@./bench-nedtries.exe 40
-	@./bench-nedtries.exe 45
-
-# RIGTORP_HASHMAP shall point to the directory where the headers are
-bench-rigtorp-hashmap:
-	@if test -n "$${RIGTORP_HASHMAP}" ; then $(MAKE) bench-rigtorp-hashmap0 ; else echo "Nothing to be done for RIGTORP_HASHMAP." ; fi
-
-bench-rigtorp-hashmap0:
-	$(CXX) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -I "$${RIGTORP_HASHMAP}/include" bench-rigtorp-hashmap.cpp common.c -o bench-rigtorp-hashmap.exe
-	@./bench-rigtorp-hashmap.exe 42
-	@./bench-rigtorp-hashmap.exe 41
-	@./bench-rigtorp-hashmap.exe 43
-
-# RIGTORP_MPMC_QUEUE shall point to the directory where the headers are
-bench-rigtorp-mpmc-queue:
-	@if test -n "$${RIGTORP_MPMC_QUEUE}" ; then $(MAKE) bench-rigtorp-mpmc-queue0 ; else echo "Nothing to be done for RIGTORP_MPMC_QUEUE." ; fi
-bench-rigtorp-mpmc-queue0:
-	$(CXX) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -I "$${RIGTORP_MPMC_QUEUE}" bench-rigtorp-mpmcqueue.cpp common.c -DMULTI_THREAD_MEASURE -o bench-mpmcqueue.exe -lpthread
-	@./bench-mpmcqueue.exe 60
-
-# CTL shall point to the source directory (not where the headers are)
-bench-ctl:
-	@if test -n "$${CTL}" ; then $(MAKE) bench-ctl0 ; else echo "Nothing to be done for CTL." ; fi
-
-bench-ctl0:
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -I $${CTL} bench-ctl.c common.c -o bench-ctl.exe
-	@./bench-ctl.exe 10
-	@./bench-ctl.exe 20
-	@./bench-ctl.exe 30
-	@./bench-ctl.exe 40
-	@./bench-ctl.exe 50
-
-############################################################################
-
-bench-mlib-json: bench-mlib
-	@./bench-mlib.exe 110
-	@./bench-mlib.exe 111
-	@./bench-mlib.exe 112
-
-bench-rapidjson:
-	@if test -n "$${RAPIDJSON}" ; then $(MAKE) bench-rapidjson0 ; else echo "Nothing to be done for RAPIDJSON." ; fi
-bench-rapidjson0:
-	$(CXX) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -I "$${RAPIDJSON}/" bench-rapidjson.cpp common.c -o bench-rapidjson.exe
-	@./bench-rapidjson.exe 110
-	@./bench-rapidjson.exe 111
-	@./bench-rapidjson.exe 112
-
-############################################################################
-
-bench-plain:
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) bench-plain-c.c -o bench-plain-c.exe
-	@./bench-plain-c.exe
-
-############################################################################
-
-bench-mempool:
-	@if test -n "$${BOOST}" ; then if test -n "$${GLIB}" ; then make bench-mempool0 BENCH_DEF="-DUSE_BOOST -DUSE_GLIB `pkg-config --libs --cflags glib-2.0` -lboost_system"  ; else make bench-mempool0 BENCH_DEF="-DUSE_BOOST -lboost_system" ; fi ; else if test -n "$${GLIB}" ; then make bench-mempool0 BENCH_DEF="-DUSE_GLIB `pkg-config --libs --cflags glib-2.0`"  ; else make bench-mempool0 ; fi ; fi
-bench-mempool0:
-	$(CXX) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) pool.cc  $(BENCH_DEF) -o bench-mempool.exe
-	@./bench-mempool.exe
-
-############################################################################
-
-bench-maxdict:
-	$(CC) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) max-dict.c -o bench-max-dict.exe
-	@./bench-max-dict.exe
-
-############################################################################
-
-# BSTRLIB shall point to the BSTRLIB sources
-# LIBSRT shall point to the LIBSRT install directory
-bench-string:
-	@if test -n "$${BSTRLIB}" ; then $(MAKE) bench-string-step1 BENCH_DEF="-DBENCH_CAN_USE_BSTRLIB -I ${BSTRLIB} $${BSTRLIB}/obj/bstrlib.o $${BSTRLIB}/obj/bstraux.o $${BSTRLIB}/obj/bstrwrap.o" ; else $(MAKE) bench-string-step1 ; fi
-
-bench-string-step1:
-	@if test -n "$${LIBSRT}" ; then $(MAKE) bench-string-step2 BENCH_DEF="$(BENCH_DEF) -DBENCH_CAN_USE_LIBSRT -I$${LIBSRT}/include/libsrt $${LIBSRT}/lib/libsrt.a" ; else $(MAKE) bench-string-step2 BENCH_DEF="$(BENCH_DEF)"; fi
-
-#NOTE: Need to build by hand sds.o since it is not build by default and sds.c is not compatible with C++
-bench-string-step2:
-	@if test -n "$${SDS}" ; then $(MAKE) bench-string-step4 BENCH_DEF="$(BENCH_DEF) -fpermissive -DBENCH_CAN_USE_SDS -I$${SDS}/ $${SDS}/sds.o" ; else $(MAKE) bench-string-step4 BENCH_DEF="$(BENCH_DEF)"; fi
-
-bench-string-step4:
-	@if test -n "$${GLIB}" ; then $(MAKE) bench-string-step5 BENCH_DEF="$(BENCH_DEF) -DBENCH_CAN_USE_GLIB $$(pkg-config --cflags --libs glib-2.0)" ; else $(MAKE) bench-string-step5 BENCH_DEF="$(BENCH_DEF)"; fi
-
-bench-string-step5:
-	$(CXX) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -DBENCH_CAN_USE_STL -DBENCH_CAN_USE_MSTARLIB bench-string.cpp common.c $(BENCH_DEF) -o bench-string.exe 
-	$(CXX) $(CFLAGS) $(XCFLAGS) $(CPPFLAGS) -DBENCH_CAN_USE_STL -DBENCH_CAN_USE_MSTARLIB bench-string-2.cpp common.c $(BENCH_DEF) -o bench-string-2.exe 
-	@./bench-string.exe
-	@./bench-string-2.exe  2000000 0
-	@./bench-string-2.exe  2000000 1
-	@./bench-string-2.exe  2000000 2
-	@./bench-string-2.exe  2000000 4
-
-bench-string-pgo:
-	$(MAKE) bench-string XCFLAGS="-fprofile-generate=pgo"
-	$(MAKE) bench-string XCFLAGS="-fprofile-use=pgo"
-
-############################################################################
-
-bench-find-sort:
-	g++ bench-find-sort.cpp -O2 -march=native -std=c++11 -I.. -g common.c -o bench-find-sort.exe
-	./bench-find-sort.exe 10000000
-
-############################################################################
-
-clean:
-	$(RM) *.o bench-*.exe
-	$(RM) bench-*.s *~ massif.out.*
-	$(RM) plot-*.dat
-	$(RM) pgo
-	$(RM) tmp-serial.*
-	cd nucleotide && $(MAKE) clean
-
-############################################################################
-
-massif-do: all
-	@valgrind --tool=massif ./bench-mlib.exe $(N)
-	@valgrind --tool=massif ./bench-mlib-mempool.exe $(N)
-	@valgrind --tool=massif ./bench-stl.exe $(N)
-	@valgrind --tool=massif ./bench-qt.exe $(N)
-	@valgrind --tool=massif ./bench-glib.exe $(N)
-	@test -f ./bench-klib.exe && valgrind --tool=massif ./bench-klib.exe $(N)
-	@test -f ./bench-libdynamic.exe && valgrind --tool=massif ./bench-libdynamic.exe $(N)
-
-massif-visu:
-	test -f massif.out.* || $(MAKE) massif-do
-	for i in massif.out.* ; do ms_print $$i|head -30 ; done
@@ -1,96 +0,0 @@
-#define NDEBUG
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-
-#include <boost/lockfree/queue.hpp>
-
-#include "common.h"
-
-/********************************************************************************************/
-boost::lockfree::queue<unsigned int, boost::lockfree::capacity<4*64>> g_buff;
-boost::lockfree::queue<unsigned long long, boost::lockfree::capacity<4*64>> g_final;
-
-static void final(void *arg)
-{
-  size_t *p_n = (size_t*) arg;
-  size_t    n = *p_n;
-  unsigned long long j, s = 0;
-  for(unsigned int i = 0; i < n;i++) {
-    while (!g_final.pop(j));
-    s += j;
-  }
-  g_result = s;
-}
-
-static void conso(void *arg)
-{
-  unsigned int j;
-  size_t *p_n = (size_t*)arg;
-  size_t n = *p_n;
-  unsigned long long s = 0;
-  for(unsigned int i = 0; i < n;i++) {
-    while (!g_buff.pop(j));
-    s += j;
-  }
-  while (!g_final.push(s));
-}
-
-static void prod(void *arg)
-{
-  size_t *p_n = (size_t*)arg;
-  size_t n = *p_n;
-  size_t r = n;
-  for(unsigned int i = 0; i < n;i++) {
-    while (!g_buff.push(r));
-    r = r * 31421U + 6927U;
-  }
-}
-
-static void test_queue(size_t n)
-{
-  const int cpu_count   = get_cpu_count();
-  const int prod_count  = cpu_count/2;
-  const int conso_count = cpu_count - prod_count;
-  if (cpu_count < 2) {
-    fprintf(stderr, "WARNING: Can not measure Buffer performance.\n");
-    return;
-  }
-  rand_get();
-  // Create thread
-  m_thread_t idx_p[prod_count];
-  m_thread_t idx_c[conso_count];
-  m_thread_t idx_final;
-  for(int i = 0; i < prod_count; i++) {
-    m_thread_create (idx_p[i], prod, &n);
-  }
-  for(int i = 0; i < conso_count; i++) {
-    m_thread_create (idx_c[i], conso, &n);
-  }
-  size_t n2 = conso_count;
-  m_thread_create(idx_final, final, &n2);
-
-  // Wait for jobs to be done.
-  for(int i = 0; i < prod_count; i++) {
-    m_thread_join(idx_p[i]);
-  }
-  for(int i = 0; i < conso_count; i++) {
-    m_thread_join(idx_c[i]);
-  }
-  m_thread_join(idx_final);
-
-}
-
-
-/********************************************************************************************/
-
-const config_func_t table[] = {
-  { 60,    "Queue MPMC", 1000000, 0, test_queue, 0}
-};
-
-int main(int argc, const char *argv[])
-{
-  test("BOOST-LOCKFREE", numberof(table), table, argc, argv);
-  exit(0);
-}
@@ -1,204 +0,0 @@
-#define NDEBUG
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-
-#include "macro_collections.h"
-
-#include "common.h"
-
-/********************************************************************************************/
-
-// CMC list are dynamic array
-#define MY_LIST_PARAMS (list_uint, list_uint_s, , , unsigned int)
-C_MACRO_COLLECTIONS_EXTENDED(CMC, LIST, MY_LIST_PARAMS, (STR))
-
-struct list_uint_s_fval list_fval = { .cmp = NULL,
-				      .cpy = NULL,
-				      .str = NULL,
-				      .free = NULL,
-				      .hash = NULL,
-				      .pri = NULL };
-
-static void test_array(size_t n)
-{
-  struct list_uint_s *a1 = list_uint_new(1, &list_fval);
-  struct list_uint_s *a2 = list_uint_new(1, &list_fval);
-  
-  for(size_t i = 0; i < n; i++) {
-    list_uint_push_back(a1, rand_get() );
-    list_uint_push_back(a2, rand_get() );
-  }
-  
-  unsigned int s = 0;
-  for(unsigned long i = 0; i < n; i++) {
-    s += list_uint_get(a1, i ) * list_uint_get(a2, i );
-  }
-  g_result = s;
-  
-  list_uint_free(a1);
-  list_uint_free(a2);
-}
-
-/********************************************************************************************/
-
-#define my_cmp(a,b) ( (a) < (b) ? -1 : (a) > (b) )
-
-#define MY_TMAP_PARAMS (tree_ulong, tree_ulong_s, , unsigned long, bool)
-C_MACRO_COLLECTIONS_EXTENDED(CMC, TREEMAP, MY_TMAP_PARAMS, (STR))
-
-int cmp_ulong(unsigned long a, unsigned long b) { return my_cmp(a,b); }
-
-struct tree_ulong_s_fkey tree_fkey = { .cmp = cmp_ulong,
-				       .cpy = NULL,
-				       .str = NULL,
-				       .free = NULL,
-				       .hash = NULL,
-				       .pri = NULL };
-
-struct tree_ulong_s_fval tree_fval = { .cmp = NULL,
-				       .cpy = NULL,
-				       .str = NULL,
-				       .free = NULL,
-				       .hash = NULL,
-				       .pri = NULL };
-
-static void test_rbtree(size_t n)
-{
-  struct tree_ulong_s *tree;
-  tree = tree_ulong_new(&tree_fkey, &tree_fval);
-
-  for (size_t i = 0; i < n; i++) {
-    unsigned long j = rand_get();
-    tree_ulong_insert(tree, j, true);
-  }
-    
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    unsigned long j = rand_get();
-    if (tree_ulong_get_ref(tree, j) != 0)
-      s+= j;
-  }
-  g_result = s;
-  tree_ulong_free(tree);
-}
-
-/********************************************************************************************/
-#define hash_func(a) kh_int64_hash_func(a)
-size_t hash_ulong(unsigned long a)
-{
-  return ( (a) >> 33 ) ^ (a) ^ ((a) << 11);
-}
-
-#define MY_DICT_PARAMS (hmap, hmap_s, , unsigned long, unsigned long)
-C_MACRO_COLLECTIONS_EXTENDED(CMC, HASHMAP, MY_DICT_PARAMS, (STR))
-
-struct hmap_s_fkey hmap_fkey = { .cmp = cmp_ulong,
-				 .cpy = NULL,
-				 .str = NULL,
-				 .free = NULL,
-				 .hash = hash_ulong,
-				 .pri = NULL };
-
-struct hmap_s_fval hmap_fval = { .cmp = NULL,
-				 .cpy = NULL,
-				 .str = NULL,
-				 .free = NULL,
-				 .hash = NULL,
-				 .pri = NULL };
-
-static void
-test_dict(size_t  n)
-{
-  struct hmap_s *dict = hmap_new(16, 0.7, &hmap_fkey, &hmap_fval);
-  
-  for (size_t i = 0; i < n; i++) {
-    hmap_insert(dict, rand_get(), rand_get());
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    unsigned long *val = hmap_get_ref(dict, rand_get());
-    if (val != 0)
-      s += *val;
-  }
-  g_result = s;
-  
-  hmap_free(dict);
-}
-
-/********************************************************************************************/
-
-#if 0 // Not working issue in using not integer types
-
-typedef struct {
-  char a[256];
-} char_array_t;
-static inline int char_cmp (const char_array_t a, const char_array_t b) { return strcmp(a.a,b.a); }
-static inline size_t char_hash(const char_array_t a) {
-  size_t hash = 0;
-  const char *s = a.a;
-  while (*s) hash = hash * 31421 + (*s++) + 6927;
-  return hash;
-}
-
-#define MY_DICTB_PARAMS (bhmap, bhmap_s, , char_array_t, char_array_t)
-C_MACRO_COLLECTIONS_EXTENDED(CMC, HASHMAP, MY_DICT_PARAMS, (STR))
-
-struct bhmap_s_fkey bhmap_fkey = { .cmp = char_cmp,
-				   .cpy = NULL,
-				   .str = NULL,
-				   .free = NULL,
-				   .hash = char_hash,
-				   .pri = NULL };
-
-struct bhmap_s_fval bhmap_fval = { .cmp = NULL,
-				 .cpy = NULL,
-				 .str = NULL,
-				 .free = NULL,
-				 .hash = NULL,
-				 .pri = NULL };
-
-static void
-test_dict_big(size_t  n)
-{
-  struct bhmap_s *dict = bhmap_new(16, 0.7, &bhmap_fkey, &bhmap_fval);
-  
-  for (size_t i = 0; i < n; i++) {
-    char_array_t s1, s2;
-    sprintf(s1.a, "%u", rand_get());
-    sprintf(s2.a, "%u", rand_get());
-    bhmap_insert(dict, s1, s2);
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    char_array_t s1;
-    sprintf(s1.a, "%u", rand_get() );
-    char_array_t *val = bhmap_get_ref(dict, s1);
-    if (val != 0)
-      s ++;
-  }
-  g_result = s;
-  
-  bhmap_free(dict);
-}
-#endif
-
-/********************************************************************************************/
-
-const config_func_t table[] = {
-  { 20,   "Array", 100000000, 0, test_array, 0},
-  { 30,  "Rbtree", 1000000, 0, test_rbtree, 0},
-  { 40,    "dict", 1000000, 0, test_dict, 0},
-  //{ 41, "dictBig", 1000000, 0, test_dict_big, 0},
-};
-
-int main(int argc, const char *argv[])
-{
-  test("CMC", numberof(table), table, argc, argv);
-  exit(0);
-}
-
@@ -1,266 +0,0 @@
-#define NDEBUG
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-
-#include "array.h"
-#include "slist.h"
-#include "treetable.h"
-#include "hashtable.h"
-
-#include "common.h"
-
-/********************************************************************************************/
-
-static void test_array(size_t n)
-{
-  Array *a1, *a2;
-  enum cc_stat stat;
-
-  stat = array_new(&a1);
-  if (stat != CC_OK) abort();
-  stat = array_new(&a2);
-  if (stat != CC_OK) abort();
-  
-  for(size_t i = 0; i < n; i++) {
-    stat = array_add(a1, (void*) (uintptr_t)rand_get() );
-    if (stat != CC_OK) abort();
-    stat = array_add(a2, (void*) (uintptr_t)rand_get() );
-    if (stat != CC_OK) abort();
-  }
-  unsigned int s = 0;
-  for(unsigned long i = 0; i < n; i++) {
-    void *e, *f;
-    stat = array_get_at(a1, i, &e);
-    if (stat != CC_OK) abort();
-    stat = array_get_at(a2, i, &f);
-    if (stat != CC_OK) abort();
-    s += ((unsigned int)(uintptr_t) e) * ((unsigned int)(uintptr_t) f);
-  }
-  g_result = s;
-
-  array_destroy(a1);
-  array_destroy(a2);
-}
-
-/********************************************************************************************/
-
-static void test_list(size_t n)
-{
-  SList *a1, *a2;
-  enum cc_stat stat;
-
-  stat = slist_new(&a1);
-  if (stat != CC_OK) abort();
-  stat = slist_new(&a2);
-  if (stat != CC_OK) abort();
-  
-  for(size_t i = 0; i < n; i++) {
-    stat = slist_add(a1, (void*) (uintptr_t)rand_get() );
-    if (stat != CC_OK) abort();
-    stat = slist_add(a2, (void*) (uintptr_t)rand_get() );
-    if (stat != CC_OK) abort();
-  }
-  unsigned int s = 0;
-  SListIter iter1, iter2;
-    void *e, *f;
-  slist_iter_init(&iter1, a1);
-  slist_iter_init(&iter2, a2);
-  while (slist_iter_next(&iter1, &e) == CC_OK && slist_iter_next(&iter2, &f) == CC_OK) {
-    s += ((unsigned int)(uintptr_t) e) * ((unsigned int)(uintptr_t) f);
-  }
-  g_result = s;
-
-  slist_destroy(a1);
-  slist_destroy(a2);
-}
-
-/********************************************************************************************/
-
-static int compare(const void *a, const void *b)
-{
-  const uintptr_t pa = (uintptr_t) a;
-  const uintptr_t pb = (uintptr_t) b;
-  return (pa < pb) ? -1 : (pa > pb);
-}
-
-static void test_rbtree(size_t n)
-{
-  TreeTable *tree;
-  enum cc_stat stat;
-
-  stat = treetable_new(compare, &tree);
-  if (stat != CC_OK) abort();
-  for (size_t i = 0; i < n; i++) {
-    void *key = (void*)(uintptr_t) rand_get();
-    stat = treetable_add(tree, key, key);
-    if (stat != CC_OK) abort();
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    void *e;
-    void *key = (void*) (uintptr_t) rand_get();
-    stat = treetable_get(tree, key, &e);
-    if (stat == CC_OK)
-      s += (uintptr_t)e;
-  }
-  g_result = s;
-  treetable_destroy(tree);
-}
-
-/********************************************************************************************/
-static size_t hash_func (const void *key, int l, uint32_t seed)
-{
-  const unsigned long pa = (uintptr_t) key;
-  (void)l;
-  return pa ^ seed;
-}
-
-static int equal_func(const void *key1, const void *key2)
-{
-  const unsigned long pa = (uintptr_t) key1;
-  const unsigned long pb = (uintptr_t) key2;
-  return (pa < pb) ? -1 : pa > pb;
-}
-
-static void
-test_dict(size_t  n)
-{
-  HashTable *dict;
-  enum cc_stat stat;
-  HashTableConf htc;
-  hashtable_conf_init(&htc);
-  htc.hash = hash_func;
-  htc.key_compare = equal_func;
-  stat = hashtable_new_conf(&htc, &dict);
-  if (stat != CC_OK) abort();
-  
-  for (size_t i = 0; i < n; i++) {
-    void *value = (void*)(uintptr_t) rand_get();
-    void *key = (void*)(uintptr_t) rand_get();
-    stat = hashtable_add(dict, key, value );
-    if (stat != CC_OK) abort();
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    void *key = (void*)(uintptr_t) rand_get();
-    void *r;
-    stat = hashtable_get(dict, key, &r);
-    if (stat == CC_OK)
-      s += (uintptr_t) r;
-  }
-  g_result = s;
-  hashtable_destroy(dict);
-}
-
-/********************************************************************************************/
-
-typedef char char_array_t[256];
-
-static int char_equal (const void* a, const void * b)
-{
-  const char_array_t *pa = (const char_array_t *)a;
-  const char_array_t *pb = (const char_array_t *)b;
-  return strcmp(*pa,*pb);
-}
-
-static size_t char_hash(const void *a, int l, uint32_t seed)
-{
-  const char_array_t *pa = (const char_array_t *)a;
-  const char *s = *pa;
-  (void)l ;
-  size_t hash = seed;
-  while (*s) hash = hash * 31421 + (*s++) + 6927;
-  return hash;
-}
-
-static void
-test_dict_big(size_t  n)
-{
-  HashTable *dict;
-  enum cc_stat stat;
-  HashTableConf htc;
-  hashtable_conf_init(&htc);
-  htc.hash = char_hash;
-  htc.key_compare = char_equal;
-  stat = hashtable_new_conf(&htc, &dict);
-  if (stat != CC_OK) abort();
-
-  char_array_t **tab = malloc (sizeof(char_array_t *)*2*n);
-  if (!tab) abort();
-  size_t cpt = 0;
-  for (size_t i = 0; i < n; i++) {
-    char_array_t *key = malloc (sizeof (char_array_t));
-    char_array_t *value = malloc (sizeof (char_array_t));
-    tab[cpt++] = key;
-    tab[cpt++] = value;
-    sprintf(*key, "%u", rand_get());
-    sprintf(*value, "%u", rand_get());
-    stat = hashtable_add(dict, key, value );
-    if (stat != CC_OK) abort();
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    char_array_t s1;
-    void *r;
-    sprintf(s1, "%u", rand_get());
-    stat = hashtable_get(dict, s1, &r);
-    if (stat == CC_OK)
-      s ++;
-  }
-  g_result = s;
-  hashtable_destroy(dict);
-  if (cpt != 2*n) abort();
-  for(size_t i = 0; i < 2*n;i++)
-    free(tab[i]);
-}
-
-/********************************************************************************************/
-
-static int cmp_float(const void * a, const void *b)
-{
-  const float *const*pa = a, *const*pb = b;
-  return (**pa < **pb) ? -1 : (**pa > **pb);
-}
-
-static void test_sort(size_t n)
-{
-  Array *a1;
-  enum cc_stat stat;
-
-  stat = array_new(&a1);
-  if (stat != CC_OK) abort();
-  for(size_t i = 0; i < n; i++) {
-    float *v = malloc(sizeof(float));
-    *v = rand_get();
-    stat = array_add(a1, v );
-    if (stat != CC_OK) abort();
-  }
-  array_sort(a1, cmp_float);
-  void *e;
-  stat = array_get_at(a1, 0, &e);
-  if (stat != CC_OK) abort();
-  g_result = *(float*)e;
-  array_destroy(a1);
-}
-
-/********************************************************************************************/
-
-const config_func_t table[] = {
-  { 10,    "List", 10000000, 0, test_list, 0},
-  { 20,   "Array", 100000000, 0, test_array, 0},
-  { 30,  "Rbtree", 1000000, 0, test_rbtree, 0},
-  { 40,    "dict", 1000000, 0, test_dict, 0},
-  { 41, "dictBig", 1000000, 0, test_dict_big, 0},
-  { 50,           "Sort",10000000, 0, test_sort, 0},
-};
-
-int main(int argc, const char *argv[])
-{
-  test("CollectionC", numberof(table), table, argc, argv);
-  exit(0);
-}
@@ -1,96 +0,0 @@
-#define NDEBUG
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-
-#include "concurrentqueue.h"
-
-#include "common.h"
-
-/********************************************************************************************/
-moodycamel::ConcurrentQueue<unsigned int> g_buff;
-moodycamel::ConcurrentQueue<unsigned long long> g_final;
-
-static void final(void *arg)
-{
-  size_t *p_n = (size_t*) arg;
-  size_t    n = *p_n;
-  unsigned long long j, s = 0;
-  for(unsigned int i = 0; i < n;i++) {
-    while (!g_final.try_dequeue(j));
-    s += j;
-  }
-  g_result = s;
-}
-
-static void conso(void *arg)
-{
-  unsigned int j;
-  size_t *p_n = (size_t*)arg;
-  size_t n = *p_n;
-  unsigned long long s = 0;
-  for(unsigned int i = 0; i < n;i++) {
-    while (!g_buff.try_dequeue(j));
-    s += j;
-  }
-  while (!g_final.try_enqueue(s));
-}
-
-static void prod(void *arg)
-{
-  size_t *p_n = (size_t*)arg;
-  size_t n = *p_n;
-  size_t r = n;
-  for(unsigned int i = 0; i < n;i++) {
-    while (!g_buff.try_enqueue(r));
-    r = r * 31421U + 6927U;
-  }
-}
-
-static void test_queue(size_t n)
-{
-  const int cpu_count   = get_cpu_count();
-  const int prod_count  = cpu_count/2;
-  const int conso_count = cpu_count - prod_count;
-  if (cpu_count < 2) {
-    fprintf(stderr, "WARNING: Can not measure Buffer performance.\n");
-    return;
-  }
-  rand_get();
-  // Create thread
-  m_thread_t idx_p[prod_count];
-  m_thread_t idx_c[conso_count];
-  m_thread_t idx_final;
-  for(int i = 0; i < prod_count; i++) {
-    m_thread_create (idx_p[i], prod, &n);
-  }
-  for(int i = 0; i < conso_count; i++) {
-    m_thread_create (idx_c[i], conso, &n);
-  }
-  size_t n2 = conso_count;
-  m_thread_create(idx_final, final, &n2);
-
-  // Wait for jobs to be done.
-  for(int i = 0; i < prod_count; i++) {
-    m_thread_join(idx_p[i]);
-  }
-  for(int i = 0; i < conso_count; i++) {
-    m_thread_join(idx_c[i]);
-  }
-  m_thread_join(idx_final);
-
-}
-
-
-/********************************************************************************************/
-
-const config_func_t table[] = {
-  { 60,    "Queue MPMC", 1000000, 0, test_queue, 0}
-};
-
-int main(int argc, const char *argv[])
-{
-  test("CONCURRENT-QUEUE", numberof(table), table, argc, argv);
-  exit(0);
-}
@@ -1,182 +0,0 @@
-#define NDEBUG
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-
-#include "m-core.h"
-#include "common.h"
-
-typedef unsigned int uint;
-typedef unsigned long ulong;
-
-/********************************************************************************************/
-#define POD
-#define T uint
-#include "ctl/vector.h"
-
-static void test_array(size_t n)
-{
-  vec_uint a1 = vec_uint_init();
-  vec_uint a2 = vec_uint_init();
-  
-  for(size_t i = 0; i < n; i++) {
-    vec_uint_push_back(&a1, rand_get() );
-    vec_uint_push_back(&a2, rand_get() );
-  }
-  unsigned int s = 0;
-  for(unsigned long i = 0; i < n; i++) {
-    s += *vec_uint_at(&a1, i ) * *vec_uint_at(&a2, i );
-  }
-  g_result = s;
-
-  vec_uint_free(&a1);
-  vec_uint_free(&a2);
-}
-
-/********************************************************************************************/
-
-#define POD
-#define T uint
-#include "ctl/forward_list.h"
-
-static void test_list (size_t n)
-{
-  slist_uint a1 = slist_uint_init();
-  slist_uint a2 = slist_uint_init();
-
-  for(size_t i = 0; i < n; i++) {
-    slist_uint_push_front(&a1, rand_get());
-    slist_uint_push_front(&a2, rand_get());
-  }
-  unsigned int s = 0;
-  slist_uint_it it1 = slist_uint_begin(&a1);
-  slist_uint_it it2 = slist_uint_begin(&a2);
-  for( ; !slist_uint_it_done(&it1) ;
-       slist_uint_it_next(&it1), slist_uint_it_next(&it2)) {
-    s += *slist_uint_it_ref(&it1) * *slist_uint_it_ref(&it2);
-  }
-  g_result = s;
-
-  slist_uint_free(&a1);
-  slist_uint_free(&a2);
-}
-
-/********************************************************************************************/
-
-#define POD
-#define T ulong
-#include "ctl/set.h"
-
-static inline int
-int_cmp(ulong *a, ulong *b) {
-  return *a < *b;
-}
-
-static void test_rbtree(size_t n)
-{
-  set_ulong tree = set_ulong_init (int_cmp);
-  
-  for (size_t i = 0; i < n; i++) {
-    set_ulong_insert (&tree, rand_get() );
-  }
-    
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    unsigned long j = rand_get();
-    if (set_ulong_find_node(&tree, j) != NULL)
-      s+= j;
-  }
-  g_result = s;
-  set_ulong_free(&tree);
-}
-
-/********************************************************************************************/
-
-typedef struct {
-  unsigned long key;
-  unsigned long value;
-} pair_ulong;
-
-// Use of M*LIB hash function
-static inline size_t
-pair_ulong_hash(pair_ulong *a)
-{
-  return M_HASH_DEFAULT(a->key);
-}
-
-static inline int
-pair_ulong_equal(pair_ulong *a, pair_ulong *b)
-{
-  return a->key == b->key;
-}
-
-static inline void
-pair_ulong_free(pair_ulong *a) {
-  (void) a;
-}
-
-static inline pair_ulong
-pair_ulong_copy(pair_ulong *self) {
-  return (pair_ulong) { .key = self->key, .value = self->value };
-}
-
-#define T pair_ulong
-#include <ctl/unordered_map.h>
-
-// It seems broken: it doesn't output the expected result.
-static void
-test_dict(size_t  n)
-{
-  umap_pair_ulong dict = umap_pair_ulong_init(pair_ulong_hash, pair_ulong_equal);
-  
-  for (size_t i = 0; i < n; i++) {
-    umap_pair_ulong_insert(&dict, (pair_ulong) { rand_get(), rand_get() });
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    umap_pair_ulong_it it = umap_pair_ulong_find(&dict, (pair_ulong) { rand_get() , 0 } );
-    if (!umap_pair_ulong_it_done(&it) )
-      s += it.ref->value;
-  }
-  g_result = s;
-
-  umap_pair_ulong_free(&dict);
-}
-
-/********************************************************************************************/
-
-#define POD
-#define T float
-#include "ctl/vector.h"
-
-static void test_sort(size_t n)
-{
-  vec_float a1 = vec_float_init();
-
-  for(size_t i = 0; i < n; i++) {
-    vec_float_push_back(&a1, rand_get());
-  }
-  vec_float_sort(&a1);
-  g_result = *vec_float_at(&a1, 0);
-  vec_float_free(&a1);
-}
-
-/********************************************************************************************/
-
-const config_func_t table[] = {
-  { 10,    "List",  10000000, 0, test_list, 0},
-  { 20,   "Array", 100000000, 0, test_array, 0},
-  { 30,  "Rbtree",   1000000, 0, test_rbtree, 0},
-  { 40,    "dict",   1000000, 0, test_dict, 0},
-  { 50,    "Sort",  10000000, 0, test_sort, 0},
-};
-
-int main(int argc, const char *argv[])
-{
-  test("CTL", numberof(table), table, argc, argv);
-  exit(0);
-}
-
@@ -1,144 +0,0 @@
-#define NDEBUG
-
-#include <vector>
-#include <list>
-#include <iterator>
-#include <map>
-#include <set>
-#include <unordered_map>
-#include <algorithm>
-#include <string>
-#include <sstream>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <string.h>
-
-#include <google/dense_hash_map>
-
-using google::dense_hash_map;
-using namespace std;
-
-#include "common.h"
-
-/********************************************************************************************/
-
-static void
-test_dict2(size_t  n)
-{
-  dense_hash_map<unsigned long, unsigned long> dict;
-  dict.set_empty_key(-1);
-  dict.set_deleted_key(-2);
-
-  for (size_t i = 0; i < n; i++) {
-    dict[rand_get()] = rand_get();
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    dense_hash_map<unsigned long, unsigned long>::iterator it = dict.find(rand_get());
-    if (it != dict.end())
-      s += it->second;
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-
-struct char_array_s {
-  char a[256];
-  char_array_s () { a[0] = 0 ; }
-  char_array_s ( const char_array_s & other) { strcpy(a, other.a); }
-  bool operator==(const char_array_s &other) const { return strcmp(a, other.a) == 0; }
-};
-
-namespace std {
-  template <> struct hash<char_array_s> {
-    std::size_t operator()(const char_array_s &k) const {
-      size_t hash = 0;
-      const char *s = k.a;
-      while (*s) hash = hash * 31421 + (*s++) + 6927;
-      return hash;
-    };
-  };
-  namespace tr1 {
-    template <> struct hash<char_array_s> {
-      std::size_t operator()(char_array_s k) const {
-	size_t hash = 0;
-	const char *s = k.a;
-	while (*s) hash = hash * 31421 + (*s++) + 6927;
-	return hash;
-      };
-    };
-  }
-}
-
-static void
-test_dict_big(size_t  n)
-{
-  dense_hash_map<char_array_s, char_array_s> dict;
-  struct char_array_s empty, del;
-  memset(&empty, 0, sizeof empty);  empty.a[1] = 255;
-  memset(&del, 0, sizeof del);  del.a[1] = 255;
-  dict.set_empty_key(empty);
-  dict.set_deleted_key(del);
-
-  for (size_t i = 0; i < n; i++) {
-    char_array_s s1, s2;
-    sprintf(s1.a, "%u", rand_get());
-    sprintf(s2.a, "%u", rand_get());
-    dict[s1] = s2;
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    char_array_s s1;
-    sprintf(s1.a, "%u", rand_get());
-    dense_hash_map<char_array_s, char_array_s>::iterator it = dict.find(s1);
-    if (it != dict.end())
-      s ++;
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-static void
-test_dict_str(size_t  n)
-{
-  dense_hash_map<string, string> dict;
-  string empty, del;
-  empty = "";
-  del = "DEL";
-  dict.set_empty_key(empty);
-  dict.set_deleted_key(del);
-
-  for (size_t i = 0; i < n; i++) {
-    string s1 = static_cast<ostringstream*>( &(ostringstream() << rand_get()) )->str();
-    string s2 = static_cast<ostringstream*>( &(ostringstream() << rand_get()) )->str();
-    dict[s1] = s2;
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    string s1 = static_cast<ostringstream*>( &(ostringstream() << rand_get()) )->str();
-    dense_hash_map<string, string>::iterator it = dict.find(s1);
-    if (it != dict.end())
-      s ++;
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-
-const config_func_t table[] = {
-  { 41, "dictBig", 1000000, 0, test_dict_big, 0},
-  { 42,"dict", 1000000, 0, test_dict2, 0},
-  { 43,    "DictStr", 1000000, 0, test_dict_str, 0}
-};
-
-int main(int argc, const char *argv[])
-{
-  test("DENSE-HASPMAP", numberof(table), table, argc, argv);
-  exit(0);
-}
@@ -1,138 +0,0 @@
-#define NDEBUG
-
-#include <vector>
-#include <list>
-#include <iterator>
-#include <map>
-#include <set>
-#include <unordered_map>
-#include <algorithm>
-#include <string>
-#include <sstream>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <string.h>
-
-#include "emilib/hash_map.hpp"
-
-using namespace emilib;
-using namespace std;
-
-#include "common.h"
-
-/********************************************************************************************/
-
-static void
-test_dict2(size_t  n)
-{
-  HashMap<unsigned long, unsigned long> dict;
-  for (size_t i = 0; i < n; i++) {
-    dict[rand_get()] = rand_get();
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    HashMap<unsigned long, unsigned long>::iterator it = dict.find(rand_get());
-    if (it != dict.end())
-      s += it->second;
-  }
-  g_result = s;
-}
-
-static void
-test_dict2_linear(size_t  n)
-{
-  HashMap<unsigned long, unsigned long> dict;
-  for (size_t i = 0; i < n; i++) {
-    dict[i] = rand_get();
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    HashMap<unsigned long, unsigned long>::iterator it = dict.find(i);
-    if (it != dict.end())
-      s += it->second;
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-struct char_array_s {
-  char a[256];
-  char_array_s () { a[0] = 0 ; }
-  char_array_s ( const char_array_s & other) { strcpy(a, other.a); }
-  bool operator==(const char_array_s &other) const { return strcmp(a, other.a) == 0; }
-};
-
-namespace std {
-  template <> struct hash<char_array_s> {
-    std::size_t operator()(const char_array_s &k) const {
-      size_t hash = 0;
-      const char *s = k.a;
-      while (*s) hash = hash * 31421 + (*s++) + 6927;
-      return hash;
-    };
-  };
-}
-
-static void
-test_dict_big(size_t  n)
-{
-  HashMap<char_array_s, char_array_s> dict;
-
-  for (size_t i = 0; i < n; i++) {
-    char_array_s s1, s2;
-    sprintf(s1.a, "%u", rand_get());
-    sprintf(s2.a, "%u", rand_get());
-    dict[s1] = s2;
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    char_array_s s1;
-    sprintf(s1.a, "%u", rand_get());
-    HashMap<char_array_s, char_array_s>::iterator it = dict.find(s1);
-    if (it != dict.end())
-      s ++;
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-static void
-test_dict_str(size_t  n)
-{
-  HashMap<string, string> dict;
-
-  for (size_t i = 0; i < n; i++) {
-    string s1 = static_cast<ostringstream*>( &(ostringstream() << rand_get()) )->str();
-    string s2 = static_cast<ostringstream*>( &(ostringstream() << rand_get()) )->str();
-    dict[s1] = s2;
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    string s1 = static_cast<ostringstream*>( &(ostringstream() << rand_get()) )->str();
-    HashMap<string, string>::iterator it = dict.find(s1);
-    if (it != dict.end())
-      s ++;
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-
-const config_func_t table[] = {
-  { 41, "dictBig", 1000000, 0, test_dict_big, 0},
-  { 42,"dict", 1000000, 0, test_dict2, 0},
-  { 43,    "DictStr", 1000000, 0, test_dict_str, 0},
-  { 46,    "DictLinear", 1000000, 0, test_dict2_linear, 0}
-};
-
-int main(int argc, const char *argv[])
-{
-  test("EMILIB", numberof(table), table, argc, argv);
-  exit(0);
-}
@@ -1,101 +0,0 @@
-// program to find longest contiguous subsequence
-// based on https://www.geeksforgeeks.org/longest-consecutive-subsequence/
-#include <iostream>
-#include <unordered_set>
-
-using namespace std; 
-  
-// Returns length of the longest contiguous subsequence 
-int cpp_find_longest(int arr[], int n) 
-{ 
-  unordered_set<int> S; 
-  int ans = 0; 
-  
-  // Hash all the array elements 
-  for (int i = 0; i < n; i++) 
-    S.insert(arr[i]); 
-  
-  // check each possible sequence from 
-  // the start then update optimal length 
-  for (int i = 0; i < n; i++) { 
-    // if current element is the starting 
-    // element of a sequence 
-    if (S.find(arr[i] - 1) == S.end()) { 
-      // Then check for next elements 
-      // in the sequence 
-      int j = arr[i] + 1;
-      while (S.find(j) != S.end()) 
-        j++; 
-      
-      // update  optimal length if 
-      // this length is more 
-      ans = max(ans, j - arr[i]); 
-    } 
-  } 
-  return ans; 
-} 
-
-#include "m-dict.h"
-
-static inline bool oor_equal_p(int a, unsigned char c) { return a == ((c == 0) ? INT_MIN : INT_MAX); }
-static inline void oor_set(int *a, unsigned char c) { *a = ((c == 0) ? INT_MIN : INT_MAX); }
-
-DICT_OASET_DEF(dict_int, int, M_OPEXTEND(M_DEFAULT_OPLIST, OOR_EQUAL(oor_equal_p), OOR_SET(oor_set M_IPTR)))
-
-// Returns length of the longest contiguous subsequence 
-int mlib_find_longest(int arr[], int n) 
-{ 
-  dict_int_t S;
-  int ans = 0; 
-
-  dict_int_init(S);
-  
-  // Hash all the array elements 
-  for (int i = 0; i < n; i++) 
-    dict_int_push(S, arr[i]);
-  
-  // check each possible sequence from 
-  // the start then update optimal length 
-  for (int i = 0; i < n; i++) { 
-    // if current element is the starting 
-    // element of a sequence
-    int *p = dict_int_get(S, arr[i]-1);
-    if (p == NULL) {
-      // Then check for next elements 
-      // in the sequence 
-      int j = arr[i] + 1; 
-      while (dict_int_get(S, j) != NULL)
-        j++; 
-      
-      // update  optimal length if 
-      // this length is more 
-      ans = M_MAX(ans, j - arr[i]); 
-    } 
-  }
-
-  dict_int_clear(S);
-  return ans; 
-} 
-
-#include "common.h"
-
-int main(int argc, const char *argv[]) 
-{
-  int n = argc == 1 ? 10000 : atoi(argv[1]);
-  int *arr = (int*) malloc(n * sizeof(int));
-  for(int i = 0; i < n; i++)
-    arr[i] = rand_get();
-  
-  unsigned long long t0 = cputime();
-  cout << "Length of the Longest contiguous subsequence is "
-       << cpp_find_longest(arr, n) << endl; 
-  
-  unsigned long long t1 = cputime();
-  
-  cout << "Length of the Longest contiguous subsequence is "
-       << mlib_find_longest(arr, n) << endl;
-  unsigned long long t2 = cputime();
-  
-  cout << "Time C++: " << (t1-t0) << " Time M*LIB: " << (t2-t1) << endl;
-  return 0; 
-}
@@ -1,139 +0,0 @@
-// Need recent gcc
-#define NDEBUG
-
-#include <vector>
-#include <list>
-#include <iterator>
-#include <map>
-#include <set>
-#include <unordered_map>
-#include <algorithm>
-#include <string>
-#include <sstream>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <string.h>
-
-#include "flat_hash_map.hpp"
-
-using namespace ska;
-using namespace std;
-
-#include "common.h"
-
-/********************************************************************************************/
-
-static void
-test_dict2(size_t  n)
-{
-  flat_hash_map<unsigned long, unsigned long> dict;
-  for (size_t i = 0; i < n; i++) {
-    dict[rand_get()] = rand_get();
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    flat_hash_map<unsigned long, unsigned long>::iterator it = dict.find(rand_get());
-    if (it != dict.end())
-      s += it->second;
-  }
-  g_result = s;
-}
-
-static void
-test_dict2_linear(size_t  n)
-{
-  flat_hash_map<unsigned long, unsigned long> dict;
-  for (size_t i = 0; i < n; i++) {
-    dict[i] = rand_get();
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    flat_hash_map<unsigned long, unsigned long>::iterator it = dict.find(i);
-    if (it != dict.end())
-      s += it->second;
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-struct char_array_s {
-  char a[256];
-  char_array_s () { a[0] = 0 ; }
-  char_array_s ( const char_array_s & other) { strcpy(a, other.a); }
-  bool operator==(const char_array_s &other) const { return strcmp(a, other.a) == 0; }
-};
-
-namespace std {
-  template <> struct hash<char_array_s> {
-    std::size_t operator()(const char_array_s &k) const {
-      size_t hash = 0;
-      const char *s = k.a;
-      while (*s) hash = hash * 31421 + (*s++) + 6927;
-      return hash;
-    };
-  };
-}
-
-static void
-test_dict_big(size_t  n)
-{
-  flat_hash_map<char_array_s, char_array_s> dict;
-
-  for (size_t i = 0; i < n; i++) {
-    char_array_s s1, s2;
-    sprintf(s1.a, "%u", rand_get());
-    sprintf(s2.a, "%u", rand_get());
-    dict[s1] = s2;
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    char_array_s s1;
-    sprintf(s1.a, "%u", rand_get());
-    flat_hash_map<char_array_s, char_array_s>::iterator it = dict.find(s1);
-    if (it != dict.end())
-      s ++;
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-static void
-test_dict_str(size_t  n)
-{
-  flat_hash_map<string, string> dict;
-
-  for (size_t i = 0; i < n; i++) {
-    string s1 = static_cast<ostringstream*>( &(ostringstream() << rand_get()) )->str();
-    string s2 = static_cast<ostringstream*>( &(ostringstream() << rand_get()) )->str();
-    dict[s1] = s2;
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    string s1 = static_cast<ostringstream*>( &(ostringstream() << rand_get()) )->str();
-    flat_hash_map<string, string>::iterator it = dict.find(s1);
-    if (it != dict.end())
-      s ++;
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-
-const config_func_t table[] = {
-  { 41, "dictBig", 1000000, 0, test_dict_big, 0},
-  { 42,"dict", 1000000, 0, test_dict2, 0},
-  { 43,    "DictStr", 1000000, 0, test_dict_str, 0},
-  { 46,    "DictLinear", 1000000, 0, test_dict2_linear, 0}
-};
-
-int main(int argc, const char *argv[])
-{
-  test("FLAT-HASPMAP", numberof(table), table, argc, argv);
-  exit(0);
-}
@@ -1,202 +0,0 @@
-#define NDEBUG
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <string.h>
-
-#include <glib.h>
-
-#include "common.h"
-
-/********************************************************************************************/
-
-static void test_array(size_t n)
-{
-  GArray *a1, *a2;
-  a1 = g_array_new (FALSE, FALSE, sizeof (unsigned int));
-  a2 = g_array_new (FALSE, FALSE, sizeof (unsigned int));
-  for(size_t i = 0; i < n; i++) {
-    unsigned int v = rand_get();
-    g_array_append_val(a1, v );
-    v = rand_get();
-    g_array_append_val(a2, v );
-  }
-  unsigned int s = 0;
-  for(unsigned long i = 0; i < n; i++) {
-    s += g_array_index(a1, unsigned int, i ) * g_array_index(a2, unsigned int, i );
-  }
-  g_result = s;
-  g_array_free(a1, FALSE);
-  g_array_free(a2, FALSE);
-}
-
-/********************************************************************************************/
-
-static void test_list (size_t n)
-{
-  GSList *a1 = NULL, *a2 = NULL;
-
-  for(size_t i = 0; i < n; i++) {
-    a1 = g_slist_prepend (a1, GINT_TO_POINTER (rand_get() ));
-    a2 = g_slist_prepend (a2, GINT_TO_POINTER (rand_get() ));
-  }
-  unsigned int s = 0;
-  for(GSList *it1 = a1, *it2 = a2 ; it1 != NULL; it1 = g_slist_next(it1), it2 = g_slist_next(it2) ) {
-    s += GPOINTER_TO_INT(it1->data) * GPOINTER_TO_INT(it2->data);
-    n--;
-  }
-  g_result = s;
-  g_slist_free(a1);
-  g_slist_free(a2);
-}
-
-/********************************************************************************************/
-
-static int compare(gconstpointer a, gconstpointer b, gpointer user_data)
-{
-  const unsigned long *pa = a;
-  const unsigned long *pb = b;
-  (void) user_data;
-  return (*pa < *pb) ? -1 : (*pa > *pb);
-}
-
-static void test_rbtree(size_t n)
-{
-  GTree *tree = g_tree_new_full(compare, NULL, free, NULL);
-  for (size_t i = 0; i < n; i++) {
-    // NOTE: unsigned long are not designed to work with GPOINTER_TO_INT according to documentation.
-    unsigned long *p = malloc(sizeof(unsigned long));
-    *p = rand_get();
-    g_tree_insert(tree, p, p);
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    unsigned long key = rand_get();
-    unsigned long *p = g_tree_lookup(tree, &key);
-    if (p)
-      s += *p;
-  }
-  g_result = s;
-  g_tree_destroy(tree);
-}
-
-/********************************************************************************************/
-static guint hash_func (gconstpointer a)
-{
-  const unsigned long *pa = a;  
-  return *pa;
-}
-
-static gboolean equal_func(gconstpointer a, gconstpointer b)
-{
-  const unsigned long *pa = a;
-  const unsigned long *pb = b;
-  return *pa == *pb;
-}
-          
-static void
-test_dict(size_t  n)
-{
-  GHashTable *dict = g_hash_table_new_full(hash_func, equal_func, free, free);
-  for (size_t i = 0; i < n; i++) {
-    unsigned long *key = malloc(sizeof(unsigned long));
-    unsigned long *value = malloc(sizeof(unsigned long));
-    *key = rand_get();
-    *value = rand_get();   
-    g_hash_table_insert(dict, key, value );
-  }    
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    unsigned long key = rand_get();
-    unsigned long *p = g_hash_table_lookup(dict, &key);
-    if (p)
-      s += *p;
-  }
-  g_result = s;
-  g_hash_table_destroy(dict);
-}
-
-/********************************************************************************************/
-
-typedef char char_array_t[256];
-
-static gboolean char_equal (gconstpointer a, gconstpointer b)
-{
-  const char_array_t *pa = (const char_array_t *)a;
-  const char_array_t *pb = (const char_array_t *)b;
-  return strcmp(*pa,*pb)==0;
-}
-
-static guint char_hash(gconstpointer a)
-{
-  const char_array_t *pa = (const char_array_t *)a;
-  const char *s = *pa;
-  guint hash = 0;
-  while (*s) hash = hash * 31421 + (*s++) + 6927;
-  return hash;
-}
-
-static void
-test_dict_big(size_t n)
-{
-  GHashTable *dict = g_hash_table_new_full(char_hash, char_equal, free, free); 
-  for (size_t i = 0; i < n; i++) {
-    char_array_t *key = malloc (sizeof (char_array_t));
-    char_array_t *value = malloc (sizeof (char_array_t));
-    sprintf(*key, "%u", rand_get());
-    sprintf(*value, "%u", rand_get());
-    g_hash_table_insert(dict, key, value );
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    char_array_t s1;
-    sprintf(s1, "%u", rand_get());
-    char_array_t *p = g_hash_table_lookup(dict, &s1);
-    if (p)
-      s ++;
-  }
-  g_result = s;
-  g_hash_table_destroy(dict);
-}
-
-/********************************************************************************************/
-
-static gint cmp_float(gconstpointer a,
-                      gconstpointer b)
-{
-  const float *pa = a, *pb = b;
-  return (*pa < *pb) ? -1 : (*pa > *pb);
-}
-
-static void test_sort(size_t n)
-{
-  GArray *a1 = g_array_new (FALSE, FALSE, sizeof (float));
-  for(size_t i = 0; i < n; i++) {
-    float v = rand_get();
-    g_array_append_val(a1, v );
-  }
-  g_array_sort(a1, cmp_float);
-  g_result = g_array_index (a1, float, 0);
-  g_array_free(a1, FALSE);
-}
-
-/********************************************************************************************/
-
-const config_func_t table[] = {
-  { 10,    "List", 10000000, 0, test_list, 0},
-  { 20,   "Array", 100000000, 0, test_array, 0},
-  { 30,  "Rbtree", 1000000, 0, test_rbtree, 0},
-  { 40,    "dict", 1000000, 0, test_dict, 0},
-  { 41, "dictBig", 1000000, 0, test_dict_big, 0},
-  { 50,           "Sort",10000000, 0, test_sort, 0},
-};
-
-int main(int argc, const char *argv[])
-{
-  test("GLIB", numberof(table), table, argc, argv);
-  exit(0);
-}
@@ -1,123 +0,0 @@
-#define NDEBUG
-
-#include <vector>
-#include <list>
-#include <iterator>
-#include <map>
-#include <set>
-#include <unordered_map>
-#include <algorithm>
-#include <string>
-#include <sstream>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <string.h>
-
-#include "hopscotch_map.h"
-
-using namespace tsl;
-using namespace std;
-
-#include "common.h"
-
-/********************************************************************************************/
-
-static void
-test_dict2(size_t  n)
-{
-  tsl::hopscotch_map<unsigned long, unsigned long> dict;
-
-  for (size_t i = 0; i < n; i++) {
-    dict[rand_get()] = rand_get();
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    hopscotch_map<unsigned long, unsigned long>::iterator it = dict.find(rand_get());
-    if (it != dict.end())
-      s += it->second;
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-
-struct char_array_s {
-  char a[256];
-  char_array_s () { a[0] = 0 ; }
-  char_array_s ( const char_array_s & other) { strcpy(a, other.a); }
-  bool operator==(const char_array_s &other) const { return strcmp(a, other.a) == 0; }
-};
-
-namespace std {
-  template <> struct hash<char_array_s> {
-    std::size_t operator()(const char_array_s &k) const {
-      size_t hash = 0;
-      const char *s = k.a;
-      while (*s) hash = hash * 31421 + (*s++) + 6927;
-      return hash;
-    };
-  };
-}
-
-static void
-test_dict_big(size_t  n)
-{
-  hopscotch_map<char_array_s, char_array_s> dict;
-
-  for (size_t i = 0; i < n; i++) {
-    char_array_s s1, s2;
-    sprintf(s1.a, "%u", rand_get());
-    sprintf(s2.a, "%u", rand_get());
-    dict[s1] = s2;
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    char_array_s s1;
-    sprintf(s1.a, "%u", rand_get());
-    hopscotch_map<char_array_s, char_array_s>::iterator it = dict.find(s1);
-    if (it != dict.end())
-      s ++;
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-static void
-test_dict_str(size_t  n)
-{
-  hopscotch_map<string, string> dict;
-
-  for (size_t i = 0; i < n; i++) {
-    string s1 = static_cast<ostringstream*>( &(ostringstream() << rand_get()) )->str();
-    string s2 = static_cast<ostringstream*>( &(ostringstream() << rand_get()) )->str();
-    dict[s1] = s2;
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    string s1 = static_cast<ostringstream*>( &(ostringstream() << rand_get()) )->str();
-    hopscotch_map<string, string>::iterator it = dict.find(s1);
-    if (it != dict.end())
-      s ++;
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-
-const config_func_t table[] = {
-  { 41, "dictBig", 1000000, 0, test_dict_big, 0},
-  { 42,"dict", 1000000, 0, test_dict2, 0},
-  { 43,    "DictStr", 1000000, 0, test_dict_str, 0}
-};
-
-int main(int argc, const char *argv[])
-{
-  test("HOPSCOTCHMAP", numberof(table), table, argc, argv);
-  exit(0);
-
-}
@@ -1,202 +0,0 @@
-#define NDEBUG
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-
-#include "kvec.h"
-#include "klist.h"
-#include "kbtree.h"
-#include "khash.h"
-#include "ksort.h"
-
-#include "common.h"
-
-/********************************************************************************************/
-
-static void test_array(size_t n)
-{
-  kvec_t(unsigned int) a1, a2;
-
-  kv_init(a1);
-  kv_init(a2);
-  
-  for(size_t i = 0; i < n; i++) {
-    kv_push(unsigned int, a1, rand_get() );
-    kv_push(unsigned int, a2, rand_get() );
-  }
-  unsigned int s = 0;
-  for(unsigned long i = 0; i < n; i++) {
-    s += kv_A(a1, i ) * kv_A(a2, i );
-  }
-  g_result = s;
-
-  kv_destroy(a1);
-  kv_destroy(a2);
-}
-
-/********************************************************************************************/
-
-#define uint_free(x)
-KLIST_INIT(list_uint, unsigned int, uint_free)
-
-static void test_list (size_t n)
-{
-  klist_t(list_uint) *a1, *a2;
-  a1 = kl_init(list_uint);
-  a2 = kl_init(list_uint);
-
-  for(size_t i = 0; i < n; i++) {
-    *kl_pushp (list_uint, a1) = rand_get();
-    *kl_pushp (list_uint, a2) = rand_get();
-  }
-  unsigned int s = 0;
-  kliter_t(list_uint) *it1, *it2;
-  for(it1 = kl_begin(a1), it2 = kl_begin(a2);
-      it1 != kl_end(a1);
-      it1 = kl_next(it1), it2 = kl_next(it2)) {
-    s += kl_val(it1) * kl_val(it2);
-  }
-  g_result = s;
-
-  kl_destroy(list_uint, a1);
-  kl_destroy(list_uint, a2);
-}
-
-/********************************************************************************************/
-
-#define my_cmp(a,b) ( (a) < (b) ? -1 : (a) > (b) )
-
-KBTREE_INIT(kTree, unsigned long, my_cmp)
-
-static void test_rbtree(size_t n)
-{
-  kbtree_t(kTree) *tree;
-  tree = kb_init(kTree, KB_DEFAULT_SIZE/2);
-  
-  for (size_t i = 0; i < n; i++) {
-    unsigned long j = rand_get();
-    kb_putp(kTree, tree, &j);
-  }
-    
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    unsigned long j = rand_get();
-    if (kb_getp(kTree, tree, &j) != 0)
-      s+= j;
-  }
-  g_result = s;
-  kb_destroy(kTree, tree);
-}
-
-/********************************************************************************************/
-
-#define hash_eq(a, b) ((a) == (b))
-#define hash_func(a) kh_int64_hash_func(a)
-
-KHASH_INIT(iun, unsigned long, unsigned long, 1, hash_func, hash_eq)
-
-static void
-test_dict(size_t  n)
-{
-  khash_t(iun) *dict = kh_init(iun);
-  
-  for (size_t i = 0; i < n; i++) {
-    int ret;
-    khiter_t k = kh_put(iun, dict, rand_get(), &ret);
-    kh_value(dict, k) = rand_get();
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    khiter_t k = kh_get(iun, dict, rand_get());
-    if (kh_exist(dict, k))
-      s += kh_value(dict, k);
-  }
-  g_result = s;
-  
-  kh_destroy(iun, dict);
-}
-
-/********************************************************************************************/
-
-typedef struct {
-  char a[256];
-} char_array_t;
-static inline void char_init (char_array_t *a) { a->a[0] = 0; }
-static inline void char_set (char_array_t *a, const char_array_t b) { strcpy(a->a, b.a); }
-static inline bool char_equal_p (const char_array_t a, const char_array_t b) { return strcmp(a.a,b.a)==0; }
-static inline size_t char_hash(const char_array_t a) {
-  size_t hash = 0;
-  const char *s = a.a;
-  while (*s) hash = hash * 31421 + (*s++) + 6927;
-  return hash;
-}
-
-KHASH_INIT(iub, char_array_t, char_array_t, 1, char_hash, char_equal_p)
-
-static void
-test_dict_big(size_t  n)
-{
-  khash_t(iub) *dict = kh_init(iub);
-
-  for (size_t i = 0; i < n; i++) {
-    int ret;
-    char_array_t s1, s2;
-    sprintf(s1.a, "%u", rand_get());
-    sprintf(s2.a, "%u", rand_get());
-    khiter_t k = kh_put(iub, dict, s1, &ret);
-    char_set(&kh_value(dict, k), s2);
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    char_array_t s1;
-    sprintf(s1.a, "%u", rand_get());
-    khiter_t k = kh_get(iub, dict, s1);
-    if (kh_exist(dict, k))
-      s ++;
-  }
-  g_result = s;
-
-  kh_destroy(iub, dict);
-}
-
-/********************************************************************************************/
-// NOTE: Needed for compiling
-double drand48(void) { return rand_get(); }
-
-KSORT_INIT_GENERIC(float)
-
-static void test_sort(size_t n)
-{
-  kvec_t(float) a1;
-
-  kv_init(a1);
-  for(size_t i = 0; i < n; i++) {
-    kv_push(float, a1, rand_get() );
-  }
-  // NOTE: Is-it the right way to do? Seems very low level!
-  ks_introsort_float(n, & kv_A(a1, 0));
-  g_result = kv_A(a1, 0);
-  kv_destroy(a1);
-}
-
-/********************************************************************************************/
-
-const config_func_t table[] = {
-  { 10,    "List", 10000000, 0, test_list, 0},
-  { 20,   "Array", 100000000, 0, test_array, 0},
-  { 30,  "Rbtree", 1000000, 0, test_rbtree, 0},
-  { 40,    "dict", 1000000, 0, test_dict, 0},
-  { 41, "dictBig", 1000000, 0, test_dict_big, 0},
-  { 50,           "Sort",10000000, 0, test_sort, 0},
-};
-
-int main(int argc, const char *argv[])
-{
-  test("KLIB", numberof(table), table, argc, argv);
-  exit(0);
-}
-
@@ -1,170 +0,0 @@
-#define NDEBUG
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <string.h>
-#include <stdint.h>
-#include <unistd.h>
-
-// Needed due to compilation error in pool.h
-#include <pthread.h>
-
-#include "dynamic.h"
-
-#include "common.h"
-
-/********************************************************************************************/
-
-static void test_array(size_t n)
-{
-  vector a1, a2;
-
-  vector_construct(&a1, sizeof(unsigned int));
-  vector_construct(&a2, sizeof(unsigned int));
-  for(size_t i = 0; i < n; i++) {
-    unsigned int v = rand_get();
-    vector_push_back(&a1, &v);
-    v = rand_get();
-    vector_push_back(&a2, &v);
-  }
-  unsigned int s = 0;
-  for(unsigned long i = 0; i < n; i++) {
-    s += *(unsigned int*) vector_at(&a1, i) * *(unsigned int*) vector_at(&a2, i);
-  }
-  g_result = s;
-  vector_destruct(&a1, NULL);
-  vector_destruct(&a2, NULL);
-}
-
-
-/********************************************************************************************/
-
-static size_t hash_func (void *a)
-{
-  return hash_data(a, sizeof (unsigned long));
-}
-
-static int equal_func(void *a, void *b)
-{
-  const unsigned long *pa = a;
-  if (b == NULL) {
-    return *pa == -1U;      
-  }
-  const unsigned long *pb = b;
-  return *pa == *pb;
-}
-
-static void set_func(void *a, void *b)
-{
-  unsigned long *pa = a;
-  if (b == NULL) {
-    *pa = -1U;
-  } else {
-    const unsigned long *pb = b;
-    *pa = *pb;
-  }
-}
-
-typedef struct map_element map_element;
-struct map_element
-{
-  unsigned long key;
-  unsigned long value;
-};
-
-static void
-test_dict(size_t  n)
-{
-  map dict;
-  map_construct(&dict, sizeof(map_element), set_func);
-
-  for (size_t i = 0; i < n; i++) {
-    map_insert(&dict, (map_element[]) {{.key = rand_get(), .value = rand_get()}}, hash_func, set_func, equal_func, NULL);
-  }    
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    map_element *p = map_at(&dict, (map_element[]){{.key = rand_get()}}, hash_func, equal_func);
-    if (p)
-      s += p->value;
-  }
-  g_result = s;
-  map_destruct(&dict, NULL, NULL);
-}
-
-/********************************************************************************************/
-
-typedef char char_array_t[256];
-
-static int char_equal (void *a, void *b)
-{
-  const char_array_t *pa = (const char_array_t *)a;
-  if (b == NULL)
-    return strcmp(*pa, "") == 0;
-  const char_array_t *pb = (const char_array_t *)b;
-  return strcmp(*pa,*pb)==0;
-}
-
-static size_t char_hash(void *a)
-{  
-  char_array_t *pa = (char_array_t *)a;
-  return hash_string(*pa);
-}
-
-static void char_set(void *a, void *b)
-{
-  char_array_t *pa = (char_array_t *)a;
-  if (b == NULL) {
-    strcpy(*pa, "");
-  } else {
-    const char_array_t *pb = (const char_array_t *)b;
-    strcpy(*pa,*pb);
-  }
-}
-
-typedef struct big_map_element big_map_element;
-struct big_map_element
-{
-  char_array_t key;
-  char_array_t value;
-};
-
-static void
-test_dict_big(size_t  n)
-{
-  map dict;
-  map_construct(&dict, sizeof(big_map_element), char_set);
-  
-  for (size_t i = 0; i < n; i++) {
-    big_map_element el;
-    sprintf(el.key, "%u", rand_get());
-    sprintf(el.value, "%u", rand_get());
-    map_insert(&dict, &el, char_hash, char_set, char_equal, NULL);
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    big_map_element el;
-    sprintf(el.key, "%u", rand_get());
-    big_map_element *p = map_at(&dict, &el, char_hash, char_equal);
-    if (p)
-      s ++;
-  }
-  g_result = s;
-  map_destruct(&dict, NULL, NULL);
-}
-
-/********************************************************************************************/
-
-const config_func_t table[] = {
-  { 20,   "Array", 100000000, 0, test_array, 0},
-  { 40,    "dict", 1000000, 0, test_dict, 0},
-  { 41, "dictBig", 1000000, 0, test_dict_big, 0},
-};
-
-int main(int argc, const char *argv[])
-{
-  test("LIBDYNAMIC", numberof(table), table, argc, argv);
-  exit(0);
- }
@@ -1,116 +0,0 @@
-#define NDEBUG
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-
-#include "liblfds711.h"
-
-#include "common.h"
-
-/********************************************************************************************/
-
-struct lfds711_queue_bmm_state g_buff;
-struct lfds711_queue_bmm_state g_final;
-
-static void final(void *arg)
-{
-  size_t *p_n = arg;
-  size_t    n = *p_n;
-  unsigned long long j, s = 0;
-  LFDS711_MISC_MAKE_VALID_ON_CURRENT_LOGICAL_CORE_INITS_COMPLETED_BEFORE_NOW_ON_ANY_OTHER_LOGICAL_CORE;
-  for(int i = 0; i < n;i++) {
-    void *p;
-    while (0 == lfds711_queue_bmm_dequeue(&g_final, &p, NULL)) {  m_thread_yield(); }
-    j = (uintptr_t)p;
-    s += j;
-  }
-  g_result = s;
-}
-
-static void conso(void *arg)
-{
-  unsigned int j;
-  size_t *p_n = arg;
-  size_t n = *p_n;
-  unsigned long long s = 0;
-  LFDS711_MISC_MAKE_VALID_ON_CURRENT_LOGICAL_CORE_INITS_COMPLETED_BEFORE_NOW_ON_ANY_OTHER_LOGICAL_CORE;
-  for(int i = 0; i < n;i++) {
-    void *p;
-    while (0 == lfds711_queue_bmm_dequeue(&g_buff, &p, NULL)) {  m_thread_yield(); }
-    j = (uintptr_t) p;
-    s += j;
-  }
-  while (0 == lfds711_queue_bmm_enqueue(&g_final, (void*)(uintptr_t)s, NULL)) {  m_thread_yield(); }
-}
-
-static void prod(void *arg)
-{
-  size_t *p_n = arg;
-  size_t n = *p_n;
-  size_t r = n;
-  LFDS711_MISC_MAKE_VALID_ON_CURRENT_LOGICAL_CORE_INITS_COMPLETED_BEFORE_NOW_ON_ANY_OTHER_LOGICAL_CORE;
-  for(unsigned int i = 0; i < n;i++) {
-    while (0 == lfds711_queue_bmm_enqueue(&g_buff, (void*)(uintptr_t)r, NULL)) {  m_thread_yield(); }
-    r = r * 31421U + 6927U;
-  }
-}
-
-static void test_queue(size_t n)
-{
-  const int cpu_count   = get_cpu_count();
-  const int prod_count  = cpu_count/2;
-  const int conso_count = cpu_count - prod_count;
-  if (cpu_count < 2) {
-    fprintf(stderr, "WARNING: Can not measure Buffer performance.\n");
-    return;
-  }
-  rand_get();
-  // Init
-  const size_t size = m_core_roundpow2(64*cpu_count);
-  struct lfds711_queue_bmm_element g_buff_elements[size];
-  struct lfds711_queue_bmm_element g_final_elements[size];
-  lfds711_queue_bmm_init_valid_on_current_logical_core(&g_buff, g_buff_elements,
-						       size, NULL);
-  lfds711_queue_bmm_init_valid_on_current_logical_core(&g_final, g_final_elements,
-						       size, NULL);
-  
-  // Create thread
-  m_thread_t idx_p[prod_count];
-  m_thread_t idx_c[conso_count];
-  m_thread_t idx_final;
-  for(int i = 0; i < prod_count; i++) {
-    m_thread_create (idx_p[i], prod, &n);
-  }
-  for(int i = 0; i < conso_count; i++) {
-    m_thread_create (idx_c[i], conso, &n);
-  }
-  size_t n2 = conso_count;
-  m_thread_create(idx_final, final, &n2);
-
-  // Wait for jobs to be done.
-  for(int i = 0; i < prod_count; i++) {
-    m_thread_join(idx_p[i]);
-  }
-  for(int i = 0; i < conso_count; i++) {
-    m_thread_join(idx_c[i]);
-  }
-  m_thread_join(idx_final);
-
-  // Clear & quit
-  lfds711_queue_bmm_cleanup(&g_final, NULL);
-  lfds711_queue_bmm_cleanup(&g_buff, NULL);
-}
-
-
-/********************************************************************************************/
-
-const config_func_t table[] = {
-  { 60,    "Queue MPMC", 1000000, 0, test_queue, 0}
-};
-
-int main(int argc, const char *argv[])
-{
-  test("LIBLFDS", numberof(table), table, argc, argv);
-  exit(0);
-}
@@ -1,74 +0,0 @@
-#define NDEBUG
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-
-#include "svector.h"
-#include "smap.h"
-#include "smset.h"
-
-#include "common.h"
-
-/********************************************************************************************/
-
-static void test_array(size_t n)
-{
-  srt_vector *a1 = sv_alloc ( sizeof (unsigned int), 16, NULL);
-  srt_vector *a2 = sv_alloc ( sizeof (unsigned int), 16, NULL);
-
-  for(size_t i = 0; i < n; i++) {
-    unsigned int value = rand_get();
-    sv_push(&a1, &value );
-    value = rand_get();
-    sv_push(&a2, &value );
-  }
-  unsigned int s = 0;
-  for(unsigned long i = 0; i < n; i++) {
-    s += *(unsigned int*)sv_at(a1, i ) * *(unsigned int *)sv_at(a2, i );
-  }
-  g_result = s;
-  
-  sv_free(&a1);
-  sv_free(&a2);
-}
-
-/********************************************************************************************/
-
-/* There is no 'unsigned long' key in smset */
-
-/********************************************************************************************/
-
-static int cmp_float (const void *a, const void *b)
-{
-  const float *pa=a;
-  const float *pb = b;
-  return (*pa < *pb) ? -1 : *pa > *pb;
-}
-
-static void test_sort(size_t n)
-{
-  srt_vector *a1 = sv_alloc(sizeof(float), 16, cmp_float);
-  for(size_t i = 0; i < n; i++) {
-    unsigned int value = rand_get();
-    sv_push(&a1, &value );
-  }
-  sv_sort(a1);
-  g_result = *(float*)sv_at(a1, 0);
-  sv_free(&a1);
-}
-
-/********************************************************************************************/
-
-
-const config_func_t table[] = {
-  { 20,   "Array", 100000000, 0, test_array, 0},
-  { 50,    "sort", 10000000, 0, test_sort, 0}
-};
-
-int main(int argc, const char *argv[])
-{
-  test("LIBSRT", numberof(table), table, argc, argv);
-  exit(0);
-}
-
@@ -1,99 +0,0 @@
-#define NDEBUG
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdbool.h>
-
-#include "nedtrie.h"
-
-#include "common.h"
-
-/********************************************************************************************/
-
-typedef struct foo_s {
-  NEDTRIE_ENTRY(foo_s) link;
-  unsigned long key;
-  unsigned long value;
-} foo_t;
-typedef struct foo_tree_s foo_tree_t;
-NEDTRIE_HEAD(foo_tree_s, foo_s);
-
-static inline size_t fookeyfunct(const foo_t *r)
-{
-  return r->key;
-}
-
-NEDTRIE_GENERATE(static, foo_tree_s, foo_s, link, fookeyfunct, NEDTRIE_NOBBLEZEROS(foo_tree_s))
-
-static void
-test_dict(size_t  n)
-{
-  foo_tree_t footree;
-  NEDTRIE_INIT(&footree);
-  
-  for (size_t i = 0; i < n; i++) {
-    unsigned long key = rand_get();
-    unsigned long val = rand_get();
-    foo_t * p = malloc(sizeof(foo_t));
-    if (p == NULL) abort();
-    p->key = key;
-    p->value = val;
-    NEDTRIE_INSERT(foo_tree_s, &footree, p);
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    foo_t key = { .key = rand_get() };
-    foo_t *p = NEDTRIE_FIND(foo_tree_s, &footree, &key);
-    if (p)
-      s += p->value;
-  }
-  g_result = s;
-  foo_t *r, *next;
-  NEDTRIE_FOREACH_SAFE(r, foo_tree_s, &footree, next) {
-    // Remove is needed, otherwise it segfault
-    NEDTRIE_REMOVE(foo_tree_s, &footree, r);
-    free(r);
-  }
-}
-
-static void
-test_dict_noalloc(size_t  n)
-{
-  foo_tree_t footree;
-  NEDTRIE_INIT(&footree);
-
-  foo_t *tab = malloc(n*sizeof(foo_t));
-  if (tab == NULL) abort();
-  
-  for (size_t i = 0; i < n; i++) {
-    unsigned long key = rand_get();
-    unsigned long val = rand_get();
-    tab[i].key = key;
-    tab[i].value = val;
-    NEDTRIE_INSERT(foo_tree_s, &footree, &tab[i]);
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    foo_t key = { .key = rand_get() };
-    foo_t *p = NEDTRIE_FIND(foo_tree_s, &footree, &key);
-    if (p)
-      s += p->value;
-  }
-  g_result = s;
-  free(tab);
-}
-
-/********************************************************************************************/
-
-const config_func_t table[] = {
-  { 40,    "dict", 1000000, 0, test_dict, 0},
-  { 45, "dict(noalloc)", 1000000, 0, test_dict_noalloc, 0}
-};
-
-int main(int argc, const char *argv[])
-{
-  test("NEDTRIES", numberof(table), table, argc, argv);
-  exit(0);
-}
@@ -1,90 +0,0 @@
-// Inspired by: http://stackoverflow.com/questions/3664272/is-stdvector-so-much-slower-than-plain-arrays/3664349#3664349
-
-#define NDEBUG
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <sys/types.h>
-#include <sys/resource.h>
-#include <sys/time.h>
-
-#include "m-array.h"
-#include "m-list.h"
-#include "m-rbtree.h"
-#include "m-dict.h"
-#include "m-algo.h"
-#include "m-mempool.h"
-#include "m-string.h"
-
-unsigned long g_result;
-
-static unsigned long long
-cputime (void)
-{
-  struct rusage rus;
-  getrusage (0, &rus);
-  return rus.ru_utime.tv_sec * 1000000ULL + rus.ru_utime.tv_usec;
-}
-
-struct Pixel
-{
-  unsigned char r, g, b;
-};
-
-ARRAY_DEF(array_pixel, struct Pixel, (INIT(M_NOTHING_DEFAULT)) )
-
-void UseMlib(void)
-{
-  unsigned long long t1 = cputime();
-
-  for(int i = 0; i < 1000; ++i)
-    {
-      int dimension = 999;
-      
-      array_pixel_t pixels;
-      array_pixel_init(pixels);
-      array_pixel_reserve(pixels, dimension * dimension);
-
-      for(int i = 0; i < dimension * dimension; ++i)
-        {
-          const struct Pixel p = { 255, 0, 0};
-          array_pixel_push_back (pixels, p);
-        }
-      
-      array_pixel_clear(pixels);
-    }
-  unsigned long long t2 = cputime();
-  printf ("M*Lib  Array: %Lu us\n", (t2-t1)/1000);
-}
-
-void UseNative(void)
-{
-  unsigned long long t1 = cputime();
-
-  for(int i = 0; i < 1000; ++i)
-    {
-      int dimension = 999;
-      
-      struct Pixel * pixels = malloc(sizeof(struct Pixel) * dimension * dimension);
-      
-      for(int i = 0 ; i < dimension * dimension; ++i)
-        {
-          pixels[i].r = 255;
-          pixels[i].g = 0;
-          pixels[i].b = 0;
-        }
-      
-      free(pixels);
-    }
-  unsigned long long t2 = cputime();
-  printf ("Native Array: %Lu us\n", (t2-t1)/1000);
-}
-
-int main(void)
-{
-  UseNative();
-  UseMlib();
-  
-  return 0;
-}
@@ -1,113 +0,0 @@
-#define NDEBUG
-#define _GNU_SOURCE 
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <string.h>
-#include <assert.h>
-
-#include "qlibc/qlibc.h"
-
-#include "common.h"
-
-/********************************************************************************************/
-
-static void test_array(size_t n)
-{
-  qvector_t *a1 = qvector(16, sizeof(unsigned int), QVECTOR_RESIZE_DOUBLE);
-  if (!a1) abort();
-  qvector_t *a2 = qvector(16, sizeof(unsigned int), QVECTOR_RESIZE_DOUBLE);
-  if (!a2) abort();
-
-  for(size_t i = 0; i < n; i++) {
-    unsigned int v = rand_get();
-    bool success = a1->addlast(a1, &v);
-    if (!success) abort();
-    v = rand_get();
-    success = a2->addlast(a2, &v);
-    if (!success) abort();
-  }
-  unsigned int s = 0;
-  for(unsigned long i = 0; i < n; i++) {
-    s += *(unsigned int*)a1->getat(a1, i, false) * *(unsigned int *) a2->getat(a2, i, false);
-  }
-  g_result = s;
-  a1->free(a1);
-  a2->free(a2);
-}
-
-/********************************************************************************************/
-
-static void test_list (size_t n)
-{
-  qlist_t *a1 = qlist(0);
-  qlist_t *a2 = qlist(0);
-
-  for(size_t i = 0; i < n; i++) {
-    unsigned int u = rand_get(), v = rand_get();
-    a1->addlast(a1, &u, sizeof(unsigned int));
-    a2->addlast(a2, &v, sizeof(unsigned int));
-  }
-  unsigned int s = 0;
-  qlist_obj_t it1, it2;
-  memset(&it1, 0, sizeof (it1));
-  memset(&it2, 0, sizeof (it2));
-  while (a1->getnext(a1, &it1, false) == true
-	 && a2->getnext(a2, &it2, false) == true) {
-    s += *(unsigned int*)it1.data * *(unsigned int*)it2.data;
-  }
-  g_result = s;
-  a1->free(a1);
-  a2->free(a2);
-}
-
-/********************************************************************************************/
-
-static int compare(const void *key1, size_t size1,
-		   const void *key2, size_t size2)
-{
-  assert(size1 == sizeof(unsigned long));
-  assert(size2 == sizeof(unsigned long));
-  const unsigned long *pa = key1;
-  const unsigned long *pb = key2;
-  return (*pa < *pb) ? -1 : (*pa > *pb);
-}
-
-static void test_rbtree(size_t n)
-{
-  qtreetbl_t *tree = qtreetbl(0);
-  tree->set_compare(tree, compare);
-  for (size_t i = 0; i < n; i++) {
-    unsigned long v = rand_get();
-    tree->put_by_obj(tree,
-		     &v, sizeof(unsigned long), /* key */
-		     &v, sizeof(unsigned long) /* value */ );
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    unsigned long v = rand_get();
-    void *obj = tree->get_by_obj(tree, (const char*)&v, sizeof(unsigned long), NULL, 0);
-    if (obj)
-      s += *(unsigned long*)obj;
-  }
-  g_result = s;
-  tree->free(tree);
-}
-
-/* qlibc hash functions only accept a string as the key */
-
-/********************************************************************************************/
-
-const config_func_t table[] = {
-  { 10,    "List", 10000000, 0, test_list, 0},
-  { 20,   "Array", 100000000, 0, test_array, 0},
-  { 30,  "Rbtree", 1000000, 0, test_rbtree, 0}
-};
-
-int main(int argc, const char *argv[])
-{
-  test("QLIBC", numberof(table), table, argc, argv);
-  exit(0);
-}
@@ -1,179 +0,0 @@
-#define NDEBUG
-
-#include <QLinkedList>
-#include <QVector>
-#include <QSet>
-#include <QMap>
-#include <QHash>
-#include <QtAlgorithms>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <string.h>
-
-using namespace std;
-
-#include "common.h"
-
-/********************************************************************************************/
-
-static void test_list(size_t n)
-{
-  QLinkedList<unsigned int> a1, a2;
-  for(size_t i = 0; i < n; i++) {
-    a1.push_back(rand_get() );
-    a2.push_back(rand_get() );
-  }
-  unsigned int s = 0;
-  for (QLinkedList<unsigned int>::const_iterator ci1 = a1.begin(), ci2 = a2.begin (); ci1 != a1.end(); ++ci1, ++ci2) {
-    s += *ci1 * *ci2;
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-
-static void test_array(size_t n)
-{
-  QVector<unsigned int> a1, a2;
-  for(size_t i = 0; i < n; i++) {
-    a1.push_back(rand_get() );
-    a2.push_back(rand_get() );
-  }
-  unsigned int s = 0;
-  for(unsigned long i = 0; i < n; i++) {
-    s += a1[i] * a2[i];
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-
-/* NOTE: QSet doesn't perform full ordering. I can't find any container
-   which is a set with total ordering within Qt. So we have to fake it. */
-static void test_rbtree(size_t n)
-{
-  QMap<unsigned long, QHashDummyValue> tree;
-
-  for (size_t i = 0; i < n; i++) {
-    tree[rand_get()] = QHashDummyValue();
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    QMap<unsigned long, QHashDummyValue>::iterator it = tree.find(rand_get());
-    if (it != tree.end())
-      s += it.key();
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-
-static void
-test_dict1(size_t  n)
-{
-  QMap<unsigned long, unsigned long> dict;
-
-  for (size_t i = 0; i < n; i++) {
-    dict[rand_get()] = rand_get();
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    QMap<unsigned long, unsigned long>::iterator it = dict.find(rand_get());
-    if (it != dict.end())
-      s += it.value();
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-
-static void
-test_dict2(size_t  n)
-{
-  QHash<unsigned long, unsigned long> dict;
-
-  for (size_t i = 0; i < n; i++) {
-    dict[rand_get()] = rand_get();
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    QHash<unsigned long, unsigned long>::iterator it = dict.find(rand_get());
-    if (it != dict.end())
-      s += it.value();
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-struct char_array_s {
-  char a[256];
-  char_array_s () { a[0] = 0 ; }
-  char_array_s ( const char_array_s & other) { strcpy(a, other.a); }
-  bool operator==(const char_array_s &other) const { return strcmp(a, other.a) == 0; }
-};
-
-uint qHash(const char_array_s &k)
-{
-  size_t hash = 0;
-  const char *s = k.a;
-  while (*s) hash = hash * 31421 + (*s++) + 6927;
-  return hash;
-};
-
-static void
-test_dict_big(size_t  n)
-{
-  QHash<char_array_s, char_array_s> dict;
-
-  for (size_t i = 0; i < n; i++) {
-    char_array_s s1, s2;
-    sprintf(s1.a, "%u", rand_get());
-    sprintf(s2.a, "%u", rand_get());
-    dict[s1] = s2;
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    char_array_s s1;
-    sprintf(s1.a, "%u", rand_get());
-    QHash<char_array_s, char_array_s>::iterator it = dict.find(s1);
-    if (it != dict.end())
-      s ++;
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-
-static void test_sort(size_t n)
-{
-  QVector<float> a1;
-  for(size_t i = 0; i < n; i++) {
-    a1.push_back(rand_get() );
-  }
-  qSort(a1.begin(), a1.end());
-  g_result = a1[0];
-}
-
-/********************************************************************************************/
-
-const config_func_t table[] = {
-  { 10,    "List", 10000000, 0, test_list, 0},
-  { 20,   "Array", 100000000, 0, test_array, 0},
-  { 30,  "Rbtree", 1000000, 0, test_rbtree, 0},
-  { 40,    "dict(m)", 1000000, 0, test_dict1, 0},
-  { 41, "dictBig", 1000000, 0, test_dict_big, 0},
-  { 42,"dict(u)", 1000000, 0, test_dict2, 0},
-  { 50,           "Sort",10000000, 0, test_sort, 0}
-};
-
-int main(int argc, const char *argv[])
-{
-  test("QT", numberof(table), table, argc, argv);
-  exit(0);
-}
@@ -1,185 +0,0 @@
-#define NDEBUG
-#define RAPIDJSON_HAS_STDSTRING 1
-
-#include "rapidjson/reader.h"
-#include "rapidjson/document.h"
-#include "rapidjson/prettywriter.h"
-#include "rapidjson/filereadstream.h"
-#include "rapidjson/filewritestream.h"
-#include "rapidjson/encodedstream.h"
-#include "rapidjson/error/en.h"
-
-#include <stdio.h>
-#include <string>
-#include <vector>
-
-#include "common.h"
-
-using namespace std;
-
-/********************************************************************************************/
-
-vector<string> vstring;
-vector<string> vstring2;
-
-static void
-bench_vector_string_init(size_t n)
-{
-    for(size_t i = 0; i < n; i++)
-    {
-        char buff[100];
-        snprintf(buff, sizeof(buff), "%zu", i);
-        std::string s(buff);
-        vstring.push_back(s);
-    }
-}
-
-static void
-bench_vector_string_init_big(size_t n)
-{
-    for(size_t i = 0; i < n; i++)
-    {
-        char buff[100];
-        snprintf(buff, sizeof(buff), "%zu%zu%zu%zu%zu%zu", i, i, i, i, i, i);
-        std::string s(buff);
-        vstring.push_back(s);
-    }
-}
-
-static void
-bench_vector_string_json_run(size_t n)
-{
-    if (vstring.size() != n) {
-        printf("Size are different!\n");
-        abort();
-    }
-
-    FILE *f = fopen("tmp-serial.json", "wt");
-    if (!f) abort();
-    {
-        // Prepare writer and output stream.
-        char writeBuffer[65536];
-        typedef rapidjson::AutoUTFOutputStream<unsigned, rapidjson::FileWriteStream> OutputStream; 
-        rapidjson::FileWriteStream os(f, writeBuffer, sizeof(writeBuffer));
-        OutputStream eos(os, rapidjson::kUTF8, false); 
-        rapidjson::PrettyWriter<OutputStream, rapidjson::UTF8<>, rapidjson::AutoUTF<unsigned> > writer(eos);
-
-        writer.StartArray();
-        for(size_t i = 0; i < n; i++){
-            writer.String(vstring[i]);
-        }
-        writer.EndArray();
-    }
-    fclose(f);
-    
-    f = fopen("tmp-serial.json", "rt");
-    if (!f) abort();
-    {
-        char readBuffer[65536];
-        rapidjson::FileReadStream is(f, readBuffer, sizeof(readBuffer));
-        rapidjson::Document d;
-        d.ParseStream(is);
-        for(size_t i = 0; i < d.Size(); i++) {
-            rapidjson::Value& s = d[i];
-            vstring2.push_back(s.GetString());
-        }
-    }
-    fclose(f);
-
-    if (vstring2.size() != n) {
-        printf("Size are different!\n");
-        abort();
-    }
-}
-
-static void
-bench_vector_string_clear(void)
-{
-    if (vstring != vstring2) {
-        printf("Array are different!\n");
-        abort();
-    }
-}
-
-/********************************************************************************************/
-
-vector<unsigned long> vulong;
-vector<unsigned long> vulong2;
-
-static void
-bench_vector_ulong_init(size_t n)
-{
-    for(size_t i = 0; i < n; i++)
-    {
-      vulong.push_back(i*i);
-    }
-}
-
-static void
-bench_vector_ulong_json_run(size_t n)
-{
-    if (vulong.size() != n) {
-        printf("Size are different!\n");
-        abort();
-    }
-
-    FILE *f = fopen("tmp-serial.json", "wt");
-    if (!f) abort();
-    {
-        // Prepare writer and output stream.
-        char writeBuffer[65536];
-        typedef rapidjson::AutoUTFOutputStream<unsigned, rapidjson::FileWriteStream> OutputStream; 
-        rapidjson::FileWriteStream os(f, writeBuffer, sizeof(writeBuffer));
-        OutputStream eos(os, rapidjson::kUTF8, false); 
-        rapidjson::PrettyWriter<OutputStream, rapidjson::UTF8<>, rapidjson::AutoUTF<unsigned> > writer(eos);
-
-        writer.StartArray();
-        for(size_t i = 0; i < n; i++){
-            writer.Int64(vulong[i]);
-        }
-        writer.EndArray();
-    }
-    fclose(f);
-    
-    f = fopen("tmp-serial.json", "rt");
-    if (!f) abort();
-    {
-        char readBuffer[65536];
-        rapidjson::FileReadStream is(f, readBuffer, sizeof(readBuffer));
-        rapidjson::Document d;
-        d.ParseStream(is);
-        for(size_t i = 0; i < d.Size(); i++) {
-            rapidjson::Value& s = d[i];
-            vulong2.push_back(s.GetInt64());
-        }
-    }
-    fclose(f);
-
-    if (vulong2.size() != n) {
-        printf("Size are different!\n");
-        abort();
-    }
-}
-
-static void
-bench_vector_ulong_clear(void)
-{
-    if (vulong != vulong2) {
-        printf("Array are different!\n");
-        abort();
-    }
-}
-
-/********************************************************************************************/
-
-const config_func_t table[] = {
-  {110,    "serial-json STR", 10000000, bench_vector_string_init, bench_vector_string_json_run, bench_vector_string_clear},
-  {111,    "serial-json STR.big", 10000000, bench_vector_string_init_big, bench_vector_string_json_run, bench_vector_string_clear},
-  {112,    "serial-json INT", 10000000, bench_vector_ulong_init, bench_vector_ulong_json_run, bench_vector_ulong_clear}
-};
-
-int main(int argc, const char *argv[])
-{
-  test("RAPIDJSON", numberof(table), table, argc, argv);
-  exit(0);
-}
@@ -1,159 +0,0 @@
-#define NDEBUG
-
-#include <vector>
-#include <list>
-#include <iterator>
-#include <map>
-#include <set>
-#include <unordered_map>
-#include <algorithm>
-#include <string>
-#include <sstream>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <string.h>
-
-#include "rigtorp/HashMap.h"
-
-using namespace rigtorp;
-using namespace std;
-
-#include "common.h"
-
-/********************************************************************************************/
-
-// Hash for using unsigned long as lookup key
-struct UL_Hash {
-  size_t operator()(const unsigned long v) { return v * 7; }
-};
-
-// Equal comparison for using unsigned long as lookup key
-struct UL_Equal {
-  bool operator()(const unsigned long lhs, const unsigned long rhs) {
-    return lhs == rhs;
-  }
-};
-
-static void
-test_dict2(size_t  n)
-{
-  HashMap<unsigned long, unsigned long, UL_Hash, UL_Equal> dict(16, -1UL);
-
-  for (size_t i = 0; i < n; i++) {
-    dict[rand_get()] = rand_get();
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    HashMap<unsigned long, unsigned long, UL_Hash, UL_Equal>::iterator it = dict.find(rand_get());
-    if (it != dict.end())
-      s += it->second;
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-
-
-struct char_array_s {
-  char a[256];
-  char_array_s () { a[0] = 0 ; }
-  char_array_s ( const char_array_s & other) { strcpy(a, other.a); }
-  bool operator==(const char_array_s &other) const { return strcmp(a, other.a) == 0; }
-};
-
-namespace std {
-  template <> struct hash<char_array_s> {
-    std::size_t operator()(const char_array_s &k) const {
-      size_t hash = 0;
-      const char *s = k.a;
-      while (*s) hash = hash * 31421 + (*s++) + 6927;
-      return hash;
-    };
-  };
-}
-
-struct BIG_Hash {
-  size_t operator()(const char_array_s v) { return hash<char_array_s>()(v); }
-};
-
-struct BIG_Equal {
-  bool operator()(const char_array_s lhs, const char_array_s rhs) {
-    return lhs == rhs;
-  }
-};
-
-static void
-test_dict_big(size_t  n)
-{
-  char_array_s empty;
-  HashMap<char_array_s, char_array_s, BIG_Hash, BIG_Equal> dict(16, empty);
-
-  for (size_t i = 0; i < n; i++) {
-    char_array_s s1, s2;
-    sprintf(s1.a, "%u", rand_get());
-    sprintf(s2.a, "%u", rand_get());
-    dict[s1] = s2;
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    char_array_s s1;
-    sprintf(s1.a, "%u", rand_get());
-    HashMap<char_array_s, char_array_s, BIG_Hash, BIG_Equal>::iterator it = dict.find(s1);
-    if (it != dict.end())
-      s ++;
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-
-struct STR_Hash {
-  size_t operator()(const string v) { return hash<string>()(v); }
-};
-
-struct STR_Equal {
-  bool operator()(const string lhs, const string rhs) {
-    return lhs == rhs;
-  }
-};
-
-
-static void
-test_dict_str(size_t  n)
-{
-  string empty;
-  HashMap<string, string, STR_Hash, STR_Equal> dict(16, empty);
-
-  for (size_t i = 0; i < n; i++) {
-    string s1 = static_cast<ostringstream*>( &(ostringstream() << rand_get()) )->str();
-    string s2 = static_cast<ostringstream*>( &(ostringstream() << rand_get()) )->str();
-    dict[s1] = s2;
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    string s1 = static_cast<ostringstream*>( &(ostringstream() << rand_get()) )->str();
-    HashMap<string, string, STR_Hash, STR_Equal>::iterator it = dict.find(s1);
-    if (it != dict.end())
-      s ++;
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-
-const config_func_t table[] = {
-  { 41, "dictBig", 1000000, 0, test_dict_big, 0},
-  { 42,"dict", 1000000, 0, test_dict2, 0},
-  { 43,    "DictStr", 1000000, 0, test_dict_str, 0}
-};
-
-int main(int argc, const char *argv[])
-{
-  test("RIGTORP-HASHMAP", numberof(table), table, argc, argv);
-  exit(0);
-}
@@ -1,96 +0,0 @@
-#define NDEBUG
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-
-#include <rigtorp/MPMCQueue.h>
-
-#include "common.h"
-
-/********************************************************************************************/
-rigtorp::MPMCQueue<unsigned int> g_buff(4*64);
-rigtorp::MPMCQueue<unsigned long long> g_final(4*64);
-
-static void final(void *arg)
-{
-  size_t *p_n = (size_t*) arg;
-  size_t    n = *p_n;
-  unsigned long long j, s = 0;
-  for(unsigned int i = 0; i < n;i++) {
-    g_final.pop(j);
-    s += j;
-  }
-  g_result = s;
-}
-
-static void conso(void *arg)
-{
-  unsigned int j;
-  size_t *p_n = (size_t*)arg;
-  size_t n = *p_n;
-  unsigned long long s = 0;
-  for(unsigned int i = 0; i < n;i++) {
-    g_buff.pop(j);
-    s += j;
-  }
-  g_final.push(s);
-}
-
-static void prod(void *arg)
-{
-  size_t *p_n = (size_t*)arg;
-  size_t n = *p_n;
-  size_t r = n;
-  for(unsigned int i = 0; i < n;i++) {
-    g_buff.push(r);
-    r = r * 31421U + 6927U;
-  }
-}
-
-static void test_queue(size_t n)
-{
-  const int cpu_count   = get_cpu_count();
-  const int prod_count  = cpu_count/2;
-  const int conso_count = cpu_count - prod_count;
-  if (cpu_count < 2) {
-    fprintf(stderr, "WARNING: Can not measure Buffer performance.\n");
-    return;
-  }
-  rand_get();
-  // Create thread
-  m_thread_t idx_p[prod_count];
-  m_thread_t idx_c[conso_count];
-  m_thread_t idx_final;
-  for(int i = 0; i < prod_count; i++) {
-    m_thread_create (idx_p[i], prod, &n);
-  }
-  for(int i = 0; i < conso_count; i++) {
-    m_thread_create (idx_c[i], conso, &n);
-  }
-  size_t n2 = conso_count;
-  m_thread_create(idx_final, final, &n2);
-
-  // Wait for jobs to be done.
-  for(int i = 0; i < prod_count; i++) {
-    m_thread_join(idx_p[i]);
-  }
-  for(int i = 0; i < conso_count; i++) {
-    m_thread_join(idx_c[i]);
-  }
-  m_thread_join(idx_final);
-
-}
-
-
-/********************************************************************************************/
-
-const config_func_t table[] = {
-  { 60,    "Queue MPMC", 1000000, 0, test_queue, 0}
-};
-
-int main(int argc, const char *argv[])
-{
-  test("RIGTORP-MPMC-QUEUE", numberof(table), table, argc, argv);
-  exit(0);
-}
@@ -1,122 +0,0 @@
-#define NDEBUG
-
-#include <vector>
-#include <list>
-#include <iterator>
-#include <map>
-#include <set>
-#include <unordered_map>
-#include <algorithm>
-#include <string>
-#include <sstream>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <string.h>
-
-#include <sparsepp/spp.h>
-
-using spp::sparse_hash_map;
-using namespace std;
-
-#include "common.h"
-
-/********************************************************************************************/
-
-static void
-test_dict2(size_t  n)
-{
-  sparse_hash_map<unsigned long, unsigned long> dict;
-
-  for (size_t i = 0; i < n; i++) {
-    dict[rand_get()] = rand_get();
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    sparse_hash_map<unsigned long, unsigned long>::iterator it = dict.find(rand_get());
-    if (it != dict.end())
-      s += it->second;
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-
-struct char_array_s {
-  char a[256];
-  char_array_s () { a[0] = 0 ; }
-  char_array_s ( const char_array_s & other) { strcpy(a, other.a); }
-  bool operator==(const char_array_s &other) const { return strcmp(a, other.a) == 0; }
-};
-
-namespace std {
-  template <> struct hash<char_array_s> {
-    std::size_t operator()(const char_array_s &k) const {
-      size_t hash = 0;
-      const char *s = k.a;
-      while (*s) hash = hash * 31421 + (*s++) + 6927;
-      return hash;
-    };
-  };
-}
-
-static void
-test_dict_big(size_t  n)
-{
-  sparse_hash_map<char_array_s, char_array_s> dict;
-
-  for (size_t i = 0; i < n; i++) {
-    char_array_s s1, s2;
-    sprintf(s1.a, "%u", rand_get());
-    sprintf(s2.a, "%u", rand_get());
-    dict[s1] = s2;
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    char_array_s s1;
-    sprintf(s1.a, "%u", rand_get());
-    sparse_hash_map<char_array_s, char_array_s>::iterator it = dict.find(s1);
-    if (it != dict.end())
-      s ++;
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-static void
-test_dict_str(size_t  n)
-{
-  sparse_hash_map<string, string> dict;
-
-  for (size_t i = 0; i < n; i++) {
-    string s1 = static_cast<ostringstream*>( &(ostringstream() << rand_get()) )->str();
-    string s2 = static_cast<ostringstream*>( &(ostringstream() << rand_get()) )->str();
-    dict[s1] = s2;
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    string s1 = static_cast<ostringstream*>( &(ostringstream() << rand_get()) )->str();
-    sparse_hash_map<string, string>::iterator it = dict.find(s1);
-    if (it != dict.end())
-      s ++;
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-
-const config_func_t table[] = {
-  { 41, "dictBig", 1000000, 0, test_dict_big, 0},
-  { 42,"dict", 1000000, 0, test_dict2, 0},
-  { 43,    "DictStr", 1000000, 0, test_dict_str, 0}
-};
-
-int main(int argc, const char *argv[])
-{
-  test("SPARSEPP", numberof(table), table, argc, argv);
-  exit(0);
-}
@@ -1,278 +0,0 @@
-#define NDEBUG
-
-#include <vector>
-#include <deque>
-#include <list>
-#include <iterator>
-#include <map>
-#include <set>
-#include <unordered_map>
-#include <algorithm>
-#include <string>
-#include <sstream>
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <string.h>
-
-using namespace std;
-
-#include "common.h"
-
-/********************************************************************************************/
-
-static void test_list(size_t n)
-{
-  list<unsigned int> a1, a2;
-  for(size_t i = 0; i < n; i++) {
-    a1.push_back(rand_get() );
-    a2.push_back(rand_get() );
-  }
-  unsigned int s = 0;
-  for (list<unsigned int>::const_iterator ci1 = a1.begin(), ci2 = a2.begin (); ci1 != a1.end(); ++ci1, ++ci2) {
-    s += *ci1 * *ci2;
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-
-static void test_array(size_t n)
-{
-  vector<unsigned int> a1, a2;
-  for(size_t i = 0; i < n; i++) {
-    a1.push_back(rand_get() );
-    a2.push_back(rand_get() );
-  }
-  unsigned int s = 0;
-  for(unsigned long i = 0; i < n; i++) {
-    s += a1[i] * a2[i];
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-
-static void test_deque(size_t n)
-{
-  deque<unsigned int> a1, a2;
-  for(size_t i = 0; i < n; i++) {
-    a1.push_back(rand_get() );
-    a2.push_back(rand_get() );
-  }
-  unsigned int s = 0;
-  for(auto it1 = a1.cbegin(), it2 = a2.cbegin();
-      it1 != a1.cend() ;it1++, it2++) {
-    s += *it1 * *it2;
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-
-static void test_rbtree(size_t n)
-{
-  set<unsigned long> tree;
-
-  for (size_t i = 0; i < n; i++) {
-    tree.insert(rand_get());
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    set<unsigned long>::iterator it = tree.find(rand_get());
-    if (it != tree.end())
-      s += *it;
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-
-static void
-test_dict1(size_t  n)
-{
-  map<unsigned long, unsigned long> dict;
-
-  for (size_t i = 0; i < n; i++) {
-    dict[rand_get()] = rand_get();
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    map<unsigned long, unsigned long>::iterator it = dict.find(rand_get());
-    if (it != dict.end())
-      s += it->second;
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-
-static void
-test_dict2(size_t  n)
-{
-  unordered_map<unsigned long, unsigned long> dict;
-
-  for (size_t i = 0; i < n; i++) {
-    dict[rand_get()] = rand_get();
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    unordered_map<unsigned long, unsigned long>::iterator it = dict.find(rand_get());
-    if (it != dict.end())
-      s += it->second;
-  }
-  g_result = s;
-}
-
-static void
-test_dict2_linear(size_t  n)
-{
-  unordered_map<unsigned long, unsigned long> dict;
-
-  for (size_t i = 0; i < n; i++) {
-    dict[i] = rand_get();
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    unordered_map<unsigned long, unsigned long>::iterator it = dict.find(i);
-    if (it != dict.end())
-      s += it->second;
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-
-struct char_array_s {
-  char a[256];
-  char_array_s () { a[0] = 0 ; }
-  char_array_s ( const char_array_s & other) { strcpy(a, other.a); }
-  bool operator==(const char_array_s &other) const { return strcmp(a, other.a) == 0; }
-};
-
-namespace std {
-  template <> struct hash<char_array_s> {
-    std::size_t operator()(const char_array_s &k) const {
-      size_t hash = 0;
-      const char *s = k.a;
-      while (*s) hash = hash * 31421 + (*s++) + 6927;
-      return hash;
-    };
-  };
-}
-
-static void
-test_dict_big(size_t  n)
-{
-  unordered_map<char_array_s, char_array_s> dict;
-
-  for (size_t i = 0; i < n; i++) {
-    char_array_s s1, s2;
-    sprintf(s1.a, "%u", rand_get());
-    sprintf(s2.a, "%u", rand_get());
-    dict[s1] = s2;
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    char_array_s s1;
-    sprintf(s1.a, "%u", rand_get());
-    unordered_map<char_array_s, char_array_s>::iterator it = dict.find(s1);
-    if (it != dict.end())
-      s ++;
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-static void
-test_dict_str(size_t  n)
-{
-  unordered_map<string, string> dict;
-
-  for (size_t i = 0; i < n; i++) {
-    string s1 = to_string(rand_get());
-    string s2 = to_string(rand_get());
-    dict[s1] = s2;
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    string s1 = to_string (rand_get());
-    unordered_map<string, string>::iterator it = dict.find(s1);
-    if (it != dict.end())
-      s ++;
-  }
-  g_result = s;
-}
-
-static void
-test_dict_str2(size_t  n)
-{
-  map<string, string> dict;
-
-  for (size_t i = 0; i < n; i++) {
-    string s1 = to_string(rand_get());
-    string s2 = to_string(rand_get());
-    dict[s1] = s2;
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    string s1 = to_string(rand_get());
-    map<string, string>::iterator it = dict.find(s1);
-    if (it != dict.end())
-      s ++;
-  }
-  g_result = s;
-}
-
-/********************************************************************************************/
-
-static void test_sort(size_t n)
-{
-  vector<float> a1;
-  for(size_t i = 0; i < n; i++) {
-    a1.push_back(rand_get() );
-  }
-  sort(a1.begin(), a1.end());
-  g_result = a1[0];
-}
-
-static void test_stable_sort(size_t n)
-{
-  vector<float> a1;
-  for(size_t i = 0; i < n; i++) {
-    a1.push_back(rand_get() );
-  }
-  stable_sort(a1.begin(), a1.end());
-  g_result = a1[0];
-}
-
-/********************************************************************************************/
-
-const config_func_t table[] = {
-  { 10,    "List", 10000000, 0, test_list, 0},
-  { 20,   "Array", 100000000, 0, test_array, 0},
-  { 21,   "Deque", 100000000, 0, test_deque, 0},
-  { 30,  "Rbtree", 1000000, 0, test_rbtree, 0},
-  { 40,    "dict(m)", 1000000, 0, test_dict1, 0},
-  { 41, "dictBig", 1000000, 0, test_dict_big, 0},
-  { 42,"dict(u)", 1000000, 0, test_dict2, 0},
-  { 43,"DictStr(u)", 1000000, 0, test_dict_str, 0},
-  { 44,"DictStr(m)", 1000000, 0, test_dict_str2, 0},
-  { 46, "dictLinear(u)", 1000000, 0, test_dict2_linear, 0},
-  { 50,           "Sort",10000000, 0, test_sort, 0},
-  { 51,    "Stable Sort",10000000, 0, test_stable_sort, 0}
-};
-
-int main(int argc, const char *argv[])
-{
-  test("STL", numberof(table), table, argc, argv);
-  exit(0);
-}
@@ -1,258 +0,0 @@
-/*
- * M*LIB - String Bench
- *
- * Copyright (c) 2017-2021, Patrick Pelissier
- * All rights reserved.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * + Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * + Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#include <string>
-#include <sstream>
-#include <string>
-#include <vector>
-
-#include "common.h"
-
-#include "m-string.h"
-
-#ifdef BENCH_CAN_USE_SDS
-extern "C" {
-#include "sds.h"
-};
-#endif
-
-#ifdef BENCH_CAN_USE_BSTRLIB
-#include "bstrlib.h"
-#include "bstrwrap.h"
-#include "bstraux.h"
-#endif
-
-/*
- * BENCH
- * 2000000
- * 1. Generate N strings of random numbers 32 bits.
- * 2. Concat all strings in a string usigned a random permutation of N.
- * 3. Replace "1234" in the string into "WELL" until nothing remains.
- * 4. Replace "56789" in the string into "DONE" until nothing remains.
- * Return the final string length.
- */
-
-unsigned *permutation_tab = NULL;
-
-void random_permutation(unsigned n)
-{
-  if (permutation_tab) free(permutation_tab);
-  permutation_tab = (unsigned *) malloc(n * sizeof(unsigned));
-  if (permutation_tab == NULL) abort();
-  for(unsigned i = 0; i < n; i++)
-    permutation_tab[i] = i;
-  for(unsigned i = 0; i < n; i++) {
-    unsigned j = rand_get() % n;
-    unsigned k = rand_get() % n;
-    unsigned l = permutation_tab[j];
-    permutation_tab[j] = permutation_tab[k];
-    permutation_tab[k] = l;
-  }
-}
-
-using namespace std;
-
-static void replace_all_stl(string &str, const char pattern[], const char replace[])
-{
-  size_t pos = 0;
-  do {
-    pos = str.find(pattern, pos);
-    if (pos != string::npos) {
-      str.replace (pos, strlen(pattern), replace);
-    }
-  } while (pos != string::npos);
-}
-
-size_t bench_stl(unsigned n)
-{
-  vector<string> tab;
-  tab.resize(n);
-  for(unsigned i = 0; i < n; i++)
-    tab[i] = to_string(rand_get());
-
-  string str;
-  for(unsigned i = 0; i < n; i++) {
-    str += tab[permutation_tab[i]];
-  }
-
-  replace_all_stl(str, "1234", "WELL");
-  replace_all_stl(str, "56789", "DONE");
-
-  return str.length();
-}
-
-size_t bench_mlib(unsigned n)
-{
-  string_t *tab = (string_t*) malloc (n * sizeof (string_t));
-  assert (tab != 0);
-  // P1
-  for(unsigned i = 0; i < n; i++) {
-    string_init(tab[i]);
-    string_printf(tab[i], "%u", rand_get());
-  }
-  // P2
-  string_t str;
-  string_init(str);
-  for(unsigned i = 0; i < n; i++) {
-    string_cat(str, tab[permutation_tab[i]]);
-  }
-  // P3
-  string_replace_all_str(str, "1234", "WELL");
-  string_replace_all_str(str, "56789", "DONE");
-  size_t length = string_size(str);
-  // Clean
-  string_clear(str);
-  for(unsigned i = 0; i < n; i++) {
-    string_clear(tab[i]);
-  }
-  free(tab);
-  return length;
-}
-
-
-#ifdef BENCH_CAN_USE_BSTRLIB
-
-static void replace_all_bstrlib(CBString &str, const char pattern[], const char replace[])
-{
-  size_t pos = 0;
-  do {
-    pos = str.find(pattern, pos);
-    if (pos != string::npos) {
-      str.replace (pos, strlen(pattern), replace);
-    }
-  } while (pos != string::npos);
-}
-
-size_t bench_bstrlib(unsigned n)
-{
-  vector<CBString> tab;
-  tab.resize(n);
-  for(unsigned i = 0; i < n; i++) {
-    char tmp[10];
-    sprintf(tmp, "%u", rand_get());
-    tab[i] = tmp;
-  }
-
-  CBString str;
-  for(unsigned i = 0; i < n; i++) {
-    str += tab[permutation_tab[i]];
-  }
-
-  replace_all_bstrlib(str, "1234", "WELL");
-  replace_all_bstrlib(str, "56789", "DONE");
-
-  return str.length();
-}
-#endif
-
-#ifdef BENCH_CAN_USE_SDS
-sds SDS_replace_at(sds str, size_t pos, size_t len, const char str2[])
-{
-  // simple implementation as replace is not available
-  sds a = sdsnewlen((const void*) str, pos);
-  a = sdscat(a, str2);
-  a = sdscat(a, &str[pos+len]);
-  sdsfree(str);
-  return a;
-}
-
-sds replace_all_sds(sds str, const char pattern[], const char replace[])
-{
-  size_t pos = 0;
-  do {
-    char *p = strstr(&str[pos], pattern);
-    pos = p == NULL ? -1U : (p - str);
-    if (pos != -1U) {
-      str = SDS_replace_at(str, pos, strlen(pattern), replace);
-    }
-  } while (pos != -1U);
-  return str;
-}
-
-size_t bench_sds(unsigned n)
-{
-  sds *tab = (sds*) malloc (n * sizeof (sds));
-  assert (tab != 0);
-  // P1
-  for(unsigned i = 0; i < n; i++) {
-    tab[i] =  sdsfromlonglong(rand_get());
-  }
-  // P2
-  sds str = sdsempty();
-  for(unsigned i = 0; i < n; i++) {
-    str = sdscat(str, tab[permutation_tab[i]]);
-  }
-  // P3
-  str = replace_all_sds(str, "1234", "WELL");
-  str = replace_all_sds(str, "56789", "DONE");
-  // Clean
-  size_t length = sdslen(str);
-  sdsfree(str);
-  for(unsigned i = 0; i < n; i++) {
-    sdsfree(tab[i]);
-  }
-  free(tab);
-  return length;
-}
-#endif
-
-
-int main(int argc, const char *argv[])
-{
-  unsigned length, n = atoi(argv[1]);
-  unsigned select = atoi(argv[2]);
-  const char *name;
-  random_permutation(n);
-  rand_init();
-  unsigned long long t0 = cputime();
-
-  switch (select) {
-  case 0:
-    length = bench_mlib(n);
-    name = "MLIB";
-    break;
-  case 1:
-    length = bench_stl(n);
-    name = "STL";
-    break;
-#ifdef BENCH_CAN_USE_SDS
-  case 2:
-    length = bench_sds(n);
-    name = "SDS";
-    break;
-#endif
-#ifdef BENCH_CAN_USE_BSTRLIB
-  case 4:
-    length = bench_bstrlib(n);
-    name = "BSTRLIB";
-    break;
-#endif
-  default:
-    exit(0);
-  }
-  unsigned long long t1 = cputime();
-  printf("%5.5s LENGTH=%u T= %f s\n", name, length, (t1-t0) / 1000000.0 );
-
-  return 0;
-}
@@ -1,221 +0,0 @@
-#define NDEBUG
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <string.h>
-
-#include "tommyds/tommy.h"
-
-#include "common.h"
-
-/********************************************************************************************/
-
-static void test_array(size_t n)
-{
-  tommy_array a1, a2;
-
-  tommy_array_init(&a1);
-  tommy_array_init(&a2);
-  for(size_t i = 0; i < n; i++) {
-    unsigned int v = rand_get();
-    tommy_array_insert(&a1, (void*)(uintptr_t) v);
-    v = rand_get();
-    tommy_array_insert(&a2, (void*)(uintptr_t) v);
-  }
-  unsigned int s = 0;
-  for(unsigned long i = 0; i < n; i++) {
-    s += (uintptr_t) *tommy_array_ref(&a1, i) * (uintptr_t) *tommy_array_ref(&a2, i );
-  }
-  g_result = s;
-  tommy_array_done(&a1);
-  tommy_array_done(&a2);
-}
-
-/********************************************************************************************/
-
-struct list_node_s {
-  unsigned int value;
-  tommy_node node;
-};
-
-static void test_list (size_t n)
-{
-  tommy_list a1, a2;
-
-  tommy_list_init(&a1);
-  tommy_list_init(&a2);
-  for(size_t i = 0; i < n; i++) {
-    struct list_node_s *obj;
-    obj = malloc(sizeof(struct list_node_s));
-    if (obj == NULL) abort();
-    obj->value = rand_get();
-    tommy_list_insert_tail(&a1, &obj->node, obj);
-    obj = malloc(sizeof(struct list_node_s));
-    if (obj == NULL) abort();
-    obj->value = rand_get();
-    tommy_list_insert_tail(&a2, &obj->node, obj);
-  }
-  unsigned int s = 0;
-  for(tommy_node *it1 = tommy_list_head(&a1), *it2 = tommy_list_head(&a2)
-	; it1 != NULL; it1 = it1->next, it2 = it2->next ) {
-    struct list_node_s *obj1 = it1->data, *obj2 = it2->data;
-    s += obj1->value * obj2->value;
-  }
-  g_result = s;
-  tommy_list_foreach(&a1, free);
-  tommy_list_foreach(&a2, free);
-}
-
-/********************************************************************************************/
-
-struct tree_node_s {
-  unsigned long value;
-  tommy_tree_node node;
-} ;
-
-static int compare(const void *a, const void *b)
-{
-  const struct tree_node_s *pa = a;
-  const struct tree_node_s *pb = b;
-  return (pa->value < pb->value) ? -1 : (pa->value > pb->value);
-}
-
-static void test_rbtree(size_t n)
-{
-  tommy_tree tree;
-  tommy_tree_init(&tree, compare);
-  for (size_t i = 0; i < n; i++) {
-    struct tree_node_s *obj = malloc(sizeof(struct tree_node_s));
-    if (obj == NULL) abort();
-    obj->value = rand_get();
-    tommy_tree_insert(&tree, &obj->node, obj);
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    struct tree_node_s key = { .value = rand_get() };
-    struct tree_node_s *obj = tommy_tree_search (&tree, &key);
-    if (obj)
-      s += obj->value;
-  }
-  g_result = s;
-  tommy_tree_foreach(&tree, free);
-}
-
-/********************************************************************************************/
-
-struct hash_i_node_s {
-  unsigned long key;
-  unsigned long value;
-  tommy_node node;
-};
-
-static inline size_t hash_func (const unsigned long key)
-{
-  return key;
-}
-
-static int equal_func(const void* arg, const void *obj_p)
-{
-  const struct hash_i_node_s *obj = obj_p;
-  const unsigned long *key = arg;
-  return *key != obj->key;
-}
-
-static void
-test_dict(size_t  n)
-{
-  tommy_hashlin dict;
-  tommy_hashlin_init(&dict);
-  for (size_t i = 0; i < n; i++) {
-    struct hash_i_node_s *obj = malloc(sizeof (struct hash_i_node_s));
-    if(!obj) abort();
-    obj->key = rand_get();
-    obj->value = rand_get();
-    tommy_hashlin_insert(&dict, &obj->node, obj, hash_func(obj->key));
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    unsigned long key = rand_get();
-    struct hash_i_node_s *obj = tommy_hashlin_search(&dict, &equal_func,
-						      &key,
-						      hash_func(key));
-    if (obj)
-      s += obj->value;
-  }
-  g_result = s;
-  tommy_hashlin_done(&dict);
-}
-
-/********************************************************************************************/
-
-typedef char char_array_t[256];
-
-struct hash_b_node_s {
-  char_array_t key;
-  char_array_t value;
-  tommy_node node;
-};
-
-static int char_equal (const void *arg, const void *obj_p)
-{
-  const struct hash_b_node_s *obj = obj_p;
-  const char_array_t *key = (const char_array_t *)arg;
-  return strcmp(*key, (obj->key));
-}
-
-static size_t char_hash(const char *s)
-{
-  size_t hash = 0;
-  while (*s) hash = hash * 31421 + (*s++) + 6927;
-  return hash;
-}
-
-static void
-test_dict_big(size_t  n)
-{
-  tommy_hashlin dict;
-  tommy_hashlin_init(&dict);
-  for (size_t i = 0; i < n; i++) {
-    struct hash_b_node_s *obj = malloc(sizeof (struct hash_b_node_s));
-    if(!obj) abort();
-    sprintf(obj->key, "%u", rand_get());
-    sprintf(obj->value, "%u", rand_get());
-    /* NOTE: this is not an insert_or_replace func...
-       It will always insert a new node, even if the key already exists...
-       Maybe searching then inserting will be a better representative?
-    */
-    tommy_hashlin_insert(&dict, &obj->node, obj, char_hash(obj->key));
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    char_array_t s1;
-    sprintf(s1, "%u", rand_get());
-    struct hash_b_node_s *obj = tommy_hashlin_search(&dict, &char_equal,
-						      &s1,
-						      char_hash(s1));
-    if (obj)
-      s ++;
-  }
-  g_result = s;
-  tommy_hashlin_done(&dict);
-}
-
-/********************************************************************************************/
-
-const config_func_t table[] = {
-  { 10,    "List", 10000000, 0, test_list, 0},
-  { 20,   "Array", 100000000, 0, test_array, 0},
-  { 30,  "Rbtree", 1000000, 0, test_rbtree, 0},
-  { 40,    "dict", 1000000, 0, test_dict, 0},
-  { 41, "dictBig", 1000000, 0, test_dict_big, 0}
-};
-
-int main(int argc, const char *argv[])
-{
-  test("TommyDS", numberof(table), table, argc, argv);
-  exit(0);
-}
@@ -1,215 +0,0 @@
-#define NDEBUG
-#define  _GNU_SOURCE
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-#include <string.h>
-
-#include "include/uthash.h"
-#include "include/utarray.h"
-#include "include/utlist.h"
-
-#include "common.h"
-
-/********************************************************************************************/
-
-static const UT_icd int_icd = {
-  .sz = sizeof (unsigned int),
-  .init = NULL,
-  .dtor = NULL,
-  .copy = NULL
-};
-
-static void test_array(size_t n)
-{
-  UT_array a1, a2;
-
-  utarray_init(&a1, &int_icd);
-  utarray_init(&a2, &int_icd);
-  
-  for(size_t i = 0; i < n; i++) {
-    unsigned int v1 = rand_get(), v2 = rand_get();
-    utarray_push_back(&a1, &v1);
-    utarray_push_back(&a2, &v2);
-  }
-  unsigned int s = 0;
-  for(unsigned long i = 0; i < n; i++) {
-    s += *(unsigned long *) utarray_eltptr(&a1, i ) * *(unsigned long *)utarray_eltptr(&a2, i );
-  }
-  g_result = s;
-
-  utarray_done(&a1);
-  utarray_done(&a2);
-}
-
-/********************************************************************************************/
-
-struct list_node_s {
-  unsigned int value;
-  struct list_node_s *next;
-};
-
-static void test_list (size_t n)
-{
-  struct list_node_s *a1 = NULL, *a2 = NULL;
-
-  for(size_t i = 0; i < n; i++) {
-    struct list_node_s *p = malloc(sizeof(struct list_node_s));
-    if (!p) abort();
-    p->value = rand_get();
-    LL_PREPEND(a1, p);
-    p = malloc(sizeof(struct list_node_s));
-    if (!p) abort();
-    p->value = rand_get();
-    LL_PREPEND(a2, p);
-  }
-  unsigned int s = 0;
-  for(struct list_node_s *it1 = a1, *it2 = a2
-	; it1 != NULL
-	; it1 = it1->next, it2 = it2->next) {
-    s += it1->value * it2->value;
-  }
-  g_result = s;
-
-  struct list_node_s *el;
-  LL_FOREACH(a1, el) free(el);
-  LL_FOREACH(a2, el) free(el);
-}
-
-/********************************************************************************************/
-
-struct hash_i_node_s {
-  unsigned long key;
-  unsigned long value;
-  UT_hash_handle hh;
-};
-
-static void
-test_dict(size_t  n)
-{
-  struct hash_i_node_s *dict = NULL;
-  
-  for (size_t i = 0; i < n; i++) {
-    unsigned long k = rand_get();
-    struct hash_i_node_s *s;
-    HASH_FIND(hh, dict, &k, sizeof (unsigned long), s);
-    if (s == NULL) {
-      s = malloc(sizeof(struct hash_i_node_s));
-      if (!s) abort();
-      s->key = k;
-      s->value = rand_get();
-      HASH_ADD(hh, dict, key, sizeof(unsigned long), s);
-    }
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    unsigned long k = rand_get();
-    struct hash_i_node_s *sp;
-    HASH_FIND(hh, dict, &k, sizeof (unsigned long), sp);
-    if (sp != NULL)
-      s += sp->value;
-  }
-  g_result = s;
-  struct hash_i_node_s *current, *tmp;
-  HASH_ITER(hh, dict, current, tmp) {
-    HASH_DEL(dict,current);  /* delete it (users advances to next) */
-    free(current);            /* free it */
-  }
-}
-
-/********************************************************************************************/
-
-typedef struct {
-  char a[256];
-} char_array_t;
-
-struct hash_b_node_s {
-  char_array_t key;
-  char_array_t value;
-  UT_hash_handle hh;
-};
-
-static void
-test_dict_big(size_t  n)
-{
-  struct hash_b_node_s *dict = NULL;
-
-  for (size_t i = 0; i < n; i++) {
-    char_array_t k;
-    sprintf(k.a, "%u", rand_get());
-    struct hash_b_node_s *s;
-    HASH_FIND(hh, dict, &k, sizeof (char_array_t), s);
-    if (s == NULL) {
-      s = malloc(sizeof(struct hash_b_node_s));
-      if (!s) abort();
-      memcpy(s->key.a, k.a, sizeof(s->key));
-      sprintf(s->value.a, "%u", rand_get());
-      HASH_ADD(hh, dict, key, sizeof(char_array_t), s);
-    }
-  }
-  rand_init();
-  unsigned int s = 0;
-  for (size_t i = 0; i < n; i++) {
-    char_array_t k;
-    sprintf(k.a, "%u", rand_get());
-    struct hash_b_node_s *sp;
-    HASH_FIND(hh, dict, &k, sizeof (char_array_t), sp);
-    if (sp != NULL)
-      s ++;
-  }
-  g_result = s;
-
-  struct hash_b_node_s *current, *tmp;
-  HASH_ITER(hh, dict, current, tmp) {
-    HASH_DEL(dict,current);  /* delete it (users advances to next) */
-    free(current);            /* free it */
-  }
-}
-
-/********************************************************************************************/
-
-static const UT_icd float_icd = {
-  .sz = sizeof (float),
-  .init = NULL,
-  .dtor = NULL,
-  .copy = NULL
-};
-
-static int cmp(const void *a1, const void *a2)
-{
-  const float *f1 = a1;
-  const float *f2 = a2;
-  return (*f1 < *f2) ? -1 : (*f1 > *f2);
-}
-
-static void test_sort(size_t n)
-{
-  UT_array a1;
-
-  utarray_init(&a1, &float_icd);
-  for(size_t i = 0; i < n; i++) {
-    float v1 = rand_get();
-    utarray_push_back(&a1, &v1);
-  }
-  utarray_sort(&a1, cmp);
-  g_result = *(float *)utarray_eltptr(&a1, 0);
-  utarray_done(&a1);  
-}
-
-/********************************************************************************************/
-
-const config_func_t table[] = {
-  { 10,    "List", 10000000, 0, test_list, 0},
-  { 20,   "Array", 100000000, 0, test_array, 0},
-  { 40,    "dict", 1000000, 0, test_dict, 0},
-  { 41, "dictBig", 1000000, 0, test_dict_big, 0},
-  { 50,    "sort", 10000000, 0, test_sort, 0}
-};
-
-int main(int argc, const char *argv[])
-{
-  test("UT-HASH", numberof(table), table, argc, argv);
-  exit(0);
-}
@@ -1,42 +0,0 @@
-#define NDEBUG
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <stdbool.h>
-
-#include "xxhash.h"
-
-#include "common.h"
-
-static unsigned long *g_p;
-
-static void test_hash_prepare(size_t n)
-{
-  g_p = malloc (n * sizeof(unsigned long));
-  if (g_p == NULL) abort();
-  for(size_t i = 0; i < n ; i++)
-    g_p[i] = ((rand_get()*RAND_MAX + rand_get())*RAND_MAX+rand_get())*RAND_MAX + rand_get();
-}
-
-
-static void test_hash_final(void)
-{
-  free(g_p);
-}
-
-static void test_hash(size_t n)
-{
-  g_result = XXH64(g_p, sizeof(unsigned long)*n, 0);
-}
-
-/********************************************************************************************/
-
-const config_func_t table[] = {
-  { 70,"XXHASH64", 100000000, test_hash_prepare, test_hash, test_hash_final}
-};
-
-int main(int argc, const char *argv[])
-{
-  test("XXHASH", numberof(table), table, argc, argv);
-  exit(0);
-}
@@ -1,304 +0,0 @@
-/*
- * M*LIB - common functions for bench module
- *
- * Copyright (c) 2017-2021, Patrick Pelissier
- * All rights reserved.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * + Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * + Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-
-#include <string.h>
-#include "common.h"
-
-// Maximum supported value for repeat argument
-#define MAX_REPEAT 10000
-
-// The global result
-unsigned long g_result;
-
-// The rand value
-#if defined(MULTI_THREAD_MEASURE)
-M_THREAD_ATTR
-#endif
-unsigned int randValue = 0;
-
-void compiler_barrier(void *p)
-{
-  // Do nothing, but let the compiler thinks that we did.
-  (void) p;
-  // Can be used for FLTO building
-  //  asm volatile("": "+r" (p) : :"memory");
-}
-
-struct parse_opt_s {
-  int test_function;
-  double from, to, step, grow;
-  double within;
-  unsigned repeat;
-  bool graph, best, best_within, average, quiet;
-};
-
-static void
-parse_config(struct parse_opt_s *opt, int argc, const char *argv[])
-{
-  char *end;
-  
-  opt->test_function = 0;
-  opt->from = 0.0;
-  opt->to   = 0.0;
-  opt->step = 0.0;
-  opt->grow = 1.1;
-  opt->graph = false;
-  opt->best = false;
-  opt->best_within = false;
-  opt->average = false;
-  opt->quiet = false;
-  opt->repeat = 1;
-  opt->within = .05;
-  
-  for(int i = 1; i < argc ; i++)
-    {
-      if (argv[i][0] == '-') {
-	if (strcmp(argv[i], "--from") == 0){
-	  i++;
-	  opt->from = strtod(argv[i], &end);
-	  opt->to   = opt->from;
-	} else if (strcmp(argv[i], "--to") == 0) {
-	  i++;
-	  opt->to = strtod(argv[i], &end);
-	  opt->grow = 1.1;
-	} else if (strcmp(argv[i], "--step") == 0) {
-	  i++;
-	  opt->step = strtod(argv[i], &end);
-	  opt->grow = 0;
-	} else if (strcmp(argv[i], "--grow") == 0) {
-	  i++;
-	  opt->grow = strtod(argv[i], &end);
-	  opt->step = 0;
-	} else if (strcmp(argv[i], "--repeat") == 0) {
-	  i++;
-	  opt->repeat = strtol(argv[i], &end, 10);
-	  opt->repeat = (opt->repeat > MAX_REPEAT) ? MAX_REPEAT : opt->repeat;
-	} else if (strcmp(argv[i], "--graph") == 0) {
-	  opt->graph = true;
-	} else if (strcmp(argv[i], "--best") == 0) {
-	  opt->best = true;
-	  opt->average = false;
-	  opt->best_within = false;
-	} else if (strcmp(argv[i], "--best-within") == 0) {
-	  opt->best_within = true;
-	  opt->best = false;
-	  opt->average = false;
-	  i++;
-	  opt->within = strtod(argv[i], &end) / 100.0;
-	} else if (strcmp(argv[i], "--average") == 0) {
-	  opt->average = true;
-	  opt->best = false;
-	  opt->best_within = false;
-	} else if (strcmp(argv[i], "--quiet") == 0) {
-	  opt->quiet = true;
-	} else {
-	  fprintf(stderr, "ERROR: Option unkown: %s.\n",
-		  argv[i]);
-	  exit(-1);
-	}
-	if (*end != 0) {
-	  fprintf(stderr, "ERROR: Cannot parse %s. Expected float\n",
-		  argv[i]);
-	  exit(-1);
-	}
-
-      } else {
-	opt->test_function = strtol (argv[i], &end, 10);
-	if (*end != 0) {
-	  fprintf(stderr, "ERROR: Cannot parse %s. Expected function number\n",
-		  argv[i]);
-	  exit(-1);
-	}
-      }
-    }
-}
-
-static int
-select_config(int func, size_t n, const config_func_t functions[])
-{
-  for(size_t i = 0; i < n;i++) {
-    if (functions[i].num == func)
-      return i;
-  }
-  fprintf(stderr, "ERROR: Function number %d not found. Available functions are:\n", func);
-  for(size_t i = 0; i < n;i++) {
-    fprintf(stderr, "  %d: %s\n", functions[i].num, functions[i].funcname);
-  }
-  fprintf(stderr,
-	  "USAGE: FUNC_NUMBER [--from number --to number (--grow number | --step number)] [--grapĥ]\n"
-	  "[--repeat number] [--best|--average|--best-within] [--quiet]\n");
-  exit(-1);
-}
-
-// Utility function for qsort
-static int cmp_double(const void *pa, const void *pb)
-{
-  const double *a = (const double *) pa, *b = (const double *)pb;
-  return (*a < *b) ? -1 : *a > *b;
-}
-
-/* Get the longest sequence of values within 'f'% */
-static int
-get_sequence(int i, int n, double tab[], double f)
-{
-  int j;
-  for(j = i + 1; j < n; j++) {
-    if (tab[j] > f * tab[i])
-      break;
-  }
-  return j-i;
-}
-
-/* Return the minimum of the longest sequence of values with 'f'% */
-static double
-get_best_within(int n, double tab[], double f)
-{
-  qsort(tab, n, sizeof(double), cmp_double);
-  int best_i   = 0;
-  int best_seq = get_sequence(0, n, tab, f);
-  for(int i = 1; i < n && (n-i) > best_seq ; i++) {
-    int seq = get_sequence(i, n, tab, f);
-    if (seq > best_seq) {
-      best_i = i;
-      best_seq = seq;
-    }
-  }
-  return tab[best_i];
-}
-
-// Integer sqrt function (to avoid depending on libm)
-static unsigned integer_sqrt(unsigned n)
-{
-  // Find greatest shift.
-  int shift = 2;
-  unsigned nShifted = n >> shift;
-  // We check for nShifted being n, since some implementations
-  // perform shift operations modulo the word size.
-  while (nShifted != 0 && nShifted != n){
-    shift += 2;
-    nShifted = n >> shift;
-  }
-  shift -= 2;
-  // Find digits of result.
-  unsigned result = 0;
-  while (shift >= 0) {
-    result = result << 1;
-    unsigned candidateResult = result + 1;
-    if (candidateResult*candidateResult <= n >> shift) {
-      result = candidateResult;
-    }
-    shift -= 2;
-  }
-  return result;
-}
-
-void
-test(const char library[], size_t n, const config_func_t functions[], int argc, const char *argv[])
-{
-  // Init & parse arguments
-  // NUMBER
-  // --from NUMBER --to NUMBER --step NUMBER --grow NUMBER
-  // --graph --best --average --quiet
-  // --repeat N
-  struct parse_opt_s arg;
-  parse_config(&arg, argc, argv);
-  int i = select_config(arg.test_function, n, functions);
-  double from = (arg.from == 0) ? functions[i].default_n : arg.from;
-  double to   = (arg.to   == 0) ? functions[i].default_n : arg.to;
-
-  // Open plot file if needed
-  FILE *graph_file = NULL;
-  if (arg.graph) {
-    char filename[100];
-    sprintf(filename, "plot-%s-%d.dat", library, arg.test_function);
-    graph_file = fopen(filename, "wt");
-    if (!graph_file) {
-      fprintf(stderr, "ERROR: Cannot create plot.dat\n");
-      exit(-2);
-    }
-    fprintf(graph_file, "# plotting %s-%d : %s\n# N T", library, arg.test_function, functions[i].funcname);
-  }
-  
-  // Do the bench
-  for(double n = from; n <= to ; n = ((arg.grow == 0) ? n + arg.step : n * arg.grow))
-    {
-      double best = (1.0/0.0);
-      double avg  = 0.0;
-      double variance = 0.0;
-      static double measure[MAX_REPEAT];
-      double ba = 0.0;
-      
-      if (functions[i].init != NULL)
-	functions[i].init(n);
-
-      // Measure the time of the test_function
-      for(unsigned r = 0; r < arg.repeat; r++) {
-	double t0 = test_function( (arg.graph|arg.best|arg.average|arg.quiet) ? NULL : functions[i].funcname, (size_t) n, functions[i].func);
-	best = (t0 < best) ? t0 : best;
-	avg += t0;
-	variance += t0 * t0;
-	measure[r] = t0;
-      }
-
-      // Closure of the tests
-      if (functions[i].clear != NULL)
-	functions[i].clear();
-
-      // Finish computing the different times
-      if (arg.repeat > 1) {
-	avg /= arg.repeat;
-	variance = (variance - arg.repeat * avg * avg) / (arg.repeat - 1);
-	ba = get_best_within(arg.repeat, measure, 1. + arg.within);
-      }
-      
-      // The average value shall be around best_within (and greater)
-      // otherwise the result doesn't seem reliable.
-      bool reliable = (ba <= avg && ba * (1.0+arg.within/2) + 0.5 > avg);
-      
-      // Print the result
-      if (arg.graph) {
-	fprintf(graph_file, "%f %f\n", n, arg.average ? avg : arg.best ? best : ba);
-      } else if (arg.quiet) {
-	printf("%ld\n", (long)(arg.average ? avg : arg.best ? best : reliable ? ba : -1));
-      } else if (arg.repeat > 1) {
-	if (arg.average == false && arg.best_within == false)
-	  printf ("%20.20s time %lu ms for n = %lu ***   BEST  ***\n", functions[i].funcname, (unsigned long) best, (unsigned long) n);
-	if (arg.best == false  && arg.best_within == false)
-	  printf ("%20.20s time %lu ms +/- %u ms for n = %lu *** AVERAGE ***\n", functions[i].funcname, (unsigned long) avg, 2*integer_sqrt(variance), (unsigned long) n);
-	if (arg.best == false  && arg.average == false)
-	  printf ("%20.20s time %lu ms for n = %lu *** BEST within %d%% *** %s\n", functions[i].funcname, (unsigned long) ba, (unsigned long) n, (int)(100*arg.within), reliable ? "" : "(unreliable result)");
-      }
-    }
-  
-  // Close the FILE if needed
-  if (arg.graph) {
-    fclose(graph_file);
-    printf("File plot-%s-%d.dat generated.\n"
-	   "Run in gnuplot the following command:\n"
-	   "\tplot 'plot-%s-%d.dat' with linespoints linestyle 1\n",
-	   library, arg.test_function, library, arg.test_function);
-  }
-  return;
-}
@@ -1,172 +0,0 @@
-/*
- * M*LIB - common functions for bench module
- *
- * Copyright (c) 2017-2021, Patrick Pelissier
- * All rights reserved.
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * + Redistributions of source code must retain the above copyright
- *   notice, this list of conditions and the following disclaimer.
- * + Redistributions in binary form must reproduce the above copyright
- *   notice, this list of conditions and the following disclaimer in the
- *   documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL THE REGENTS AND CONTRIBUTORS BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
-#ifndef __COMMON_BENCH__H
-#define __COMMON_BENCH__H
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdbool.h>
-
-// Needed for M_THREAD_ATTR
-#if defined(MULTI_THREAD_MEASURE)
-#include "m-mutex.h"
-#endif
-
-#if defined(_WIN32)
-# include <windows.h>
-#elif (defined(__APPLE__) && defined(__MACH__)) \
-  || defined(__DragonFly__) || defined(__FreeBSD__) \
-  || defined(__NetBSD__) || defined(__OpenBSD__)
-# include <sys/types.h>
-# include <sys/resource.h>
-# include <sys/time.h>
-# include <sys/param.h>
-# include <sys/sysctl.h>
-# define USE_SYSCTL
-#else
-# include <sys/types.h>
-# include <sys/resource.h>
-# include <sys/time.h>
-# include <unistd.h>
-#endif
-
-// Number of elements of a table
-#define numberof(x) (sizeof(x)/sizeof(x[0]))
-
-/* Get the current CPU time. */
-#if defined(_WIN32)
-/* WINDOWS variant */
-static inline unsigned long long
-cputime (void)
-{
-  LARGE_INTEGER freq, val;
-  QueryPerformanceFrequency(&freq);
-  QueryPerformanceCounter(&val);
-  return (unsigned long long) (1000000. * (double) val.QuadPart / (double) freq.QuadPart);
-}
-#else
-/* UNIX variant */
-static inline unsigned long long
-cputime (void)
-{
-#if defined(MULTI_THREAD_MEASURE)
-  // Multi thread: Uses real time
-  struct timeval tv;
-  gettimeofday (&tv, NULL);
-  return tv.tv_sec * 1000000ULL + tv.tv_usec;
-#else
-  // Single thread: Uses process usage time
-  struct rusage rus;
-  getrusage (0, &rus);
-  return rus.ru_utime.tv_sec * 1000000ULL + rus.ru_utime.tv_usec;
-#endif
-}
-
-#endif
-
-// The result of the bench
-extern unsigned long g_result;
-
-// The rand value
-extern
-#if defined(MULTI_THREAD_MEASURE)
-M_THREAD_ATTR
-#endif
-unsigned int randValue;
-
-// Pseudo rand value generator.
-// Not very random but sufficient and fast enough for the bench
-static inline void rand_init(void)
-{
-  randValue = 0;
-}
-static inline unsigned int rand_get(void)
-{
-  randValue = randValue * 31421U + 6927U;
-  return randValue;
-}
-
-// The function that performs the bench
-static inline double
-test_function(const char *str, size_t n, void (*func)(size_t))
-{
-  double result;
-  unsigned long long start, end;
-  rand_init();
-  start = cputime();
-  (*func)(n);
-  end = cputime();
-  result = (double)(end-start) / 1000.0;
-  end = (end - start) / 1000U;
-  if (str != NULL) {
-    printf ("%20.20s time %lu ms for n = %lu [r=%lu]\n", str, (unsigned long) end, (unsigned long) n, g_result);
-  }
-  return result;
-}
-
-// Configuration table
-typedef struct {
-  int num;
-  const char *funcname;
-  size_t default_n;
-  void (*init)(size_t);
-  void (*func)(size_t);
-  void (*clear)(void);
-} config_func_t;
-
-// Perform a parsing of the given arguments and do the bench according to the table
-#ifdef __cplusplus
-extern "C"
-#endif
-void test(const char library[], size_t n, const config_func_t functions[], int argc, const char *argv[]);
-
-/* Return the number of CPU of the system */
-static inline int get_cpu_count(void)
-{
-#if defined(_WIN32)
-  SYSTEM_INFO sysinfo;
-  GetSystemInfo(&sysinfo);
-  return sysinfo.dwNumberOfProcessors;
-#elif defined(USE_SYSCTL)
-  int nm[2];
-  int count = 0;
-  size_t len = sizeof (count);
-  nm[0] = CTL_HW;
-  nm[1] = HW_NCPU;
-  sysctl(nm, 2, &count, &len, NULL, 0);
-  return MAX(1, count);
-#elif defined (_SC_NPROCESSORS_ONLN)
-  return sysconf(_SC_NPROCESSORS_ONLN);
-#else
-  return 1;
-#endif
-}
-
-#ifdef __cplusplus
-extern "C"
-#endif
-void compiler_barrier(void *p);
-
-#endif
@@ -1,22 +0,0 @@
-CC=cc -std=c11
-CXX=c++ -std=c++11
-CFLAGS=-O2 -march=native -Wall
-CPPFLAGS=-I../..
-
-all: k-nucleotide
-
-k-nucleotide: k-nucleotide.exe data.txt
-	./k-nucleotide.exe < data.txt
-
-k-nucleotide.exe: nucleotide.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) nucleotide.c -o k-nucleotide.exe -lpthread
-
-data.txt: fasta.exe
-	./fasta.exe 25000000 > data.txt
-
-fasta.exe: fasta.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -fopenmp fasta.c -o fasta.exe
-
-clean:
-	rm -f *.exe *~ *.o data.txt
-
@@ -1,344 +0,0 @@
-// The Computer Language Benchmarks Game
-// http://benchmarksgame.alioth.debian.org/
-//
-// contributed by Jeremy Zerfas
-// rewritten by Аноним Легионов, inspired by fasta Rust #2 program
-// use two OpenMP locks instead of one critical section
-// decouples IO activity from random number generation
-//
-// modified by Josh Goldfoot, adding use of a buffer for fasta_repeat
-
-
-// This controls the width of lines that are output by this program.
-#define MAXIMUM_LINE_WIDTH	60
-
-// This program will generate the random nucleotide sequences in parallel which
-// are worked on in blocks of lines. The number of lines in those blocks is
-// controlled by this setting.
-#define LINES_PER_BLOCK 1024
-
-#define CHARACTERS_PER_BLOCK (MAXIMUM_LINE_WIDTH*LINES_PER_BLOCK)
-
-#define THREADS_TO_USE 4
-
-#include <stdint.h>
-#include <string.h>
-#include <stdio.h>
-#include <stdlib.h>
-
-#ifdef _OPENMP
-#include <omp.h>
-#endif
-
-// intptr_t should be the native integer type on most sane systems.
-typedef intptr_t intnative_t;
-
-typedef struct
-{
-	char letter;
-	float probability;
-} nucleotide_info;
-
-
-// Repeatedly print string_To_Repeat until it has printed
-// number_Of_Characters_To_Create. The output is also wrapped to
-// MAXIMUM_LINE_WIDTH columns.
-static char* make_Sequence_Buffer(const char string_To_Repeat[])
-{
-	const intnative_t string_To_Repeat_Length = strlen(string_To_Repeat);
-
-	// JG: Changed to that this writes a sequence to a buffer, which is used
-	intnative_t number_Of_Characters_To_Create = string_To_Repeat_Length * MAXIMUM_LINE_WIDTH;
-	char* buffer = (char*) malloc(number_Of_Characters_To_Create + 
-		number_Of_Characters_To_Create / MAXIMUM_LINE_WIDTH + 1);
-	if (buffer == NULL)
-		exit(-1);
-	char* bufferOffset = buffer;
-
-	// Create an extended_String_To_Repeat which is a copy of string_To_Repeat
-	// but extended with another copy of the first MAXIMUM_LINE_WIDTH characters
-	// of string_To_Repeat appended to the end. Later on this allows us to
-	// generate a line of output just by doing simple memory copies using an
-	// appropriate offset into extended_String_To_Repeat.
-	char extended_String_To_Repeat[string_To_Repeat_Length + MAXIMUM_LINE_WIDTH];
-	for (intnative_t column = 0; column<string_To_Repeat_Length + MAXIMUM_LINE_WIDTH;
-		column++)
-		extended_String_To_Repeat[column] =
-		string_To_Repeat[column%string_To_Repeat_Length];
-	intnative_t offset = 0;
-
-	char line[MAXIMUM_LINE_WIDTH + 1];
-	line[MAXIMUM_LINE_WIDTH] = '\n';
-
-	for (intnative_t current_Number_Of_Characters_To_Create =
-		number_Of_Characters_To_Create;
-		current_Number_Of_Characters_To_Create>0;)
-	{
-		// Figure out the length of the line we need to write. If it's less than
-		// MAXIMUM_LINE_WIDTH then we also need to add a line feed in the right
-		// spot too.
-		intnative_t line_Length = MAXIMUM_LINE_WIDTH;
-		if (current_Number_Of_Characters_To_Create<MAXIMUM_LINE_WIDTH)
-		{
-			line_Length = current_Number_Of_Characters_To_Create;
-			line[line_Length] = '\n';
-		}
-
-		memcpy(line, extended_String_To_Repeat + offset, line_Length);
-
-		// Update the offset, reducing it by string_To_Repeat_Length if
-		// necessary.
-		offset += line_Length;
-		if (offset>string_To_Repeat_Length)
-			offset -= string_To_Repeat_Length;
-
-		// "Output" that line to our buffer and update the
-		// current_Number_Of_Characters_To_Create.
-		memcpy(bufferOffset, line, line_Length + 1); //  JG: used to be fwrite(line, line_Length + 1, 1, stdout);
-		bufferOffset += line_Length + 1;
-		current_Number_Of_Characters_To_Create -= line_Length;
-	}
-	*bufferOffset = 0;
-	return buffer;
-}
-
-void repeat_And_Wrap_String(const char string_To_Repeat[], intnative_t number_Of_Characters_To_Create) 
-{
-	/* JG: fasta_repeat repeats every len(alu) * line-length = 287 * 61 = 17507 characters.
-	       So, calculate this once, then just print that buffer over and over. */
-	char* sequence = make_Sequence_Buffer(string_To_Repeat);
-	intnative_t sequenceLen = (intnative_t) strlen(sequence);
-	intnative_t outputBytes = number_Of_Characters_To_Create + number_Of_Characters_To_Create / 60;
-	while (outputBytes >= sequenceLen) {
-		fwrite(sequence, sequenceLen, 1, stdout);
-		outputBytes -= sequenceLen;
-	}
-	if (outputBytes > 0) {
-		fwrite(sequence, outputBytes, 1, stdout);
-		printf("\n"); 
-	}
-	free(sequence);
-}
-
-
-// Generate a pseudorandom number from 0 to max using a linear
-// congruential generator.
-#define IM		139968
-#define IA		3877
-#define IC		29573
-uint32_t seed = 42;
-
-int rng_tid; //Thread ID
-int rng_tnum = 1; //Thread number
-intnative_t rng_cnt = 0;
-
-#ifdef _OPENMP
-omp_lock_t rng_lock;
-#define RNG_LOCK_INIT() omp_init_lock(&rng_lock)
-#define RNG_LOCK() omp_set_lock(&rng_lock)
-#define RNG_FREE() omp_unset_lock(&rng_lock)
-#else
-#define RNG_LOCK_INIT() do{}while(0)
-#define RNG_LOCK() do{}while(0)
-#define RNG_FREE() do{}while(0)
-#endif
-
-static void rng_init(void)
-{
-	RNG_LOCK_INIT();
-	rng_tid = 0;
-}
-
-static intnative_t rng_gen_blk(uint32_t * buf, intnative_t len, int curr_tid)
-{
-	intnative_t gen_cnt = -1;//Error by default
-	RNG_LOCK();
-
-	if (rng_tid == curr_tid)
-	{
-		if (++rng_tid >= rng_tnum)
-		{
-			rng_tid = 0;
-		}
-
-		gen_cnt = (len<rng_cnt) ? len : rng_cnt;
-		rng_cnt -= gen_cnt;
-
-		len = gen_cnt;
-
-		while (0 != len--)
-		{
-			seed = (seed*IA + IC) % IM;
-			*(buf++) = seed;//This is stupid actually!
-		}
-	}
-
-	RNG_FREE();
-	return gen_cnt;
-}
-
-int out_tid; //Thread ID
-int out_tnum = 1; //Thread number
-#ifdef _OPENMP
-omp_lock_t out_lock;
-#define OUT_LOCK_INIT() omp_init_lock(&out_lock)
-#define OUT_LOCK() omp_set_lock(&out_lock)
-#define OUT_FREE() omp_unset_lock(&out_lock)
-#else
-#define OUT_LOCK_INIT() do{}while(0)
-#define OUT_LOCK() do{}while(0)
-#define OUT_FREE() do{}while(0)
-#endif
-
-static void out_init(void)
-{
-	OUT_LOCK_INIT();
-	rng_tid = 0;
-}
-
-static intnative_t out_write(char * buf, intnative_t len, int curr_tid)
-{
-	intnative_t wr_cnt = -1;//Error by default
-	OUT_LOCK();
-
-	if (out_tid == curr_tid)
-	{
-		if (++out_tid >= out_tnum)
-		{
-			out_tid = 0;
-		}
-		wr_cnt = fwrite(buf, len, 1, stdout);
-	}
-
-	OUT_FREE();
-	return wr_cnt; //-1 - thread error, 0 - IO error, 1 - ОК
-}
-
-static void generate_And_Wrap_Pseudorandom_DNA_Sequence(
-	const nucleotide_info nucl_info[],
-	const intnative_t nucl_num,
-	const intnative_t char_num)
-{
-	uint32_t cumul_p[nucl_num];
-	float cumul_acc = 0.0;
-
-	for (intnative_t i = 0; i<nucl_num; i++)
-	{
-		cumul_acc += nucl_info[i].probability;
-		cumul_p[i] = 1ul + (uint32_t)(cumul_acc*(float)IM); //Compensate rounding errors on test file
-	}
-
-#ifdef _OPENMP
-	intnative_t tnum = omp_get_num_procs();
-	if (tnum>THREADS_TO_USE) tnum = THREADS_TO_USE;
-	omp_set_num_threads(tnum);
-	rng_tnum = tnum;
-	out_tnum = tnum;
-#endif
-	rng_tid = 0;
-	out_tid = 0;
-	rng_cnt = char_num;
-
-#pragma omp parallel
-	{
-		char block[CHARACTERS_PER_BLOCK + LINES_PER_BLOCK];
-		char * line;
-		uint32_t rnd[CHARACTERS_PER_BLOCK], r;
-		intnative_t cnt, col, prid, nid, ncnt;
-		int cur_tid;
-#ifdef _OPENMP
-		cur_tid = omp_get_thread_num();
-#else
-		cur_tid = 0;
-#endif
-		while (1)
-		{
-			do
-			{
-				cnt = rng_gen_blk(rnd, CHARACTERS_PER_BLOCK, cur_tid);
-			} while (-1 == cnt);
-
-			if (0 == cnt)
-			{
-				break;//Work finished!
-			}
-
-			line = block;
-
-			for (col = 0, prid = 0; prid < cnt; prid++)
-			{
-				r = rnd[prid];
-
-				ncnt = 0;
-				for (nid = 0; nid < nucl_num; nid++)
-				{
-					if (cumul_p[nid] <= r)
-					{
-						ncnt++;
-					}
-				}
-
-				*line++ = nucl_info[ncnt].letter;
-				if (++col >= MAXIMUM_LINE_WIDTH)
-				{
-					col = 0;
-					*line++ = '\n';
-				}
-			}
-			//Check if we need to end the line
-			if (0 != col)
-			{
-				//Last iteration didn't end the line, so finish the job.
-				*line++ = '\n';
-			}
-			//Print results
-			do
-			{
-				cnt = out_write(block, line - block, cur_tid);
-			} while (-1 == cnt);
-			//Check  fot IO error
-			if (0 == cnt)
-			{
-				exit(1);
-			}
-		}
-	}
-}
-
-
-int main(int argc, char ** argv)
-{
-	const intnative_t n = atoi(argv[1]);
-
-	fputs(">ONE Homo sapiens alu\n", stdout);
-	const char homo_Sapiens_Alu[] =
-		"GGCCGGGCGCGGTGGCTCACGCCTGTAATCCCAGCACTTTGGGAGGCCGAGGCGGGCGGATCACCTGAGGTC"
-		"AGGAGTTCGAGACCAGCCTGGCCAACATGGTGAAACCCCGTCTCTACTAAAAATACAAAAATTAGCCGGGCG"
-		"TGGTGGCGCGCGCCTGTAATCCCAGCTACTCGGGAGGCTGAGGCAGGAGAATCGCTTGAACCCGGGAGGCGG"
-		"AGGTTGCAGTGAGCCGAGATCGCGCCACTGCACTCCAGCCTGGGCGACAGAGCGAGACTCCGTCTCAAAAA";
-	repeat_And_Wrap_String(homo_Sapiens_Alu, 2 * n);
-
-	rng_init();
-	out_init();
-
-	fputs(">TWO IUB ambiguity codes\n", stdout);
-	nucleotide_info iub_Nucleotides_Information[] =
-	{
-		{ 'a', 0.27 },{ 'c', 0.12 },{ 'g', 0.12 },{ 't', 0.27 },{ 'B', 0.02 },
-		{ 'D', 0.02 },{ 'H', 0.02 },{ 'K', 0.02 },{ 'M', 0.02 },{ 'N', 0.02 },
-		{ 'R', 0.02 },{ 'S', 0.02 },{ 'V', 0.02 },{ 'W', 0.02 },{ 'Y', 0.02 }
-	};
-	generate_And_Wrap_Pseudorandom_DNA_Sequence(iub_Nucleotides_Information,
-		sizeof(iub_Nucleotides_Information) / sizeof(nucleotide_info), 3 * n);
-
-	fputs(">THREE Homo sapiens frequency\n", stdout);
-	nucleotide_info homo_Sapien_Nucleotides_Information[] =
-	{
-		{ 'a', 0.3029549426680 },{ 'c', 0.1979883004921 },
-		{ 'g', 0.1975473066391 },{ 't', 0.3015094502008 }
-	};
-	generate_And_Wrap_Pseudorandom_DNA_Sequence(homo_Sapien_Nucleotides_Information,
-		sizeof(homo_Sapien_Nucleotides_Information) / sizeof(nucleotide_info), 5 * n);
-
-	return 0;
-}
@@ -1,266 +0,0 @@
-// The Computer Language Benchmarks Game
-// http://benchmarksgame.alioth.debian.org/
-//
-// Original version Contributed by Jeremy Zerfas
-// M*LIB port contributed by Patrick Pélissier
-#define NDEBUG
-#include <stdint.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <assert.h>
-
-#include "m-worker.h"
-#include "m-dict.h"
-#include "m-bptree.h"
-
-// This controls the maximum length for each set of oligonucleotide frequencies
-// and each oligonucleotide count output by this program.
-#define MAXIMUM_OUTPUT_LENGTH 4096
-
-// Number of outputs to display
-#define MAXMUM_NUMBER_OUTPUT 7
-
-/* Define the needed containers */
-/* Define Open Addressing dictionary of uint64_t --> uint32_t. Need to define how to handle out of bound data. */
-static inline bool my_oor_equal_p(uint64_t k, unsigned char n)
-{
-  return k == ~(uint64_t) n;
-}
-static inline void my_oor_set(uint64_t *k, unsigned char n)
-{
-  *k = ~(uint64_t)n;
-}
-static inline size_t my_hash(uint64_t key)
-{
-  return ((key) ^ (key)>>7);
-}
-DICT_OA_DEF2(dict_oligonucleotide,
-             uint64_t, M_OPEXTEND(M_DEFAULT_OPLIST, HASH(my_hash), OOR_EQUAL(my_oor_equal_p), OOR_SET(my_oor_set M_IPTR)),
-             uint32_t, M_DEFAULT_OPLIST)
-#define M_OPL_dict_oligonucleotide_t() DICT_OPLIST(dict_oligonucleotide, M_OPEXTEND(M_DEFAULT_OPLIST, HASH(my_hash), OOR_EQUAL(my_oor_equal_p), OOR_SET(my_oor_set M_IPTR)), M_DEFAULT_OPLIST)
-
-// Define a B*TREE-21 of uint32_t --> uint64_t and register its oplist
-#define TREE_CMP(a,b)      ((a) > (b) ? -1 : (a) < (b)) /* reverse natural order */
-BPTREE_DEF2(tree_dict_oligonucleotide, 21, uint32_t, M_OPEXTEND(M_DEFAULT_OPLIST, CMP(TREE_CMP)), uint64_t, M_DEFAULT_OPLIST)
-#define M_OPL_tree_dict_oligonucleotide_t() BPTREE_OPLIST2(tree_dict_oligonucleotide, M_DEFAULT_OPLIST, M_DEFAULT_OPLIST)
-
-/* Define the data to analyse (a plain array) */
-ARRAY_DEF(polynucleotide, unsigned char)
-
-// Macro to convert a nucleotide character to a code. Note that upper and lower
-// case ASCII letters only differ in the fifth bit from the right and we only
-// need the three least significant bits to differentiate the letters 'A', 'C',
-// 'G', and 'T'. Spaces in this array/string will never be used as long as
-// characters other than 'A', 'C', 'G', and 'T' aren't used.
-#define CODE_FOR_NUCLEOTIDE(nucleotide) (" \0 \1\3  \2"[nucleotide & 0x7])
-
-// And one more macro to convert the codes back to nucleotide characters.
-#define NUCLEOTIDE_FOR_CODE(code) ("ACGT"[code & 0x3])
-
-static worker_t worker;
-
-// Read from the given stream the data and fill in the array with the converted one.
-static void polynucleotide_init_stream(polynucleotide_t p, FILE *stream)
-{
-  char buffer[MAXIMUM_OUTPUT_LENGTH], c;
-
-  polynucleotide_init(p);
-  polynucleotide_reserve(p, MAXIMUM_OUTPUT_LENGTH);
-  // Find the start of the third polynucleotide.
-  while(fgets(buffer, sizeof(buffer), stream) && memcmp(">THREE", buffer, 6));
-  // Start reading and encoding the third polynucleotide.
-  while(fgets(buffer, sizeof(buffer), stream) && buffer[0]!='>'){
-    for(size_t i = 0; (c = buffer[i]) !='\0'; i++) {
-      if (c != '\n') {
-          polynucleotide_push_back(p, CODE_FOR_NUCLEOTIDE(c));
-      }
-    }
-  }
-}
-
-// This is the function which does 95% of the work.
-/* NOTE: paralelisation is not done by cutting the input set in two.
-   This is not efficient as the size of the output table will be the same
-   as for the whole table. */
-static void init_hash(dict_oligonucleotide_t hash_Table, const size_t size, const unsigned char tab[size], const size_t desiredLength, const size_t offset, const size_t skip)
-{
-  uint64_t key = 0;
-  const uint64_t mask = (1ULL<<(2*desiredLength))-1;
-  assert (2*desiredLength < 64 && desiredLength < size);
-  assert ((1 == skip || 4 == skip) && offset < size);
-  
-  // For the first several nucleotides we only need to append them to key in
-  // preparation for the insertion of complete oligonucleotides to hash.
-  for(size_t i = 0; i < desiredLength - 1 + offset; i++)
-    key = (key<<2) | tab[i];
-  key &= mask;
-  
-  dict_oligonucleotide_t hash;
-  dict_oligonucleotide_init(hash);
-
-  // Add all the complete oligonucleotides of
-  // desiredLength to hash, updating their count
-  if (skip == 1) {
-    for(size_t i = desiredLength-1+offset ; i < size; i++) {
-      key = (key<<2) | tab[i+0];
-      key &= mask;
-      uint32_t *p = dict_oligonucleotide_get(hash, key);
-      if (p != NULL) {
-	(*p) ++;
-      } else {
-	dict_oligonucleotide_set_at(hash, key, 1);
-      }
-    }
-  } else { // skip = 4
-    for(size_t i = desiredLength-1+offset ; i < size; i+=4) {
-      for (size_t j = 0; j < 4; j++)
-	key = (key<<2) | tab[i+j];
-      key &= mask;
-      uint32_t *p = dict_oligonucleotide_get(hash, key);
-      if (p != NULL) {
-	(*p) ++;
-      } else {
-	dict_oligonucleotide_set_at(hash, key, 1);
-      }
-    }
-  }
-  dict_oligonucleotide_init_move(hash_Table, hash);
-}
-
-static void compute_hash(dict_oligonucleotide_t hash_Table, const polynucleotide_t p, const size_t desiredLength)
-{
-  size_t size = polynucleotide_size(p);
-  unsigned char *tab = polynucleotide_get(p, 0);
-  if (desiredLength < 8) {
-    init_hash(hash_Table, size, tab, desiredLength, 0, 1);
-    return;
-  }
-
-  worker_sync_t block;   // Define a synchronization block
-  worker_start(block, worker);
-  dict_oligonucleotide_t hash_Table3, *p_hash_Table3 = &hash_Table3;  
-  dict_oligonucleotide_t hash_Table2, *p_hash_Table2 = &hash_Table2;
-  dict_oligonucleotide_t hash_Table1, *p_hash_Table1 = &hash_Table1;
-  WORKER_SPAWN(block, (p_hash_Table1, size, tab, desiredLength), {
-      init_hash(*p_hash_Table1, size, tab, desiredLength, 3, 4);
-    }, (/*no output*/));
-  WORKER_SPAWN(block, (p_hash_Table2, size, tab, desiredLength), {
-      init_hash(*p_hash_Table2, size, tab, desiredLength, 2, 4);
-    }, (/*no output*/));
-  WORKER_SPAWN(block, (p_hash_Table3, size, tab, desiredLength), {
-      init_hash(*p_hash_Table3, size, tab, desiredLength, 1, 4);
-    }, (/*no output*/));
-  init_hash(hash_Table, size, tab, desiredLength, 0, 4);
-  worker_sync(block);
-  
-  // Merge all hashtables
-  dict_oligonucleotide_splice(hash_Table, hash_Table1);
-  dict_oligonucleotide_splice(hash_Table, hash_Table2);
-  dict_oligonucleotide_splice(hash_Table, hash_Table3);
-  // Clear extra hashtables
-  dict_oligonucleotide_clear(hash_Table3);
-  dict_oligonucleotide_clear(hash_Table2);
-  dict_oligonucleotide_clear(hash_Table1);
-}
-
-// Generate frequencies for all oligonucleotides in polynucleotide that are of
-// desiredLength and then save it to output.
-static void compute_freq(const polynucleotide_t p, const size_t desiredLength, char output[])
-{  
-  dict_oligonucleotide_t hash_Table;
-  compute_hash(hash_Table, p, desiredLength);
-
-  // Order key is the count frequency (inverse value & key)
-  tree_dict_oligonucleotide_t tree;
-  tree_dict_oligonucleotide_init(tree);
-  for M_EACH(item, hash_Table, dict_oligonucleotide_t) {
-    tree_dict_oligonucleotide_set_at (tree, item->value, item->key);
-  }
-
-  // Create Output
-  char oligonucleotide[64];
-  const double invSum = 100.0 / (double) (polynucleotide_size(p) - desiredLength + 1);
-  int output_Position = 0;
-  for M_EACH(item, tree, tree_dict_oligonucleotide_t) {
-    // Convert the key for the oligonucleotide to a string.
-    uint64_t freq  = *item->value_ptr;
-    uint32_t count = *item->key_ptr;
-    for(size_t j = desiredLength-1; j < desiredLength; j--){
-      oligonucleotide[j]=NUCLEOTIDE_FOR_CODE(freq);
-      freq>>=2;
-    }
-    oligonucleotide[desiredLength]='\0';
-    // Output the frequency for oligonucleotide to output.
-    output_Position+=snprintf(output+output_Position, MAXIMUM_OUTPUT_LENGTH-output_Position,
-                              "%s %.3f\n", oligonucleotide, invSum * count);
-  }
-  
-  dict_oligonucleotide_clear(hash_Table);
-  tree_dict_oligonucleotide_clear(tree);
-}
-
-// Generate a count for the number of times oligonucleotide appears in
-// polynucleotide and then save it to output.
-static void compute_count(polynucleotide_t p, const char oligonucleotide[], char output[])
-{
-  const size_t oligonucleotide_Length = strlen(oligonucleotide);
-  dict_oligonucleotide_t hash_Table;
-  compute_hash(hash_Table, p, oligonucleotide_Length);
-  
-  // Generate the key for oligonucleotide.
-  uint64_t key=0;
-  for(size_t i=0; i<oligonucleotide_Length; i++)
-    key = (key<<2) | CODE_FOR_NUCLEOTIDE(oligonucleotide[i]);
-  
-  // Output the count for oligonucleotide to output.
-  uint32_t *val = dict_oligonucleotide_get(hash_Table, key);
-  uintmax_t count= val== NULL ? 0 : *val;
-  snprintf(output, MAXIMUM_OUTPUT_LENGTH, "%ju\t%s", count, oligonucleotide);
-  
-  dict_oligonucleotide_clear(hash_Table);
-}
-
-int main()
-{
-  // Initialize the different worker threads by auto-detecting the number of cores of the system
-  worker_init(worker, -1, 0, NULL);
-
-  // Read the input
-  polynucleotide_t p, *ptr = &p;
-  polynucleotide_init_stream(p, stdin);
-  
-  // Prepare outputs
-  char outputBuffer[MAXMUM_NUMBER_OUTPUT][MAXIMUM_OUTPUT_LENGTH];
-  char (*output)[MAXIMUM_OUTPUT_LENGTH] = outputBuffer;
-  
-  // Do the following functions in parallel.
-  worker_sync_t block;   // Define a synchronization block
-  worker_start(block, worker);
-  
-  WORKER_SPAWN(block, (ptr, output), {
-      compute_count(*ptr, "GGTATTTTAATTTATAGT", output[6]);
-    }, (/*no output*/));
-  WORKER_SPAWN(block, (ptr, output), {
-      compute_count(*ptr, "GGTATTTTAATT", output[5]);
-    }, (/*no output*/));
-  WORKER_SPAWN(block, (ptr, output), {
-      compute_count(*ptr, "GGTATT", output[4]);
-    }, (/*no output*/));
-  WORKER_SPAWN(block, (ptr, output), {
-      compute_count(*ptr, "GGTA", output[3]);
-    }, (/*no output*/));
-  compute_count(*ptr, "GGT", output[2]);  
-  compute_freq(*ptr, 2, output[1]);
-  compute_freq(p, 1, output[0]);
-  worker_sync(block);
-  
-  // Output the results to stdout.
-  for(int i=0; i<MAXMUM_NUMBER_OUTPUT; i++)
-    printf("%s\n", outputBuffer[i]);
-  
-  polynucleotide_clear(p);
-  worker_clear(worker);
-  
-  return 0;
-}
@@ -1,940 +0,0 @@
-/**
- * Memory pool benchmark.
- *
- * Results (the better values for each measure from at least 3 runs)for
- * Intel Core i7-4650U CPU 1.70GHz, 8GB RAM:
- *
- *	small object size:	24
- *	big object size:	240
- *	huge object size:	8305
- *
- * 	boost::pool (Small):    258ms
- * 	boost::pool w/ free (Small):    165ms
- * 	boost::pool (Big):    174ms
- * 	boost::pool w/ free (Big):    154ms
- * 	boost::pool cr. & destr.:    133ms
- *
- *	ngx_pool (Small):    305ms
- *	ngx_pool (Big):    132ms
- *	ngx_pool w/ free (Mix):    542ms
- *	ngx_pool cr. & destr.:    98ms
- *
- * 	tfw_pool (Small):    279ms
- * 	tfw_pool w/ free (Small):    101ms
- * 	tfw_pool (Big):    106ms
- * 	tfw_pool w/ free (Big):    50ms
- * 	tfw_pool w/ free (Mix):    107ms
- * 	tfw_pool cr. & destr.:    53ms
- *
- * Copyright (C) 2015 Alexander Krizhanovsky (ak@natsys-lab.com).
- *
- * This file is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License as published
- * by the Free Software Foundation; either version 3, or (at your option)
- * any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Lesser General Public License for more details.
- * See http://www.gnu.org/licenses/lgpl.html .
- * 
- * From https://github.com/natsys/blog/tree/master/mempool
- */
-#define NDEBUG
-#include <assert.h>
-#include <stdlib.h>
-
-#include <chrono>
-#include <functional>
-#include <iomanip>
-#include <iostream>
-#include <string>
-
-#ifdef USE_BOOST
-#include <boost/pool/object_pool.hpp>
-#endif
-
-#ifdef USE_GLIB
-#include <glib.h>
-#endif
-
-static const size_t PAGE_SIZE = 4096;
-
-// sizeof(TfwStr)
-struct Small {
-	long l[3];
-
-	std::string
-	operator+(const char *str)
-	{ return std::string(str) + " (Small)"; }
-};
-
-// size of common HTTP headers table
-struct Big {
-	Small s[10];
-
-	std::string
-	operator+(const char *str)
-	{ return std::string(str) + " (Big)"; }
-};
-
-// very big allocation
-struct Huge {
-	char c[PAGE_SIZE * 2 + 113];
-
-	std::string
-	operator+(const char *str)
-	{ return std::string(str) + " (Huge)"; }
-};
-
-static const size_t N = 20 * 1000 * 1000;
-
-void
-benchmark(std::string &&desc, std::function<void ()> cb)
-{
-	using namespace std::chrono;
-
-	// steady_clock has the same resolution as high_resolution_clock
-	auto t(steady_clock::now());
-
-	cb();
-
-	auto dt = steady_clock::now() - t;
-	std::cout << std::setw(30) << std::right << desc << ":    "
-		  << duration_cast<milliseconds>(dt).count()
-		  << "ms" << std::endl;
-}
-
-#define touch_obj(o)							\
-	if (__builtin_expect(!o, 0)) {					\
-		std::cerr << "failed alloc" << std::endl;		\
-		break;							\
-	} else {							\
-		*(long *)o = 1;						\
-	}
-
-/*
- * ------------------------------------------------------------------------
- *	Boost::pool
- * ------------------------------------------------------------------------
- */
-#ifdef USE_BOOST
-
-template<class T>
-void
-benchmark_boost_pool()
-{
-	boost::object_pool<T> p;
-
-	benchmark(std::move(T() + "boost::pool"), [&]() {
-		for (size_t i = 0; i < N * sizeof(Small) / sizeof(T); ++i) {
-			T *o = p.malloc();
-			touch_obj(o);
-		}
-	});
-}
-
-template<class T>
-void
-benchmark_boost_pool_free()
-{
-	boost::object_pool<T> p;
-
-	benchmark(std::move(T() + "boost::pool w/ free"), [&]() {
-		for (size_t i = 0; i < N * sizeof(Small) / sizeof(T); ++i) {
-			T *o = p.malloc();
-			touch_obj(o);
-			if (__builtin_expect(!(i & 3), 0))
-				p.free(o);
-		}
-	});
-}
-
-void
-benchmark_boost_pool_create_and_destroy()
-{
-	benchmark(std::move(std::string("boost::pool cr. & destr.")), []() {
-		for (size_t i = 0; i < N / 100; ++i) {
-			if (__builtin_expect(!(i & 3), 0)) {
-				boost::object_pool<Big> p;
-				for (size_t j = 0; j < 100; ++j) {
-					Big *o = p.malloc();
-					touch_obj(o);
-				}
-			} else {
-				boost::object_pool<Small> p;
-				for (size_t j = 0; j < 100; ++j) {
-					Small *o = p.malloc();
-					touch_obj(o);
-				}
-			}
-		}
-	});
-}
-#endif
-
-/*
- * ------------------------------------------------------------------------
- *	malloc/free
- * ------------------------------------------------------------------------
- */
-template<class T>
-void
-benchmark_mallocfree()
-{
-	benchmark(std::move(T() + "mallocfree"), [&]() {
-		static __thread T *ptrs[N * sizeof(Small) / sizeof(T)];
-
-		for (size_t i = 0; i < N * sizeof(Small) / sizeof(T); ++i) {
-			T *o = (T*)malloc(sizeof(T));
-			ptrs[i] = o;
-			touch_obj(o);
-		}
-
-		for (size_t i = 0; i < N * sizeof(Small) / sizeof(T); ++i) {
-			free(ptrs[i]);
-		}
-	});
-}
-
-template<class T>
-void
-benchmark_mallocfree_free()
-{
-	benchmark(std::move(T() + "mallocfree w/ free"), [&]() {
-		static __thread T *ptrs[N * sizeof(Small) / sizeof(T)];
-
-		for (size_t i = 0; i < N * sizeof(Small) / sizeof(T); ++i) {
-			T *o = (T*)malloc(sizeof(T));
-			ptrs[i] = o;
-			touch_obj(o);
-
-			if (__builtin_expect(!(i & 3), 0)) {
-				free(o);
-				ptrs[i] = NULL;
-			}
-		}
-
-		for (size_t i = 0; i < N * sizeof(Small) / sizeof(T); ++i) {
-			free(ptrs[i]);
-		}
-	});
-}
-
-/*
- * ------------------------------------------------------------------------
- *	GLib slices
- * ------------------------------------------------------------------------
- */
-#ifdef USE_GLIB
-template<class T>
-void
-benchmark_glib_slices()
-{
-	benchmark(std::move(T() + "GLib slices"), [&]() {
-		static __thread T *ptrs[N * sizeof(Small) / sizeof(T)];
-
-		for (size_t i = 0; i < N * sizeof(Small) / sizeof(T); ++i) {
-			T *o = (T*)g_slice_alloc(sizeof(T));
-			ptrs[i] = o;
-			touch_obj(o);
-		}
-
-		for (size_t i = 0; i < N * sizeof(Small) / sizeof(T); ++i) {
-			g_slice_free1(sizeof(T), ptrs[i]);
-		}
-	});
-}
-
-template<class T>
-void
-benchmark_glib_slices_free()
-{
-	benchmark(std::move(T() + "GLib slices w/ free"), [&]() {
-		static __thread T *ptrs[N * sizeof(Small) / sizeof(T)];
-
-		for (size_t i = 0; i < N * sizeof(Small) / sizeof(T); ++i) {
-			T *o = (T*)g_slice_alloc(sizeof(T));
-			ptrs[i] = o;
-			touch_obj(o);
-
-			if (__builtin_expect(!(i & 3), 0)) {
-				g_slice_free1(sizeof(T), o);
-				ptrs[i] = NULL;
-			}
-		}
-
-		for (size_t i = 0; i < N * sizeof(Small) / sizeof(T); ++i) {
-			g_slice_free1(sizeof(T), ptrs[i]);
-		}
-	});
-}
-#endif
-
-/*
- * ------------------------------------------------------------------------
- *	Nginx pool
- *	Simplified version of src/core/ngx_palloc.c from nginx-1.9.5 with
- *	some code adjustments to be built in this benchmark.
- * ------------------------------------------------------------------------
- */
-struct ngx_pool_t;
-typedef uintptr_t       ngx_uint_t;
-
-#define NGX_POOL_ALIGNMENT	16
-#define NGX_ALIGNMENT		sizeof(unsigned long)
-#define ngx_align_ptr(p, a)						\
-	(u_char *)(((uintptr_t)(p) + ((uintptr_t)a - 1)) & ~((uintptr_t)a - 1))
-#define NGX_MAX_ALLOC_FROM_POOL	((size_t)PAGE_SIZE - 1)
-
-struct ngx_pool_data_t {
-	unsigned char		*last;
-	unsigned char		*end;
-	ngx_pool_t		*next;
-	unsigned int		failed;
-};
-
-struct ngx_pool_large_t {
-	ngx_pool_large_t	*next;
-	void			*alloc;
-};
-
-struct ngx_pool_t {
-	ngx_pool_data_t		d;
-	size_t			max;
-	ngx_pool_t		*current;
-	ngx_pool_large_t	*large;
-};
-
-ngx_pool_t *
-ngx_create_pool(size_t size)
-{
-	ngx_pool_t *p;
-
-	if (posix_memalign((void **)&p, NGX_POOL_ALIGNMENT, size))
-		return NULL;
-
-	p->d.last = (unsigned char *)p + sizeof(ngx_pool_t);
-	p->d.end = (unsigned char *)p + size;
-	p->d.next = NULL;
-	p->d.failed = 0;
-
-	size = size - sizeof(ngx_pool_t);
-	p->max = (size < NGX_MAX_ALLOC_FROM_POOL)
-		 ? size : NGX_MAX_ALLOC_FROM_POOL;
-
-	p->current = p;
-	p->large = NULL;
-
-	return p;
-}
-
-void
-ngx_destroy_pool(ngx_pool_t *pool)
-{
-	ngx_pool_t *p, *n;
-	ngx_pool_large_t    *l;
-
-	for (l = pool->large; l; l = l->next) {
-		if (l->alloc)
-			free(l->alloc);
-	}
-
-	for (p = pool, n = pool->d.next; ; p = n, n = n->d.next) {
-		free(p);
-		if (n == NULL)
-			break;
-	}
-}
-
-static void *
-ngx_palloc_block(ngx_pool_t *pool, size_t size)
-{
-	unsigned char *m;
-	size_t psize = (size_t)(pool->d.end - (unsigned char *)pool);
-	ngx_pool_t *p, *p_new;
-
-	if (posix_memalign((void **)&m, NGX_POOL_ALIGNMENT, psize))
-		return NULL;
-	p_new = (ngx_pool_t *)m;
-
-	p_new->d.end = m + psize;
-	p_new->d.next = NULL;
-	p_new->d.failed = 0;
-
-	m += sizeof(ngx_pool_data_t);
-	m = ngx_align_ptr(m, NGX_ALIGNMENT);
-	p_new->d.last = m + size;
-
-	for (p = pool->current; p->d.next; p = p->d.next) {
-		if (p->d.failed++ > 4)
-			pool->current = p->d.next;
-	}
-	p->d.next = p_new;
-
-	return m;
-}
-
-void *ngx_palloc(ngx_pool_t *pool, size_t size);
-
-static void *
-ngx_palloc_large(ngx_pool_t *pool, size_t size)
-{
-	void *p;
-	unsigned int n = 0;
-	ngx_pool_large_t  *large;
-
-	p = malloc(size);
-	if (p == NULL)
-		return NULL;
-
-	for (large = pool->large; large; large = large->next) {
-		if (large->alloc == NULL) {
-			large->alloc = p;
-			return p;
-		}
-		if (n++ > 3)
-			break;
-	}
-
-	large = (ngx_pool_large_t *)ngx_palloc(pool, sizeof(ngx_pool_large_t));
-	if (large == NULL) {
-		free(p);
-		return NULL;
-	}
-
-	large->alloc = p;
-	large->next = pool->large;
-	pool->large = large;
-
-	return p;
-}
-
-void *
-ngx_palloc(ngx_pool_t *pool, size_t size)
-{
-	unsigned char *m;
-	ngx_pool_t *p;
-
-	if (size <= pool->max) {
-		p = pool->current;
-		do {
-			m = ngx_align_ptr(p->d.last, NGX_ALIGNMENT);
-			if ((size_t)(p->d.end - m) >= size) {
-				p->d.last = m + size;
-				return m;
-			}
-			p = p->d.next;
-		} while (p);
-
-		return ngx_palloc_block(pool, size);
-	}
-
-	return ngx_palloc_large(pool, size);
-}
-
-void
-ngx_pfree(ngx_pool_t *pool, void *p)
-{
-	ngx_pool_large_t *l;
-
-	for (l = pool->large; l; l = l->next) {
-		if (p == l->alloc) {
-			free(l->alloc);
-			l->alloc = NULL;
-			return;
-		}
-	}
-}
-
-template<class T>
-void
-benchmark_ngx_pool()
-{
-	ngx_pool_t *p = ngx_create_pool(PAGE_SIZE);
-	assert(p);
-
-	benchmark(std::move(T() + "ngx_pool"), [=]() {
-		for (size_t i = 0; i < N * sizeof(Small) / sizeof(T); ++i) {
-			T *o = (T *)ngx_palloc(p, sizeof(T));
-			touch_obj(o);
-		}
-	});
-
-	ngx_destroy_pool(p);
-}
-
-void
-benchmark_ngx_pool_mix_free()
-{
-	ngx_pool_t *p = ngx_create_pool(PAGE_SIZE);
-	assert(p);
-
-	benchmark(std::move(std::string("ngx_pool w/ free (Mix)")), [=]() {
-		for (size_t i = 0; i < N; ++i) {
-			if (__builtin_expect(!(i & 0xfff), 0)) {
-				Huge *o;
-				o = (Huge *)ngx_palloc(p, sizeof(*o));
-				touch_obj(o);
-				if (!(i & 1))
-					ngx_pfree(p, o);
-			}
-			else if (__builtin_expect(!(i & 3), 0)) {
-				Big *o = (Big *)ngx_palloc(p, sizeof(*o));
-				touch_obj(o);
-				if (!(i & 1))
-					ngx_pfree(p, o);
-			}
-			else {
-				Small *o = (Small *)ngx_palloc(p, sizeof(*o));
-				touch_obj(o);
-				if (!(i & 1))
-					ngx_pfree(p, o);
-			}
-		}
-	});
-
-	ngx_destroy_pool(p);
-}
-
-void
-benchmark_ngx_pool_create_and_destroy()
-{
-	benchmark(std::move(std::string("ngx_pool cr. & destr.")), []() {
-		for (size_t i = 0; i < N / 100; ++i) {
-			ngx_pool_t *p = ngx_create_pool(PAGE_SIZE);
-			for (size_t j = 0; j < 100; ++j) {
-				if (__builtin_expect(!(i & 3), 0)) {
-					Big *o;
-					o = (Big *)ngx_palloc(p, sizeof(*o));
-					touch_obj(o);
-				} else {
-					Small *o;
-					o = (Small *)ngx_palloc(p, sizeof(*o));
-					touch_obj(o);
-				}
-			}
-			ngx_destroy_pool(p);
-		}
-	});
-}
-
-/*
- * ------------------------------------------------------------------------
- *	Tempesta FW pool
- *	Simplified and ported to user-space from
- *	https://github.com/natsys/tempesta/blob/master/tempesta_fw/pool.c
- * ------------------------------------------------------------------------
- */
-/**
- * Emulation of Linux buddy allocator.
- */
-#define GFP_ATOMIC		0
-#define PAGE_MASK		(~(PAGE_SIZE - 1))
-#define likely(x)		__builtin_expect(x, 1)
-#define unlikely(x)		__builtin_expect(x, 0)
-#define free_pages(p, o)	free((void *)(p))
-#define get_order(n)		(assert((n) < PAGE_SIZE * 128),		\
-				 (n) < PAGE_SIZE ? 0			\
-				 : (n) < PAGE_SIZE * 2 ? 1		\
-				 : (n) < PAGE_SIZE * 4 ? 2		\
-				 : (n) < PAGE_SIZE * 8 ? 3		\
-				 : (n) < PAGE_SIZE * 16 ? 4		\
-				 : (n) < PAGE_SIZE * 32 ? 5		\
-				 : (n) < PAGE_SIZE * 64 ? 6		\
-				 : 7)
-
-static inline unsigned long
-__get_free_pages(int flags __attribute__((unused)), int order)
-{
-	void *p;
-
-	if (posix_memalign((void **)&p, PAGE_SIZE, PAGE_SIZE << order))
-		return 0;
-
-	return (unsigned long)p;
-}
-
-/**
- * Memory pool chunk descriptor.
- *
- * @next	- pointer to next memory chunk;
- * @order	- order of number of pages in the chunk;
- * @off		- current chunk offset;
- */
-struct TfwPoolChunk {
-	TfwPoolChunk	*next;
-	unsigned int	order;
-	unsigned int	off;
-};
-
-/**
- * Memory pool descriptor.
- *
- * @curr	- current chunk to allocate memory from;
- * @order,@off	- cached members of @curr;
- */
-typedef struct {
-	TfwPoolChunk	*curr;
-	unsigned int	order;
-	unsigned int	off;
-} TfwPool;
-
-#define TFW_POOL_CHUNK_SZ(p)	(PAGE_SIZE << (p)->order)
-#define TFW_POOL_CHUNK_BASE(c)	((unsigned long)(c) & PAGE_MASK)
-#define TFW_POOL_CHUNK_END(p)	(TFW_POOL_CHUNK_BASE((p)->curr) + (p)->off)
-#define TFW_POOL_ALIGN_SZ(n)	(((n) + 7) & ~7UL)
-#define TFW_POOL_HEAD_OFF	(TFW_POOL_ALIGN_SZ(sizeof(TfwPool))	\
-				 + TFW_POOL_ALIGN_SZ(sizeof(TfwPoolChunk)))
-#define TFW_POOL_PGCACHE_SZ	256
-
-static unsigned int pg_next;
-static unsigned long pg_cache[TFW_POOL_PGCACHE_SZ];
-
-static unsigned long
-tfw_pool_alloc_pages(unsigned int order)
-{
-	if (likely(pg_next && !order))
-		return pg_cache[--pg_next];
-	return __get_free_pages(GFP_ATOMIC, order);
-}
-
-static void
-tfw_pool_free_pages(unsigned long addr, unsigned int order)
-{
-	if (likely(pg_next < TFW_POOL_PGCACHE_SZ && !order)) {
-		pg_cache[pg_next++] = addr;
-	} else {
-		free_pages(addr, order);
-	}
-}
-
-TfwPool *
-__tfw_pool_new(size_t n)
-{
-	TfwPool *p;
-	TfwPoolChunk *c;
-	unsigned int order;
-
-	order = get_order(TFW_POOL_ALIGN_SZ(n) + TFW_POOL_HEAD_OFF);
-
-	c = (TfwPoolChunk *)tfw_pool_alloc_pages(order);
-	if (unlikely(!c))
-		return NULL;
-
-	p = (TfwPool *)((char *)c + TFW_POOL_ALIGN_SZ(sizeof(*c)));
-	c->next = NULL;
-
-	p->order = order;
-	p->off = TFW_POOL_HEAD_OFF;
-	p->curr = c;
-
-	return p;
-}
-
-void *
-tfw_pool_alloc(TfwPool *p, size_t n)
-{
-	void *a;
-
-	n = TFW_POOL_ALIGN_SZ(n);
-
-	if (unlikely(p->off + n > TFW_POOL_CHUNK_SZ(p))) {
-		TfwPoolChunk *c, *curr = p->curr;
-		unsigned int off = TFW_POOL_ALIGN_SZ(sizeof(TfwPoolChunk)) + n;
-		unsigned int order = get_order(off);
-
-		c = (TfwPoolChunk *)tfw_pool_alloc_pages(order);
-		if (!c)
-			return NULL;
-		c->next = curr;
-
-		curr->order = p->order;
-		curr->off = p->off;
-
-		p->order = order;
-		p->off = off;
-		p->curr = c;
-
-		return (void *)TFW_POOL_ALIGN_SZ((unsigned long)(c + 1));
-	}
-
-	a = (char *)TFW_POOL_CHUNK_END(p);
-	p->off += n;
-
-	return a;
-}
-
-void
-tfw_pool_free(TfwPool *p, void *ptr, size_t n)
-{
-	n = TFW_POOL_ALIGN_SZ(n);
-
-	/* Stack-like usage is expected. */
-	if (unlikely((char *)ptr + n != (char *)TFW_POOL_CHUNK_END(p)))
-		return;
-
-	p->off -= n;
-
-	/* Free empty chunk which doesn't contain the pool header. */
-	if (unlikely(p->off == TFW_POOL_ALIGN_SZ(sizeof(TfwPoolChunk)))) {
-		TfwPoolChunk *next = p->curr->next;
-		tfw_pool_free_pages(TFW_POOL_CHUNK_BASE(p->curr), p->order);
-		p->curr = next;
-		p->order = next->order;
-		p->off = next->off;
-	}
-}
-
-void
-tfw_pool_destroy(TfwPool *p)
-{
-	TfwPoolChunk *c, *next;
-
-	for (c = p->curr; c; c = next) {
-		next = c->next;
-		tfw_pool_free_pages(TFW_POOL_CHUNK_BASE(c), c->order);
-	}
-}
-
-template<class T>
-void
-benchmark_tfw_pool()
-{
-	TfwPool *p = __tfw_pool_new(0);
-	assert(p);
-
-	benchmark(std::move(T() + "tfw_pool"), [=]() {
-		for (size_t i = 0; i < N * sizeof(Small) / sizeof(T); ++i) {
-			T *o = (T *)tfw_pool_alloc(p, sizeof(T));
-			touch_obj(o);
-		}
-	});
-
-	tfw_pool_destroy(p);
-}
-
-template<class T>
-void
-benchmark_tfw_pool_free()
-{
-	TfwPool *p = __tfw_pool_new(0);
-	assert(p);
-
-	benchmark(std::move(T() + "tfw_pool w/ free"), [&]() {
-		for (size_t i = 0; i < N * sizeof(Small) / sizeof(T); ++i) {
-			T *o = (T *)tfw_pool_alloc(p, sizeof(T));
-			touch_obj(o);
-			if (__builtin_expect(!(i & 3), 0))
-				tfw_pool_free(p, o, sizeof(T));
-		}
-	});
-
-	tfw_pool_destroy(p);
-}
-
-void
-benchmark_tfw_pool_mix_free()
-{
-	TfwPool *p = __tfw_pool_new(0);
-	assert(p);
-
-	benchmark(std::move(std::string("tfw_pool w/ free (Mix)")), [=]() {
-		for (size_t i = 0; i < N; ++i) {
-			if (__builtin_expect(!(i & 0xfff), 0)) {
-				Huge *o;
-				o = (Huge *)tfw_pool_alloc(p, sizeof(*o));
-				touch_obj(o);
-				if (!(i & 1))
-					tfw_pool_free(p, o, sizeof(*o));
-			}
-			else if (__builtin_expect(!(i & 3), 0)) {
-				Big *o = (Big *)tfw_pool_alloc(p, sizeof(*o));
-				touch_obj(o);
-				if (!(i & 1))
-					tfw_pool_free(p, o, sizeof(*o));
-			}
-			else {
-				Small *o;
-				o = (Small *)tfw_pool_alloc(p, sizeof(*o));
-				touch_obj(o);
-			}
-		}
-	});
-
-	tfw_pool_destroy(p);
-}
-
-void
-benchmark_tfw_pool_create_and_destroy()
-{
-	benchmark(std::move(std::string("tfw_pool cr. & destr.")), []() {
-		for (size_t i = 0; i < N / 100; ++i) {
-			TfwPool *p = __tfw_pool_new(0);
-			for (size_t j = 0; j < 100; ++j) {
-				if (__builtin_expect(!(i & 3), 0)) {
-					Big *o;
-					o = (Big *)tfw_pool_alloc(p,
-							          sizeof(*o));
-					touch_obj(o);
-				} else {
-					Small *o;
-					o = (Small *)tfw_pool_alloc(p,
-							            sizeof(*o));
-					touch_obj(o);
-				}
-			}
-			tfw_pool_destroy(p);
-		}
-	});
-}
-
-/**************************************************************************/
-/* Adding M*LIB mempool */
-/**************************************************************************/
-
-#include "m-mempool.h"
-
-MEMPOOL_DEF(mempool_small, Small)
-MEMPOOL_DEF(mempool_big, Big)
-MEMPOOL_DEF(mempool_huge, Huge)
-
-void
-benchmark_mempool_small()
-{
-  mempool_small_t p;
-  mempool_small_init (p);
-  mempool_small_t *ptr = &p; // C++ lambda !
-  
-  benchmark(std::move(Small() + "M*LIB mempool"), [=]() {
-      for (size_t i = 0; i < N * sizeof(Small) / sizeof(Small); ++i) {
-        Small *o = mempool_small_alloc(*ptr);
-        touch_obj(o);
-      }
-    });
-  
-  mempool_small_clear(p);
-}
-
-void
-benchmark_mempool_big()
-{
-  mempool_big_t p;
-  mempool_big_init (p);
-  mempool_big_t *ptr = &p; // C++ lambda !
-
-  benchmark(std::move(Big() + "M*LIB mempool"), [=]() {
-      for (size_t i = 0; i < N * sizeof(Small) / sizeof(Big); ++i) {
-        Big *o = mempool_big_alloc(*ptr);
-        touch_obj(o);
-      }
-    });
-  
-  mempool_big_clear(p);
-}
-
-void
-benchmark_mempool_mix_free()
-{
-  mempool_small_t s, *ptr_s = &s;
-  mempool_big_t   b, *ptr_b = &b;
-  mempool_huge_t  h, *ptr_h = &h;
-  
-  mempool_small_init (s);
-  mempool_big_init (b);
-  mempool_huge_init (h);
-  
-  benchmark(std::move(std::string("M*LIB mempool w/ free (Mix)")), [=]() {
-      for (size_t i = 0; i < N; ++i) {
-        if (__builtin_expect(!(i & 0xfff), 0)) {
-          Huge *o = mempool_huge_alloc (*ptr_h);
-          touch_obj(o);
-          if (!(i & 1))
-            mempool_huge_free (*ptr_h, o);
-        }
-        else if (__builtin_expect(!(i & 3), 0)) {
-          Big *o = mempool_big_alloc(*ptr_b);
-          touch_obj(o);
-          if (!(i & 1))
-            mempool_big_free (*ptr_b, o);
-        }
-        else {
-          Small *o = mempool_small_alloc (*ptr_s);
-          touch_obj(o);
-          if (!(i & 1))
-            mempool_small_free (*ptr_s, o);
-        }
-      }
-    });
-  
-  mempool_small_clear (s);
-  mempool_big_clear (b);
-  mempool_huge_clear (h);
-}
-
-/*
- * ------------------------------------------------------------------------
- *	Main part of the benchmark
- * ------------------------------------------------------------------------
- */
-int
-main()
-{
-	std::cout << std::setw(35) << std::right << "small object size:    "
-		  << sizeof(Small) << std::endl;
-	std::cout << std::setw(35) << std::right << "big object size:    "
-		  << sizeof(Big) << std::endl;
-	std::cout << std::setw(35) << std::right << "huge object size:    "
-		  << sizeof(Huge) << "\n" << std::endl;
-
-	// Warm up malloc().
-	static const size_t n = N * sizeof(Big);
-	void *p = malloc(n);
-	assert(p);
-	memset(p, 0, n);
-	free(p);
-
-	benchmark_mallocfree<Small>();
-	benchmark_mallocfree_free<Small>();
-	benchmark_mallocfree<Big>();
-	benchmark_mallocfree_free<Big>();
-	std::cout << std::endl;
-
-#ifdef USE_GLIB
-	benchmark_glib_slices<Small>();
-	benchmark_glib_slices_free<Small>();
-	benchmark_glib_slices<Big>();
-	benchmark_glib_slices_free<Big>();
-	std::cout << std::endl;
-#endif
-	
-#ifdef USE_BOOST
-	benchmark_boost_pool<Small>();
-	benchmark_boost_pool_free<Small>();
-	benchmark_boost_pool<Big>();
-	benchmark_boost_pool_free<Big>();
-	benchmark_boost_pool_create_and_destroy();
-	std::cout << std::endl;
-#endif
-	
-	benchmark_ngx_pool<Small>();
-	benchmark_ngx_pool<Big>();
-	benchmark_ngx_pool_mix_free();
-	benchmark_ngx_pool_create_and_destroy();
-	std::cout << std::endl;
-
-	benchmark_mempool_small();
-	benchmark_mempool_big();
-        benchmark_mempool_mix_free();
-	std::cout << std::endl;
-
-	benchmark_tfw_pool<Small>();
-	benchmark_tfw_pool_free<Small>();
-	benchmark_tfw_pool<Big>();
-	benchmark_tfw_pool_free<Big>();
-	benchmark_tfw_pool_mix_free();
-	benchmark_tfw_pool_create_and_destroy();
-
-	return 0;
-}
@@ -1,53 +0,0 @@
-CC=		gcc
-CXX=		g++
-CFLAGS=		-g -Wall -O2 -fomit-frame-pointer -march=native -lm -include stddef.h
-CXXFLAGS=	$(CFLAGS)
-LDFLAGS=	
-OBJS=		
-LIBS=		-lm
-
-all: run
-
-benchmarks:
-	git clone https://github.com/attractivechaos/benchmarks.git
-
-build: benchmarks
-	mkdir -p benchmarks/udb/mlib
-	cp test-mlib.c benchmarks/udb/mlib/test.c
-	cp Makefile-mlib benchmarks/udb/mlib/Makefile
-	mkdir -p benchmarks/udb/mlib-oa
-	cp test-mlib-oa.c benchmarks/udb/mlib-oa/test.c
-	cp Makefile-mlib benchmarks/udb/mlib-oa/Makefile
-	touch build
-
-all-recur: build
-	cd benchmarks/udb;					\
-	wdir=`pwd`; 						\
-	list_c=`find . -name 'test.c'`;				\
-	list_cc=`find . -name 'test.cc'`;			\
-	for t in $$list_c $$list_cc ; do 			\
-		subdir=`dirname $$t`;				\
-		cd $$subdir; 					\
-		$(MAKE) CC="$(CC)" CXX="$(CXX)" DFLAGS="$(DFLAGS)" CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" || exit 1; 		\
-		cd $$wdir; 					\
-	done;
-
-run: all-recur
-	@cd benchmarks/udb;					\
-	echo ; echo "LIBRARY | INT TIME | STR TIME"	;	\
-	for i in `find . -name 'test'` ; do			\
-	    printf "%s|" `dirname $$i|sed -e 's+./++g'`;	\
-	    $$i -is | awk '					\
-		/\[int data\] # element/ {  nbInt= $$5 }	\
-		/\[int data\] CPU time/  {timeInt= $$5 }	\
-		/\[str data\] # element/ {  nbStr= $$5 }	\
-		/\[str data\] CPU time/  {timeStr= $$5 }	\
-		END { 						\
-		if (nbInt != 624444) timeInt="BRK" ; 		\
-		if (nbStr != 624444) timeStr="BRK" ;		\
-		print timeInt,"|" ,timeStr			\
-		}' ;						\
-	done
-
-clean:
-	rm -rf benchmarks build
@@ -1,22 +0,0 @@
-CC=		gcc
-CFLAGS=		-g -Wall -O2 -march=native
-OBJS=		../benchmark/benchmark.o ../runit/runlib.o test.o
-DFLAGS=
-INCLUDES=	-I../benchmark -I../runit -I../../../../..
-LIBS=		
-
-.SUFFIXES:.c .o
-
-.c.o:
-		$(CC) -std=gnu11 -DNDEBUG -c $(INCLUDES) $(CFLAGS) $(DFLAGS) $< -o $@
-
-all:test
-
-test:$(OBJS)
-		$(CC) $(CFLAGS) -o $@ $(OBJS) $(LIBS)
-
-cleanlocal:
-		rm -f *.o a.out *~ test
-
-clean:cleanlocal
-
@@ -1,73 +0,0 @@
-#include <string.h>
-
-#include "benchmark.h"
-#include "m-dict.h"
-#include "m-mempool.h"
-
-static inline bool oor_equal_p(int k, unsigned char n)
-{
-  return k == (int)-n - 1;
-}
-
-static inline void oor_set(int *k, unsigned char n)
-{
-  *k = (int)-n - 1;
-}
-
-DICT_OA_DEF2(dict_int,
-             int, M_OPEXTEND(M_DEFAULT_OPLIST, OOR_EQUAL(oor_equal_p), OOR_SET(oor_set M_IPTR)),
-             int, M_DEFAULT_OPLIST)
-
-static const char *const oor[2] = { "EMPTY", "DELETED" };
-
-static inline bool str_oor_equal_p(const char *k, unsigned char n)
-{
-return k == oor[n];
-}
-
-static inline void str_oor_set(const char * *k, unsigned char n)
-{
-*k = oor[n];
-}
-
-DICT_OA_DEF2(dict_str, const char *,
-          M_OPEXTEND (M_CSTR_OPLIST, OOR_EQUAL(str_oor_equal_p), OOR_SET(str_oor_set M_IPTR)),
-          int, M_DEFAULT_OPLIST)
-
-
-int test_int(int N, const unsigned *data)
-{
-  int ret;
-  M_LET(h, DICT_OPLIST(dict_int)) {
-    for (int i = 0; i < N; ++i) {
-      if (dict_int_get (h, data[i]) == NULL) {
-        dict_int_set_at (h, data[i], i);
-      } else {
-        dict_int_erase(h, data[i]);
-      }
-    }
-    ret = (int)dict_int_size(h);
-  }
-  return ret;
-}
-
-int test_str(int N, char * const *data)
-{
-  int ret;
-  M_LET(h, DICT_OPLIST(dict_str)) {
-    for (int i = 0; i < N; ++i) {
-      if (dict_str_get (h, data[i]) == NULL) {
-        dict_str_set_at (h, data[i], i);
-      } else {
-        dict_str_erase(h, data[i]);
-      }
-    }
-    ret = (int)dict_str_size(h);
-  }
-  return ret;
-}
-
-int main(int argc, char *argv[])
-{
-  return udb_benchmark(argc, argv, test_int, test_str);
-}
@@ -1,53 +0,0 @@
-#include <string.h>
-
-#include "benchmark.h"
-#include "m-dict.h"
-#include "m-mempool.h"
-
-DICT_STOREHASH_DEF2(dict_int,
-          int, M_OPEXTEND(M_DEFAULT_OPLIST, MEMPOOL(mpool_int), MEMPOOL_LINKAGE(static)),
-          int, M_DEFAULT_OPLIST)
-DICT_STOREHASH_DEF2(dict_str,
-          const char *, M_OPEXTEND (M_CSTR_OPLIST, MEMPOOL(mpool_str), MEMPOOL_LINKAGE(static)),
-          int, M_DEFAULT_OPLIST)
-
-int test_int(int N, const unsigned *data)
-{
-  int ret;
-  dict_int_list_pair_mempool_init(mpool_int);
-  M_LET(h, DICT_OPLIST(dict_int)) {
-    for (int i = 0; i < N; ++i) {
-      if (dict_int_get (h, data[i]) == NULL) {
-        dict_int_set_at (h, data[i], i);
-      } else {
-        dict_int_erase(h, data[i]);
-      }
-    }
-    ret = (int)dict_int_size(h);
-  }
-  dict_int_list_pair_mempool_clear(mpool_int);  
-  return ret;
-}
-
-int test_str(int N, char * const *data)
-{
-  int ret;
-  dict_str_list_pair_mempool_init(mpool_str);
-  M_LET(h, DICT_OPLIST(dict_str)) {
-    for (int i = 0; i < N; ++i) {
-      if (dict_str_get (h, data[i]) == NULL) {
-        dict_str_set_at (h, data[i], i);
-      } else {
-        dict_str_erase(h, data[i]);
-      }
-    }
-    ret = (int)dict_str_size(h);
-  }
-  dict_str_list_pair_mempool_clear(mpool_str);
-  return ret;
-}
-
-int main(int argc, char *argv[])
-{
-  return udb_benchmark(argc, argv, test_int, test_str);
-}
@@ -1,33 +0,0 @@
-CC=		gcc
-CXX=		g++
-CFLAGS=		-g -Wall -O2 -fomit-frame-pointer -march=native -lm -include stddef.h
-CXXFLAGS=	$(CFLAGS)
-LDFLAGS=	
-OBJS=		
-LIBS=		
-
-all: run
-
-udb2:
-	git clone https://github.com/attractivechaos/udb2.git
-
-build: udb2
-	mkdir -p udb2/mlib
-	cp test-mlib.c udb2/mlib/test.c
-	cp Makefile-mlib udb2/mlib/Makefile
-	touch build
-
-all-recur: build
-	cd udb2/stb && make CC="gcc -lm"
-	cd udb2 && for dir in `ls | egrep -v '^(Makefile|common.c|_)'`; do cd $$dir && make && cd -; done
-
-run: all-recur
-	@cd udb2;						\
-	echo ;	echo RUNNING BENCH ; echo ;			\
-	for i in `find . -name 'run-test'` ; do			\
-	    echo ; echo `dirname $$i|sed -e 's+./++g'`;		\
-	    $$i ;						\
-	done
-
-clean:
-	rm -rf udb2 build *~
@@ -1,8 +0,0 @@
-all:run-test
-
-run-test:test.c ../common.c
-	$(CC) -std=gnu99 -O2 -Wall -I../../../.. $< -o $@
-
-clean:
-	rm -f run-test* *~
-	rm -rf mlib
@@ -1,34 +0,0 @@
-#include "../common.c"
-#define M_USE_DICT_OA_PROBING(s) 1
-#include "m-dict.h"
-
-static inline bool oor_equal_p(unsigned int k, unsigned char n)
-{
-  return k == (unsigned int)n;
-}
-static inline void oor_set(unsigned int *k, unsigned char n)
-{
-  *k = (unsigned int)n;
-}
-
-DICT_OA_DEF2(dict_oa_uint,
-	     unsigned int, M_OPEXTEND(M_DEFAULT_OPLIST, HASH(hash_fn), OOR_EQUAL(oor_equal_p), OOR_SET(oor_set M_IPTR)),
-	     unsigned int, M_DEFAULT_OPLIST)
-
-uint32_t test_int(uint32_t n, uint32_t x0)
-{
-  uint32_t i, x, z = 0;
-  dict_oa_uint_t h;
-  dict_oa_uint_init(h);
-  for (i = 0, x = x0; i < n; ++i) {
-    x = hash32(x);
-    unsigned int key = get_key(n, x);
-    unsigned int *ptr = dict_oa_uint_get_at(h, key);
-    (*ptr)++;
-    z += *ptr;
-  }
-  fprintf(stderr, "# unique keys: %d; checksum: %u\n", (int) dict_oa_uint_size(h), z);
-  z = dict_oa_uint_size(h);
-  dict_oa_uint_clear(h);
-  return z;
-}
@@ -73,3 +73,42 @@ V0.5.*: * M_INVERT is renamed into M_REVERSE to be more coherent with the REVERS
 	* Rename CLEAN operator in RESET operator.
 	* Rename GET_SET_KEY operator in SAFE_GET_KEY operator.
 	
+V0.6.*: * Rename M_DEFAULT_OPLIST in M_BASIC_OPLIST
+        * Remove experimental macro M_IF_DEFAULT1.
+        * Remove M_INVERT
+        * String functions with _str suffix for C strings have been renamed with _cstr suffix (like string_cat_str ==> m_string_cat_cstr)
+        Note: the compatible layer still keeps the old naming,
+        so except if you are using the prefixed version of the strings
+        or the bounded strings API, you won't need to upgrade your code.
+        
+V0.7.2: * Rename m-mutex.h header in m-thread.h
+
+V0.7.3 : * DICT_STOREHASH_DEF2 / DICT_STOREHASH_DEF2_AS are deprecated.
+          Use DICT_DEF2 / DICT_DEF2_AS
+          
+V0.8.0 : * Memory interface massive compatibility break to allow more efficient integration of custom allocators.
+           The prototypes of NEW / DEL REALLOC / FREE operators are incompatible:
+           * Add the old number of elements of the array as argument of REALLOC
+           * Add the number of elements of the array and its base type as arguments of FREE.
+           * Add the context argument (which shall be ignored in not specific build)
+           (You can ignore the new arguments which are only hints provided to memory functions).
+           Also impact M_MEMORY_NEW / M_MEMORY_DEL / M_MEMORY_REALLOC & M_MEMORY_FREE
+           M_MEMORY_FULL: replace the failed size allocation size argument into the base type and the number of elements that failed to be allocated.
+         * m-buffer:
+           * non-thread safe queue & stack are moved into their dedicated header (m-queue) 
+           * BUFFER_THREAD_UNSAFE policy is no longer supported.
+           * Disabling BUFFER_BLOCKING policy is no longer supported (default policy is now forced).
+           * _push / _pop now returns now void like other containers instead of a bool (it was undocumented)
+         * Remove MEMPOOL support from list & R/B tree
+         * m-mempool: Header is obsolete (and no longer useful at all as lists & RB Tree no longer can use it. To remove). Use new M_USE_CONTEXT interface to pass local pool context.
+         * M*LIB becomes stricter for the INIT_MOVE operator:
+           The Emulation layer using CLEAR+INIT_SET methods, when there is no INIT_MOVE operator, has been removed:
+           either default INIT_MOVE operator (operator '=') is working, or a method is provided for INIT_MOVE or it is disabled.
+           If it is an array of size 1, you can use M_COPY_A1_DEFAULT as a default method.
+           (It's because supporting emulation layer with new memory context parameter was complicated)
+	 * Remove obsole headers: m-c-mempool, m-mempool, m-shared, m-i-shared, -mconcurrent
+	 
+V0.8.1 : * m-algo: Update interface of _transform to be more flexible: adding user context pointer, and filtering of the input elements.
+         * m-algo: Update interface of _reduce to be more user friendly: return value indicates if the reduction is empty or not.
+         * m-algo: Rename _map_reduce into _transform_reduce and update its interface to be more flexible: adding user context pointer, and filtering of the input elements and return value indicates if the reduction is empty or not.
+         * Rename _push_raw method by _push_back_raw for all containers (clearer on the semantic)
@@ -1,7 +1,338 @@
 *Long term issues*
------------------
+==========================================================

-* TODO #26 : Hash-Map for huge objects                          :ENHANCEMENT:
+* DONE #34 : Pass old size arguments to memory allocator        :ENHANCEMENT:
+
+** State
+
+Some custom allocators don't store the old size of an object to maximize memory usage
+used by the allocated objects. On realloc, they need the old size argument.
+This is inline with the GMP allocator which provides  the old size argument.
+There is no difficulty in the data structure to compute the old size of the object
+(it is quite easily available).
+It is needed for REALLOC operator (and FREE)
+
+** Solution #1
+
+Add the oldsize argument to the REALLOC and FREE operators.
+
+** Solution #2
+
+Create a local variable m_local_old_size before calling the REALLOC or FREE operators
+Modify GAIA interface to link OLDSIZE patttern to m_local_old_size
+Need to handle the warnings correctly.
+
+** Tradeof analysis
+
+Solution #1 is simpler but breaks API. However custom allocators are not common.
+Solution #2 keeps API as it is but increases code complexity by adding more hacks into the codebase.
+
+* TODO #33 : Handling of partially constructed object               :ANOMALY:
+** State
+
+Support of partially constructed object needs special code to handle it 
+correctly (register a correct cleanup function in case of exception).
+
+Current containers don't support such features.
+
+> NOTE: 
+ An exception for init_set supposes that the object is *not* initialized.
+ An exception for set supposes that the object *remains* initialized.
+ Some containers perform an init_set using init+set
+ others perform a set using a clear+init_set
+ The property of init_set (resp. set) is broken if an exception is raised in the set (resp. init_set):
+ the object is not let in the expected uninitialized (resp. initialized) state.
+
+** Actions
+
+Add such support in M*LIB containers. 
+Need to analyse each function for execption safety.
+
+It can be difficult. For example, for array _init_set
+function due to the copy of the object one per one. Each copied sub object
+may throw an exception, so we always need to have the container in a correct
+state so that it can be cleanup.
+
+* DONE #32 : User specialization fields in the container        :ENHANCEMENT:
+** State
+
+Some methods of a contained object may need to have some options that 
+are neither constant nor global, but are specialized in function of the container.
+
+For example, a memory handler may need a parameter which is needed to identify
+which pool of memory has to be used.
+
+** Plan:
+
+Add a new operator "CONTEXT" which is a type to be added in the 
+defined container. Then it can be accessed by the operator through an extension
+of the GAIA by adding support for identification of specialization like this:
+
+     ( CONTEXT( memory_pool_ref ),
+       NEW( API(NONE, memory_pool_alloc, CONTEXT, ARG1)),
+       DEL( API(NONE, memory_pool_free, CONTEXT, ARG1)) )
+
+** Open points:
+
+- How to get access to the specialization field of the container? 
+==> Define the "self" name as the name of the container for all methods? 
+- What to do when there are several containers for a method?
+==> self shall be the destination?
+
+- How to initialize the specialization field of the container? provide custom initialization functions? It seems to be the hard point.
+  Use GAIA interface and a local variable with force naming : m_local_context for example.
+
+** Proposed Solution:
+
+  New operator USER_CONTEXT created. If operator USER_CONTEXT exist:
+  + add a USER_CONTEXT user_data in the data structure.
+  + for INIT & INIT_WITH, add a new parameter to the function to pass the context to initialize
+  + for INIT_SET & INIT_MOVE & MOVE, initialize it with the source object (FIXME: This may not be what we want for INIT_SET if we want to copy an object from an allocator to another)
+  + for each functions that use an operator that may use the USER_CONTEXT, add a local variable m_local_context and initialize to the user context
+  ==> Limit user context to pointer or integer (Good enough)
+  + Expand GAIA interface to handle specially the term USER_CONTEXT: if it exists, expands it to m_local_context. The user will therefore be able to expand its operator with the user provided local context.
+  + Update OPLIST of data structure to change the call to INIT & INIT_WITH to use GAIA/USER_CONTEXT if the basic type has a USER_CONTEXT
+  + To be checked: EMPLACE_TYPE ?
+  + Create M_USING_CONTEXT to initialize a local variable m_local_context and initalize it with the user context to be used y the M_LET macro:
+      M_USING_CONTEXT(int *, &y) 
+      M_LET(x, object_t) {
+
+      }
+
+  Done in branch feature/user-data-v2 with a full working implementation for array
+
+** Solution limitation:
+
+ INIT & INIT_WITH interface change for the user. This however is an acceptable limitation.
+
+ Adding a user context to each data structure will increase a lot the size of the data structure in case of recursive data structures: For example, an array of string_t. Each string_t will need a user data context for it to work properly, so we'll need N*sizeof(user data context) memory just to make it work. This becomes even more problematic if we chain more data structures.
+ And in general, we use custom allocators to be faster and use less memory: this will defeat the purpose of custom allocators a lot.
+
+ Another limitation is that string_t / bitset_t are not supported correctly. We can make this change globally but it will prevent mixing different codebase that uses the string_t together (one expects a user context, the other not).
+ 
+** Alternative #1
+
+ Passing user context arguments to each function call seems to be a little bit better.
+ It might however reduces code optimization as one more register will be user everywhere in the calling chain, which may huge.
+
+** Alternative #2
+
+ The custom allocator could have a thread default allocator as a global variable (thread attribute). It seems to be a better solution, more scalable.
+ The custom allocator will need to be able to switch quickly between scrach arena and permanent arena. This seems to be easy.
+
+ However switching allocators puts a burden to the user: 
+ the user needs to properly be sure to call the destructor with the custom allocator set to be the same as when it was created.
+ This might not even be possible in case of exceptions.
+ 
+* TODO #31 : Uniformize parametrization options of containers   :ENHANCEMENT:
+
+** State 
+
+Currently in order to pass some parametrization of the containers,
+the parameters are passed to the generation macros through:
+
+- extra parameters of the macros,
+- special operators of the contained object oplist.
+
+The extra parameters of some generation macros break the uniformity
+of the interface.
+It is conceptually wrong to put some special operators of the contained object 
+that have only meanings for the container object.
+In case of adding new options, it break the existing interface or put another
+operator in the contained object oplist.
+
+
+The following parameters are used:
+
+- Fixed size of a queue (buffer / B+Tree),
+- Policy of a queue (buffer),
+- Type of the container, IT type of the container, Ref type of the iterator
+
+The following operators are used:
+
+- NEW / DEL / REALLOC / FREE
+- MEMPOOL / MEMPOOL_LINKAGE
+
+The following new options is planned:
+
+- Interface (See #28)
+- Extra parameter for memory allocation function 
+
+** Plan
+
+The M\_*\_DEF\_AS macros shall be changed like this:
+
+    M_*_DEF_AS(name, cont_oplist, type[, type_oplist])
+
+with cont\_oplist being the container oplist that gives parametrization to the container definition.
+The following operators are planned:
+
+- TYPE: to define the type of the container,
+- IT\_TYPE: to define the IT type of the container,
+- SUBTYPE: to define the type pointed by the iterator,
+- FIXED\_SIZE: to define the fixed size of a container,
+- POLICY: to define the policy of a container,
+- NEW / DEL / REALLOC / FREE: to define the memory interface,
+- MEMPOOL / MEMPOOL_LINKAGE: to request a definition of a specialized memory interface,
+- INTERFACE: to request a pure header definition, an implementation or both (see #28),
+- CONTEXT: to request an extra context parameter to add in the container.
+
+All operators should be optional.
+
+The NEW / DEL / REALLOC / FREE / MEMPOOL / MEMPOOL_LINKAGE won't have any effects anymore if defined in the contained object oplist.
+
+** Pro:
+
+- Uniformize interface
+
+** Con:
+
+- API breakage. It can be mitigated by providing an adaptating layer by prividing the new interface for M\_*\_DEF\_AS only
+and *\_DEF\_AS will provide a translation layer.
+
+* TODO #30 : Serialization rework                               :ENHANCEMENT:
+
+** State 
+Currently, each container supports 3 serialization methods:
+
+- old format to FILE 
+- old format to string
+- generic serialization 
+
+Generic serialiation connect the container format to the serialization object constraints.
+It is done through a vtable. As such there is a performance penality and it avoids proper inlining.
+It is however quite flexible and decouple the data structure from the serialization format.
+
+** Evolution
+
+Old format should be deprecated and the functions implemented it shall use the generic serialization interface.
+
+Serialization object shall provide a special OPLIST of serialization.
+For example M-CORE will provide OLD Format oplist and M-SERIAL-JSON will provide JSON format oplist.
+Each oplist will provide the suffix needed for the serialization, and the interface
+(see already existing interface).
+
+Then a container will generate specialized serialization methods for each provided oplist.
+
+** Pros:
+
+- Faster
+- In the M*LIB philosphy: much like other oplist usage.
+
+** Cons:
+
+- compatibility breakage.
+- increase code complexity.
+
+** Open point:
+
+- how can a user add a new serialization object? ==> See solution implemented by M-GENERIC.
+- Can we make a generic serialization object to support migration path? Seems possible.
+
+** Example
+
+serial-json provides
+
+    #define M_SERIAL_1() (NAME(_json), READ_INT(...), WRITE_INT(...) )
+
+containers provides
+    
+    For i in 1 100 ; do 
+        if do exist M_SERIAL_ ## i () 
+             expand(SERIAL_METHOD with M_SERIAL_1())
+
+    SERIAL_METHOD(name, ....)
+      static inline m_serial_return_code_t                                        \
+      M_C(M_F(name, _out_serial),M_GET_NAME(serial_op) )(M_GET_TYPE(serial_op) f, const list_t list)               \
+
+* DONE #29 : Support of partial initialized object                  :ANOMALY:
+
+** State
+
+In case of exception during the construction of an object,
+if the object is partially constructed, there is no destructor to call.
+Therefore if there is some partially constructed object
+(with some fields already fully constructed), there will be some links.
+This is the same problem with C++
+
+** Proposition
+
+Provide new macros to perform the partial initialization before doing the remaining taf.
+Something like:
+
+    M_CHAIN_INIT( init_code, clear_code)
+
+or
+
+x is { string_t s; string_t d; int num; }
+
+void struct_init_set(struct_t x, const struct_t y)
+{
+    // First thing is Chained Initialization
+    M_CHAIN_INIT( string_init_set(x->s, y->s), string_clear(x->s) );
+    M_CHAIN_INIT( string_init_set(x->d, y->d), string_clear(x->d) );
+    // End of chain init
+    x->num = y->num;
+}
+
+M_CHAIN_INIT will push the clean code pretty much like M_LET.
+Everything else is done in M_LET: when the constructor fully returns,
+the index of the clean code to call is reset to its value before calling
+the constructor. It means that the partially initialized code will be removed
+from this stack before the clean method of the structure itself is pushed.
+
+If an exception is raised after a M_CHAIN_INIT, only the clean methods
+of the M_CHAIN_INIT are called.
+
+* TODO #28 : Separate generation of interface to implementation :ENHANCEMENT:
+
+** State
+Enable support for generating an interface only for the headers
+and an implementation only for the source code.
+
+** Analysis
+Try to keep API compatibility
+==> Only modify renamed macro with M_ prefix by giving a new mandatory
+argument for such generation.
+
+This argument is a generation parametric argument.
+oplist is a parameter that define the property of the contained type.
+It could be used to pass this information but it will be an abuse of interface.
+Another argument is needed.
+
+Used arguments to parameter generation not related to the contained type:
+
+- memory interface (NEW / DEL / ...)
+- queue policy
+- fixed size for queue
+- fixed node size for B+Tree
+- generate static inline, public (extern) or private (define) functions.
+- name of the type.
+- name of the iterator
+- name of the iterated element.
+- ...
+
+Use another oplist as argument for M_.._DEF_AS (See #31)
+
+ M_BUFFER_DEF_AS(name, (TYPE(toto), FIXED_SIZE(10), POLICY(STACK), INTERFACE(header)), int, M_BASIC_OPLIST)
+
+* TODO #27 : Uniformization of m-buffer interface               :ENHANCEMENT:
+
+** State
+
+The m-buffer interface requires special argument to work:
+- size & policy for BUFFER,
+- policy only for the others.
+This is not uniform with the others generation macros and not uniform with each other.
+Moreover the others are the only one which can be used in a shared memory, so
+a fixed size will be good to have too for such interface.
+
+** Plan
+
+- Uniformization of the interface (See #31)
+- Provide static size for all QUEUE.
+
+* DONE #26 : Hash-Map for huge objects                          :ENHANCEMENT:

 Specialize Hashmap for huge objects on supported hardware:

@@ -34,18 +365,27 @@ unsigned get_small_hash(int64_t x) {
 }
 #+END_SRC

-* TODO #25 : Support of error code model for error handling.    :ENHANCEMENT:
+Can also (should?) use SIMD to test for several hash entries at the same times
+In which case a complete new implementation will be needed
+Note: SIMD doesn't seem to be a win if not handled properly.
+Since the first guess of a good hashtable shall give the right entry > 90% of the time.
+So 90% of the times SIMD will pay the cost of reading not needed memory.
+It might still be a win, but proper tuning needs to be done.

+* TODO #25 : Support of error return model for error handling.  :ENHANCEMENT:
+
+** State
 Find a way to support error return code for the API in case of allocation
 failure.

-Any service that returns void shall return a "int".
+** Analysis
+Any service that returns void shall return a "int" (or another type).
 In case of allocation failure, it shall return an error.
 M_CALL macro shall stop its execution if the service returns an error code
 and the error code represents an error (avoid rewritting everything)
 and throw back the error code (stopping the execution flow).

-Services returning already something shall not be modified.
+Services returning already something shall not be modified but returns the error code embedded (like a NULL pointer).

 This model should be applied at the container level only and not globally.
 Different containers may need different levels of error handling.
@@ -97,26 +437,30 @@ RETCODE/RETCODE

 If really needed, the macro can be avoided and code can be hand written.

-Open points:
+** Open points:
+
 - How to handle warnings on unused labels?
- What about M_LET/ M_EACH?
+- What about M_LET / M_EACH? Maybe only supports those.

+* TODO #24 : New MIN-MAX-HEAP container                         :ENHANCEMENT:

-* TODO #24 : New: Add MIN-MAX-HEAP container                    :ENHANCEMENT:
-
+** State
 See https://en.wikipedia.org/wiki/Min-max_heap
 as DPRIORITY_QUEUE_DEF ?

+** Analysis
 NOTE: Needs for such container?
+On hold until a user needs it.

+* DONE #23 : Strict MOVE semantic to clarify                    :ENHANCEMENT:

-* TODO #23: Strict MOVE semantic to clarify                     :ENHANCEMENT:
+** State

 Some type may need to have a force MOVE semantic (for example, they can store
 pointer to themselves). Currently the INIT_MOVE & MOVE operators are more
 a help for performance than a strict semantic usage.

-** ARRAY container
+** ARRAY container constraint

 The ARRAY container doesn't support strict MOVE semantic for example.
 It is not a simple matter as it performs a realloc of the table, thus
@@ -125,7 +469,7 @@ moving the data before they can be moved using MOVE. Two solutions:
 - New operator MOVE_SELF to fix a type after it has been moved.
 - If MOVE defined, force another table and then copy by hand the type. This will be slower and consumme more memory.

-** MOVE in OPLIST                                               :ENHANCEMENT:
+** MOVE in OPLIST

 Proposal: do not export INIT_MOVE / MOVE operator in OPLIST if the MOVE operator is 
 compatible with a pure COPY semantic. An exported MOVE operator will tell 
@@ -139,14 +483,29 @@ For example for tuple, it shall

 ** DO_INIT_MOVE operator

-DO_INIT_MOVE macro is not also fully working for structure
+DO_INIT_MOVE macro is also fully working for structure
 defined with [1] tricks but without an explicit INIT_MOVE / MOVE
-operators as it uses MOVE_DEFAULT which is not (fully compatible).
+operators as it uses MOVE_DEFAULT which is not compatible.
 ==> Analyse limitation and possible constraint usages.

+Being able to define a correct default for INIT_MOVE will be really good
+(compatible with trivial move copy).
+In such case, all INIT_MOVE & MOVE operators can be removed from oplist
+to only use the default, and theses operators can be disabled or defined
+only when really needed in the oplist.
+However creating a default INIT_MOVE macro seems problematic.
+If the type is typedef T t[1] then passing such an argument to a function, 
+will transform the argument to T*, and the type of the argument doesn't match
+what is expecting resulting in a move of the pointers, not a move of the design data.

-* TODO #20: New: Bucket priority queue                          :ENHANCEMENT:
+Defining this type seems possible with C11 _Generic and a TYPE in the oplist,
+but without C11 _Generic I don't see any way to define such macro
+and we still need to target C99 for such basic feature.

+Without a way to write such a macro, the ticket seems pretty much a dead end.
+
+* TODO #20 : New: Bucket priority queue                         :ENHANCEMENT:
+** State
 Add a new kind of priority queue. 
 See https://en.wikipedia.org/wiki/Bucket_queue

@@ -161,22 +520,33 @@ except that we can scan 64 entries at a time).
 Check if we can use BITSET, or introduce fixed size BITSET or use ad-hock 
 implementation.

+** Analysis
+NOTE: Needs for such container?
+On hold until a user needs it.

-* TODO #19: New: Intrusive Red Black Tree                       :ENHANCEMENT:
-
+* CANC #19 : New: Intrusive Red Black Tree                      :ENHANCEMENT:
+** State
 Add intrusive red black tree. 
 Look also for AVL tree (NOTE: Is there a performance difference between the two?)

+** Analysis
+ Only needed for unmovable objects for which B+Tree cannot do the job.
+ But standard Read/Black Tree will do the job just fine.
+ There is really no need for it.
+ ==> Cancelled

-* TODO #18: Missing methods                                     :ENHANCEMENT:
-
+* TODO #18 : Missing methods                                    :ENHANCEMENT:
+** State
 Some containers don't have all the methods they should.
 See the cells in yellow here:
 http://htmlpreview.github.io/?https://github.com/P-p-H-d/mlib/blob/master/doc/Container.html

+** Analysis
+Analyzed each missing methods and fill in the gap

-* TODO #17: New: Ressource handler                              :ENHANCEMENT:
+* TODO #17 : New: Ressource handler                             :ENHANCEMENT:

+** State
 A global 'ressouce handler' which shall associated a unique handle to a ressource.
 The handle shall be unique for the ressource and shall not be reused.
 It is typically a 64 bits integers always incremented (even if the program
@@ -202,11 +572,11 @@ http://htmlpreview.github.io/?https://github.com/P-p-H-d/mlib/blob/master/doc/Co

 How to handle multiple resource ? 

- * variant: works fine. Memory usage can be (much) higher than needed if there is a lot of dissimilarity between the size of the objects.
- * embedded the type in the ressource handler: more work, API more complex. Memory usage seems better.
+** Analysis
+ - use of variant: Pro : easy. Con: Memory usage can be (much) higher than needed if there is a lot of dissimilarity between the size of the objects.
+ - embedded the type in the ressource handler: Con: more work, API more complex. Pro: Memory usage seems better.

-
-* TODO #16: New: Lock Free List                                 :ENHANCEMENT:
+* TODO #16 : New: Lock Free List                                :ENHANCEMENT:

 Implement a lock free list. Most of the difficulty is the memory reclamation part.
 Typically this lock free list shall be compatible with RCU method.
@@ -229,31 +599,9 @@ http://htmlpreview.github.io/?https://github.com/P-p-H-d/mlib/blob/master/doc/Co
 - needs to be logically deleted : needs a previous field
   (NULL if not logically deleted) ? TBC

+ NOTE: m-c-mempool doesn't seem to be fully robust. random failure of the test cases appear (more notably with Visual C++, but it is still quite rare).

-* TODO #15: Prologue / Epilogue for Constructor / Destructor for error handling :ENHANCEMENT:
-
-Constructor (and destructor) need to use user-defined prologue / epilogue.
-This is in order to register the constructed object into a proper Exception
-Handling Stack so that throwing exceptions may work reliably.
-
-Proposal:
-
- M_CONSTRUCTOR_PROLOGUE(object, oplist);
- M_CONSTRUCTOR_EPILOGUE(object, oplist);
- M_DESTRUCTOR_PROLOGUE(object, oplist);
- M_DESTRUCTOR_EPILOGUE(object, oplist);
-
-Object creation will need to add all sub-objects into the stack, 
-then unstack all to push instead the root object (which recursively remove them).
-
-See also http://freetype.sourceforge.net/david/reliable-c.html#cseh
-
- How to handle like allocation of the object?
- How to avoid calling the destructor multiple times? (It is needed?)
- How the code can be factorized with RETCODE needs?
-
-
-* TODO #14: Memory allocation enhancement                       :ENHANCEMENT:
+* DONE #14 : Memory allocation enhancement                      :ENHANCEMENT:

 Enhancement of the memory allocation scheme to find way to deal properly with advanced allocators:

@@ -287,9 +635,10 @@ Needs some formal operator in the oplist to support it fully and an example.

 It is a kind of object  inheritance where the container inherits some extra data from its base.

+Duplicate with #32 which is more generic ==> Closed

-* TODO #12: New: Atomic shared pointer                          :ENHANCEMENT:
-
+* TODO #12 : New: Atomic shared pointer                         :ENHANCEMENT:
+** State
 Add an extension to the SHARED_PTR API:

 - New type atomic_shared_ptr
@@ -362,10 +711,8 @@ Other alternative solution is to use the bit 0 to mark the pointer as being upda

 Other implementation seems to have it hard to be lock-free: cf. https://github.com/llvm-mirror/libcxx/commit/5fec82dc0db3623546038e4a86baa44f749e554f

-
-
-* TODO #5: New: Concurrent dictionary Container                 :ENHANCEMENT:
-
+* TODO #5 : New: Concurrent dictionary Container                :ENHANCEMENT:
+** State
 Implement a more efficient dictionary than lock + std dictionary for all operations when dealing with threads.
 See https://msdn.microsoft.com/en-us/library/dd287191(v=vs.110).aspx

@@ -410,7 +757,6 @@ It needs before lock-free list: http://www.cse.yorku.ca/~ruppert/papers/lfll.pdf
 Atomic update is done by allocating a new node, update it, and atomicaly store it in the dict, putting the old one as logically deleted and to reclaim later.
 (Other threads may still read its data so we cannot free immediatly). 
 
-
 * DONE #22: Enhanced services for SPSC Queue                    :ENHANCEMENT:

 Add services:
@@ -448,6 +794,27 @@ push always succeed and the queue always keep the youngest element.
   To simplify it, this interface could only support one kind of import/export
   per compilation unit.

+* DONE #15: Prologue / Epilogue for Constructor / Destructor for error handling :ENHANCEMENT:
+  
+Constructor (and destructor) need to use user-defined prologue / epilogue.
+This is in order to register the constructed object into a proper Exception
+Handling Stack so that throwing exceptions may work reliably.
+
+Proposal:
+
+- M_CONSTRUCTOR_PROLOGUE(object, oplist);
+- M_CONSTRUCTOR_EPILOGUE(object, oplist);
+- M_DESTRUCTOR_PROLOGUE(object, oplist);
+- M_DESTRUCTOR_EPILOGUE(object, oplist);
+
+Object creation will need to add all sub-objects into the stack, 
+then unstack all to push instead the root object (which recursively remove them).
+
+See also http://freetype.sourceforge.net/david/reliable-c.html#cseh
+
+- How to handle like allocation of the object?
+- How to avoid calling the destructor multiple times? (It is needed?)
+- How the code can be factorized with RETCODE needs?



@@ -0,0 +1,17 @@
+#!/bin/sh
+mkdir -p /tmp/prepro-$USER
+name=/tmp/prepro-$USER/$$.c
+param1=""
+param2=""
+while test $# -gt 0 ; do
+    case $1 in
+        -c) param2="$param2 -c" ;;
+        -o) param2="$param2 -o $2" ; shift ;;
+        *\.c)  param1="$param1 $1" ;;
+        *) param1="$param1 $1" ; param2="$param2 $1" ;;
+     esac
+    shift
+done
+cc $param1 -E |grep -v '^#' > ${name}      \
+    && perl -pi -e  's/\;/\;\n/g' ${name}    \
+    && cc $param2 ${name}
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2021, Patrick Pelissier
+# Copyright (c) 2017-2023, Patrick Pelissier
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without
@@ -21,8 +21,9 @@
 # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 CC=cc -std=c99
-CFLAGS=-Wall -W -pedantic -Wshadow -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wswitch-default -Wswitch-enum -Wcast-align -Wpointer-arith -Wbad-function-cast -Wstrict-overflow=5 -Wstrict-prototypes -Winline -Wundef -Wnested-externs -Wcast-qual -Wshadow -Wunreachable-code -Wlogical-op -Wstrict-aliasing=2 -Wredundant-decls -Wold-style-definition -Wno-unused-function -g
+CFLAGS=-Wall -W -pedantic -Wshadow -Wpointer-arith -Wcast-qual -Wstrict-prototypes -Wmissing-prototypes -Wswitch-default -Wswitch-enum -Wcast-align -Wpointer-arith -Wbad-function-cast -Wstrict-overflow=5 -Wstrict-prototypes -Wundef -Wnested-externs -Wcast-qual -Wshadow -Wunreachable-code -Wlogical-op -Wstrict-aliasing=2 -Wredundant-decls -Wold-style-definition -Wno-unused-function -g
 GMP_DIR=
+MPFR_DIR=$(GMP_DIR)
 CPPFLAGS=-I..
 LDFLAGS=-pthread
 RM=rm -f
@@ -30,18 +31,33 @@ RM=rm -f
 .SUFFIXES: .c .exe

 .c.exe:
-	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) `cat config` $< -o $@
+	$(CC) $(CFLAGS) $(CPPFLAGS) $< -o $@ `cat config` `cat config.curl` $(LDFLAGS)
+
+.c.o:
+	@$(MAKE) config
+	$(CC) $(CFLAGS) $(CPPFLAGS) -O2 `cat config.link` -DNDEBUG -g $< -c -o $@

 all: config
 	$(MAKE) `ls ex-*.c|sed -e 's/\.c/\.exe/g'`
 	if test "$(CC)" = "cc -std=c99" ; then $(MAKE) `ls ex11-*.c|sed -e 's/\.c/\.exe/g'` CC="cc -std=c11" ; fi
+	$(MAKE) exm.exe exn.exe
+
+exm.exe: exm-lib.o exm-main.o
+	$(CC) `cat config.link` -g $^ -o $@
+
+exn.exe: exn-lib.o exn-main.o
+	$(CC) `cat config.link` -g $^ -o $@

 config:
 	printf "#include <gmp.h>\nint main(void){mpz_t z; mpz_init(z); return 0;}\n" > config-test.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS)  -I$(GMP_DIR)/include -L$(GMP_DIR)/lib -lgmp config-test.c -o config-test.exe 2> /dev/null && echo "-DHAVE_GMP=1  -I$(GMP_DIR)/include -L$(GMP_DIR)/lib -lgmp" > config || echo "-DHAVE_GMP=0" > config
+	$(CC) $(CFLAGS) $(CPPFLAGS) -I$(GMP_DIR)/include -L$(GMP_DIR)/lib config-test.c -lgmp -o config-test.exe $(LDFLAGS) 2> /dev/null && echo "-DHAVE_GMP=1 -DHAVE_MPFR=0 -I$(GMP_DIR)/include -L$(GMP_DIR)/lib -lgmp" > config || echo "-DHAVE_GMP=0 -DHAVE_MPFR=0 " > config
+	printf "#include <mpfr.h>\nint main(void){mpfr_t z; mpfr_init(z); return 0;}\n" > config-test.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -I$(GMP_DIR)/include -I$(MPFR_DIR)/include -L$(GMP_DIR)/lib -L$(MPFR_DIR)/lib config-test.c -lmpfr -lgmp -o config-test.exe $(LDFLAGS) 2> /dev/null && echo "-DHAVE_GMP=1 -DHAVE_MPFR=1  -I$(GMP_DIR)/include -L$(GMP_DIR)/lib -I$(MPFR_DIR)/include -L$(MPFR_DIR)/lib -lmpfr -lgmp" > config || echo "MPFR not available"
+	printf "#include <curl/curl.h>\nint main(void){curl_global_init(CURL_GLOBAL_DEFAULT);}" > config-test.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) config-test.c `curl-config --cflags --libs`  -o config-test.exe 2> /dev/null && echo "-DHAVE_CURL=1 `curl-config --cflags --libs`" > config.curl || echo "-DHAVE_CURL=0 " > config.curl
+	printf "#include <stdio.h>\nint main(void){printf(\"Ok\"); return 0;}\n" > config-test.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) config-test.c -ffunction-sections -fdata-sections -Wl,--gc-sections 2> /dev/null && echo "-ffunction-sections -fdata-sections -Wl,--gc-sections" > config.link || echo "" > config.link
 	$(RM) config-test.c config-test.exe

 clean:
-	$(RM) *.exe *.s *~ *.o ./a.dat config
-
-
+	$(RM) *.exe *.s *~ *.o ./a.dat config config.link config.curl
@@ -4,16 +4,16 @@

 /* Define a dynamic array of int */ 
 ARRAY_DEF(vector_int, int)
-/* Register the oplist of this dynamic array globally */
+/* Register the oplist of this dynamic array globally (using implicitely M_BASIC_OPLIST) */
 #define M_OPL_vector_int_t() ARRAY_OPLIST(vector_int)
-/* Define some standards algorithms on this dynamic array */
+/* Define some standards algorithms on this dynamic array. We can reuse the prefix of the dynamic array */
 ALGO_DEF(vector_int, vector_int_t)

 /* Define a dynamic array of bool */ 
-ARRAY_DEF(vector_bool, bool, M_BOOL_OPLIST)
+ARRAY_DEF(vector_bool, bool)
 /* Register the oplist of this dynamic array globally */
 #define M_OPL_vector_bool_t() ARRAY_OPLIST(vector_bool, M_BOOL_OPLIST)
-/* Define some standards algorithms on this dynamic array */
+/* Define some standards algorithms on this dynamic array. We can reuse the prefix of the dynamic array */
 ALGO_DEF(vector_bool, vector_bool_t)

 /* ID function */
@@ -41,10 +41,10 @@ int main(void)
 #else
    for M_EACH(it, myvector, vector_int_t) {
        printf(" %d", *it);
-      }
+    }
 #endif
    printf("\n");
-  }
+  } /* End of M_LET: myvector & tmp are automaticly cleared */
  
  // Same thing but with booleans
  M_LET(myvector, tmp, vector_bool_t) {
@@ -56,13 +56,13 @@ int main(void)
    printf("myvector contains:");
    for M_EACH(it, myvector, vector_bool_t) {
        printf(" %d", (int)*it);
-      }
+    }
    printf("\n");
    printf ("ALL: %d ANY: %d NONE: %d\n",
            vector_bool_all_of_p(myvector, id),
            vector_bool_any_of_p(myvector, id),
            vector_bool_none_of_p(myvector, id) );
-  }
+  } /* End of M_LET: myvector & tmp are automaticly cleared */

  return 0;
 }
@@ -3,18 +3,18 @@
 #include "m-algo.h"
 #include "m-string.h"

-/* Define a dictionnary (or hash_map or undordered_map)
+/* Define a dictionnary (or hash_map or unordered_map)
 * from a string_t to int */
 DICT_DEF2(dict, string_t, int)
 /* Register the oplist of this dictionnary globally */
-#define M_OPL_dict_t() DICT_OPLIST(dict, STRING_OPLIST, M_DEFAULT_OPLIST)
+#define M_OPL_dict_t() DICT_OPLIST(dict, STRING_OPLIST, M_BASIC_OPLIST)

 /* Define an array of integer */
 ARRAY_DEF(vector_int, int)
 /* Register the oplist of this array of integer globally */
 #define M_OPL_vector_int_t() ARRAY_OPLIST(vector_int)

-/* Micro macro to detect if a string starts with the given pattern */
+/* Micro macro to detect if the key string starts with the given pattern */
 #define start_with(pattern, item)                \
  string_start_with_str_p((item).key, (pattern))

@@ -23,14 +23,13 @@ ARRAY_DEF(vector_int, int)

 int main(void)
 {
-  int s;
+  int s = 0;
  // Init keys as a vector_int_t, initialize it (and prepare its destruction)
  M_LET(keys, vector_int_t)
-    // Initialize m as a dictionnary and initialize it with the given database
-    // Initialize tmp as a dictionanry
-    M_LET( (m, (STRING_CTE("foo"), 1), (STRING_CTE("bar"), 42), (STRING_CTE("bluez"), 7), (STRING_CTE("stop"), 789) ), tmp, dict_t) {
- 
-    /* Extract all elements of 'm' that starts with 'b' */
+  // Initialize m as a dictionnary and initialize it with the given database
+  // Initialize tmp as a dictionnary
+  M_LET( (m, (STRING_CTE("foo"), 1), (STRING_CTE("bar"), 42), (STRING_CTE("bluez"), 7), (STRING_CTE("stop"), 789) ), tmp, dict_t) {
+    /* Extract all elements of 'm' that starts with 'b' and fills tmp with it */
    ALGO_EXTRACT(tmp, dict_t, m, dict_t, start_with, "b");
    /* Extract the values of theses elements */
    ALGO_TRANSFORM(keys, vector_int_t, tmp, dict_t, get_value);
@@ -7,28 +7,31 @@ ARRAY_DEF(vector_int, int)
 /* Register the oplist of this array of int globally */
 #define M_OPL_vector_int_t() ARRAY_OPLIST(vector_int)

-/* Set s (string_t) to the integer i */
-#define str_ui(s, i) string_printf(s, "%d", i)
-
 /* Concat two strings by insertion a '-' within them */
 #define str_cat(s1, s2) (string_cat_str(s1, "-"), string_cat(s1, s2))

 int main(void)
 {
-  // Let s be a string_t and initilize it.
+  // Let 's' be a string_t and initialize it.
  M_LET(s, string_t)
-    // Let v be a vector of integer and initialize it.
-    M_LET( (v, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10), vector_int_t) {
-    int sum, product;
+  // Let 'v' be a vector of integer and initialize it.
+  M_LET( (v, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10), vector_int_t) {
+    int sum = 0, product = 0;
    
    // Compute the sum of theses integers.
+    // 'add' is a registered keyword, recognized by M*LIB to perform a sum.
    ALGO_REDUCE(sum, v, vector_int_t, add);

    // Compute the product of theses integers.
+    // 'mul' is a registered keyword, recognized by M*LIB to perform a product.
    ALGO_REDUCE(product, v, vector_int_t, mul);

-    /* Example of reduction with a transformation of the type from int to string_t */
-    ALGO_REDUCE( (s, string_t), v, vector_int_t, str_cat, str_ui);
+    /* Example of reduction with a transformation of the type from int to string_t
+       By default, the result ("s") should be of the same type as the base type
+       of the container. This is not the case here, we want to transform the
+       type. As such, we add the precision of the type 'string_t' to 's'.
+       The transformation from string to integer is done by string_set_si */
+    ALGO_REDUCE( (s, string_t), v, vector_int_t, str_cat, string_set_si);

    printf ("sum: %d\n"
            "product: %d\n"
@@ -0,0 +1,109 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+////////////////////////////////////////////////////////////
+
+static size_t allocated_size = 0;
+
+static void* my_alloc(size_t s)
+{
+    printf("Alloc called s=%lu!\n", s);
+    allocated_size += s;
+    return malloc(s);
+}
+
+static void my_free(void *ptr, size_t s)
+{
+    printf("Free called s=%lu!\n", s);
+    allocated_size -= s;
+    free(ptr);
+}
+
+////////////////////////////////////////////////////////////
+
+static void *last_alloc;
+
+static void* my_array_alloc(size_t s, void *org, size_t n)
+{
+    printf("Array Alloc called org=%p of n=%zu elements of size s=%lu!\n", org, n, s);
+    last_alloc = realloc(org, s*n);
+    return last_alloc;
+}
+
+static void my_array_free(void *ptr)
+{
+    printf("Array Free called ptr=%p last_alloc=%p!\n", ptr, last_alloc);
+    if (ptr != last_alloc) {
+        printf("Somthing went wrong.\n");
+        exit(4);
+    }
+    free(ptr);
+}
+
+////////////////////////////////////////////////////////////
+
+// Allocate for single object
+# define M_MEMORY_ALLOC(ctx, type) my_alloc (sizeof (type))
+# define M_MEMORY_DEL(ctx, ptr)    my_free(ptr, sizeof *ptr)
+
+// Allocate for array of objects
+# define M_MEMORY_REALLOC(ctx, type, ptr, o, n) my_array_alloc (sizeof (type), ptr, n)
+# define M_MEMORY_FREE(ctx, type, ptr, n)       my_array_free(ptr)
+
+#include "m-list.h"
+#include "m-array.h"
+
+////////////////////////////////////////////////////////////
+
+LIST_DEF(list_int, int)
+
+static void test_list(void)
+{
+    printf("List demo\n");
+
+    list_int_t list;
+    list_int_init(list);
+
+    list_int_push_back(list, 34);
+    list_int_push_back(list, 34);
+    
+    if (allocated_size == 0) {
+        printf("Nothing was allocated... Very strange...\n");
+        exit(1);
+    }
+    list_int_clear(list);
+
+    if (allocated_size != 0) {
+        printf("Nothing was freed (%lu)... Very strange...\n", allocated_size);
+        exit(2);
+    }
+    printf("Global custom allocator for list works!\n");
+}
+
+////////////////////////////////////////////////////////////
+
+ARRAY_DEF(array_int, int)
+
+static void test_array(void)
+{
+    printf("Array demo\n");
+
+    array_int_t array;
+    array_int_init(array);
+
+    array_int_push_back(array, 34);
+    array_int_push_back(array, 34);
+    
+    array_int_clear(array);
+
+    printf("Global custom allocator for array works!\n");
+}
+
+////////////////////////////////////////////////////////////
+
+int main(void)
+{
+    test_list();
+    test_array();
+    exit(0);
+}
@@ -0,0 +1,109 @@
+#include <stdio.h>
+#include <stdlib.h>
+
+#include "m-list.h"
+#include "m-array.h"
+
+////////////////////////////////////////////////////////////
+
+static size_t allocated_size = 0;
+
+static void* my_alloc(size_t s)
+{
+    printf("Alloc called s=%lu!\n", s);
+    allocated_size += s;
+    return malloc(s);
+}
+
+static void my_free(void *ptr, size_t s)
+{
+    printf("Free called s=%lu!\n", s);
+    allocated_size -= s;
+    free(ptr);
+}
+
+// Allocate for single object
+# define MY_MEMORY_ALLOC(ctx, type) my_alloc (sizeof (type))
+# define MY_MEMORY_DEL(ctx, ptr)    my_free(ptr, sizeof *ptr)
+
+////////////////////////////////////////////////////////////
+
+// Override only for this container the memory allocation function
+LIST_DEF(list_int, int, M_OPEXTEND(M_BASIC_OPLIST, NEW(MY_MEMORY_ALLOC), DEL(MY_MEMORY_DEL)))
+
+static void test_list(void)
+{
+    printf("List demo\n");
+
+    list_int_t list;
+    list_int_init(list);
+
+    list_int_push_back(list, 34);
+    list_int_push_back(list, 34);
+    
+    if (allocated_size == 0) {
+        printf("Nothing was allocated... Very strange...\n");
+        exit(1);
+    }
+    list_int_clear(list);
+
+    if (allocated_size != 0) {
+        printf("Nothing was freed (%lu)... Very strange...\n", allocated_size);
+        exit(2);
+    }
+    printf("Global custom allocator for list works!\n");
+}
+
+////////////////////////////////////////////////////////////
+
+static void *last_alloc;
+
+static void* my_array_alloc(size_t s, void *org, size_t n)
+{
+    printf("Array Alloc called org=%p of n=%zu elements of size s=%lu!\n", org, n, s);
+    last_alloc = realloc(org, s*n);
+    return last_alloc;
+}
+
+static void my_array_free(void *ptr)
+{
+    printf("Array Free called ptr=%p last_alloc=%p!\n", ptr, last_alloc);
+    if (ptr != last_alloc) {
+        printf("Somthing went wrong.\n");
+        exit(4);
+    }
+    free(ptr);
+}
+
+// Allocate for array of objects
+# define MY_MEMORY_REALLOC(ctx, type, ptr, o, n) my_array_alloc (sizeof (type), ptr, n)
+# define MY_MEMORY_FREE(ctx, type, ptr, n)       my_array_free(ptr)
+
+////////////////////////////////////////////////////////////
+
+// Override only for this container the memory allocation function
+ARRAY_DEF(array_int, int, M_OPEXTEND(M_BASIC_OPLIST, REALLOC(MY_MEMORY_REALLOC), FREE(MY_MEMORY_FREE)))
+
+static void test_array(void)
+{
+    printf("Array demo\n");
+
+    array_int_t array;
+    array_int_init(array);
+
+    array_int_push_back(array, 34);
+    array_int_push_back(array, 34);
+    
+    array_int_clear(array);
+
+    printf("Global custom allocator for array works!\n");
+}
+
+////////////////////////////////////////////////////////////
+
+int main(void)
+{
+    test_list();
+    test_array();
+    exit(0);
+}
@@ -24,7 +24,8 @@
 /* Generate prototypes and inline functions
   for basic types.
   For integer and floats, there is no need to specify
-   an oplist. M_DEFAULT_OPLIST will be used.
+   an oplist. M_BASIC_OPLIST will be used.
+   For bool, M_BOOL_OPLIST will be used.
 */
 ARRAY_DEF(r_bool, bool)

@@ -105,7 +106,7 @@ test_int(int n)
   But with an explicit oplist.
   This generates exactly the same code than r_int
 */
-ARRAY_DEF(r_int2, signed int, M_DEFAULT_OPLIST)
+ARRAY_DEF(r_int2, signed int, M_BASIC_OPLIST)

 static int
 test_int2(int n)
@@ -180,7 +181,7 @@ test_float(int n)


 /* Same with type double and an explicit oplist*/
-ARRAY_DEF(r_double, double, M_DEFAULT_OPLIST)
+ARRAY_DEF(r_double, double, M_BASIC_OPLIST)

 static int
 test_double(int n)
@@ -214,9 +215,9 @@ static char *my_strdup(const char *p)
  return d;
 }

-/* Same with type const char *, representing a contant string.
+/* Same with type const char *, representing a contant C string.
   We *** need *** an explicit oplist to tell M*LIB
-   to consider the type as a constant string.
+   to consider the type as a constant C string.
   The oplist to use is M_CSTR_OPLIST.
   We could have used M_PTR_OPLIST too,
   but in this case, we won't get proper string order or
@@ -231,7 +232,7 @@ test_cstring(int n)

  r_cstring_init(array);
  for(int i = 0; i < n; i++) {
-    char buffer[10];
+    char buffer[16];
    // Create a string from the integer
    sprintf(buffer, "%d", i);
    // We need to make an explicit copy of the string
@@ -245,13 +246,13 @@ test_cstring(int n)
  for(int i = 0; i < n; i++) {
    // Get back the string
    const char *p = *r_cstring_get(array, i);
-    // Convert it to integer
+    // Convert it to an integer
    int j = atoi(p);
    s += j;
  }

  // We also need a special unalloc pass
-  // to free all constant strings we have allocated.
+  // to free all constant strings we have allocated using my_strdup
  for(int i = 0; i < n; i++) {
    const char *p = *r_cstring_get(array, i);
    free((void*)(uintptr_t)p);
@@ -264,7 +265,7 @@ test_cstring(int n)



-/* Same with type string_t of M*LIB, representing a variable string.
+/* Same with type string_t of M*LIB, representing a dynamic string.
   We don't need explicit oplist to tell M*LIB!
   The oplist to use is STRING_OPLIST,
   but it has been registered globaly, so we don't need to explicit
@@ -282,7 +283,7 @@ test_string(int n)
  
  for(int i = 0; i < n; i++) {
    // create a string from an integer
-    string_printf(str, "%d", i);
+    string_set_si(str, i);
    // No need to make a copy in the container!
    r_string_push_back(array, str);
  }
@@ -294,7 +295,7 @@ test_string(int n)
    s += j;
  }

-  // No need to explicit dealloc !
+  // No need to explicit free each term of the array
  string_clear(str);
  r_string_clear(array);

@@ -304,7 +305,7 @@ test_string(int n)


 /* Same with type string_t of M*LIB, representing a variable string
-   and its explicit oplist. And said above, it generates exactly the
+   and its explicit oplist. As said above, it generates exactly the
   same code. */
 ARRAY_DEF(r_string2, string_t, STRING_OPLIST)

@@ -340,6 +341,9 @@ test_vintptr(int n)
  int s = 0;
  for(int i = 0; i < n; i++) {
    // Get the pointer to the integer.
+    // As the basic type of the container is a pointer,
+    // and r_vintptr_get return a pointer to the basic type
+    // we need to dereference its return value to get the pointer value.
    volatile unsigned *p = *r_vintptr_get(array, i);
    s += *p;
  }
@@ -374,6 +378,7 @@ test_rockme(int n)
  for(int i = 0; i < n; i++) {
    struct rock_me_out rock;
    rock.n = i*i - i;
+    rock.other = 0.0f;
    // Push the struct in the array
    r_rockme_push_back(array, rock);
  }
@@ -414,6 +419,7 @@ test_rockme2(int n)
  for(int i = 0; i < n; i++) {
    rock_me_in rock;
    rock->n = i*i - i;
+    rock->other = 0.0f;
    r_rockme2_push_back(array, rock);
  }

@@ -458,6 +464,7 @@ test_rockme2b(int n)
  for(int i = 0; i < n; i++) {
    rock_me_in rock;
    rock->n = i*i - i;
+    rock->other = 0.0f;
    r_rockme2b_push_back(array, rock);
  }

@@ -478,15 +485,18 @@ test_rockme2b(int n)
 /* Same with a structure type defined as a tuple.

   We first define a tuple. No need to specify the oplist as it uses basic C types
-   so M_DEFAULT_OPLIST is used.
+   so M_BASIC_OPLIST is used by default.

   Then we define the array, giving it the oplist definition of the tuple:
   the macro TUPLE_OPLIST is used to build it based on the tuple name,
   and the oplists of the tuple.
+
+   The main advantage of a tuple over a classic structure is that you get
+   free classic methods of your structure.
 */
 TUPLE_DEF2(rock_you, (n, int), (other, float))

-ARRAY_DEF(r_rockme3, rock_you_t, TUPLE_OPLIST(rock_you, M_DEFAULT_OPLIST, M_DEFAULT_OPLIST))
+ARRAY_DEF(r_rockme3, rock_you_t, TUPLE_OPLIST(rock_you, M_BASIC_OPLIST, M_BASIC_OPLIST))

 static int
 test_rockme3(int n)
@@ -520,7 +530,7 @@ test_rockme3(int n)
 /* Same with a structure type defined as a tuple using global registeration.

   We first define a tuple. No need to specify the oplist as it uses basic C types
-   so M_DEFAULT_OPLIST is used.
+   so M_BASIC_OPLIST is used.

   Then we register the oplist of rock_us_t by defining a macro based
   on M_OPL_ + type name + () which expands with the oplist of the type.
@@ -533,7 +543,7 @@ test_rockme3(int n)
 */
 TUPLE_DEF2(rock_us, (n, int), (other, float))

-#define M_OPL_rock_us_t() TUPLE_OPLIST(rock_us, M_DEFAULT_OPLIST, M_DEFAULT_OPLIST)
+#define M_OPL_rock_us_t() TUPLE_OPLIST(rock_us, M_BASIC_OPLIST, M_BASIC_OPLIST)

 ARRAY_DEF(r_rockme4, rock_us_t)

@@ -612,7 +622,7 @@ int main (int argc, const char *argv[])
  s = test_rockme3(n);
  printf ("S[rockme3] = %d\n", s);

-  s = test_rockme3(n);
+  s = test_rockme4(n);
  printf ("S[rockme4] = %d\n", s);

  exit(0);
@@ -13,8 +13,10 @@ ALGO_DEF(array_mpz, ARRAY_OPLIST(array_mpz, M_CLASSIC_OPLIST(mpz)))
 static inline void my_mpz_inc(mpz_t *d, const mpz_t a){
  mpz_add(*d, *d, a);
 }
-static inline void my_mpz_sqr(mpz_t *d, const mpz_t a){
+static inline bool my_mpz_sqr(mpz_t *d, const mpz_t a, void *data){
+  (void) data;
  mpz_mul(*d, a, a);
+  return true;
 }

 int main(void)
@@ -31,7 +33,7 @@ int main(void)
  }

  /* Compute z = sum (a[i]^2) */
-  array_mpz_map_reduce (&z, a, my_mpz_inc, my_mpz_sqr);
+  array_mpz_transform_reduce (&z, a, my_mpz_inc, my_mpz_sqr, NULL);
  gmp_printf ("Z=%Zd\n", z);

  array_mpz_clear(a);
@@ -96,6 +96,7 @@ static void data_node_clear(data_node *obj)
   and gives the minimum oplist allowing M*LIB to handle
   properly the object 'data_node' with the API convention
   to respect for calling the methods.
+   The Manual defines the different supported API.
 */
 ARRAY_DEF(/* the array prefix */ array_data_node,
 	  /* the object type */ data_node,
@@ -61,11 +61,11 @@ static void astar(array_point_t path, const string_t maze, int width)
        for (size_t i = 0; i < 8; i++) {
          point_emplace(next, current->x + deltas[i].x, current->y + deltas[i].y, 0);
          if (string_get_char(maze, point_index(next, width)) != '#') {
-            int *new_cost = cost_point_get(costs, current);
+            int new_cost  = *cost_point_get(costs, current);
            int *cost     = cost_point_get(costs, next);
-            if (cost == NULL || *new_cost < *cost) {
-              cost_point_set_at(costs, next, *new_cost);
-              next->priority = *new_cost + abs(goal->x - next->x) + abs(goal->y - next->y);
+            if (cost == NULL || new_cost < *cost) {
+              cost_point_set_at(costs, next, new_cost);
+              next->priority = new_cost + abs(goal->x - next->x) + abs(goal->y - next->y);
              prio_point_push(front, next);
              step_point_set_at(from, next, current);
            }
@@ -5,13 +5,13 @@
 // The number 5 is the number of elements in a node of the B+TREE
 BPTREE_DEF2(map_employee_id, 5, int, string_t)
 // Register the oplist of this map globally.
-#define M_OPL_map_employee_id_t() BPTREE_OPLIST2(map_employee_id, M_DEFAULT_OPLIST, STRING_OPLIST)
+#define M_OPL_map_employee_id_t() BPTREE_OPLIST2(map_employee_id, M_BASIC_OPLIST, STRING_OPLIST)

 // Define a map string -> int named map_employee_name
 // The number 5 is the number of elements in a node of the B+TREE
 BPTREE_DEF2(map_employee_name, 5, string_t, int)
 // Register the oplist of this map globally.
-#define M_OPL_map_employee_name_t() BPTREE_OPLIST2(map_employee_name, STRING_OPLIST, M_DEFAULT_OPLIST)
+#define M_OPL_map_employee_name_t() BPTREE_OPLIST2(map_employee_name, STRING_OPLIST, M_BASIC_OPLIST)

 int main(void)
 {
@@ -25,7 +25,9 @@ int main(void)
  map_employee_id_set_at(Employees, 11632, STRING_CTE("John Do"));
  map_employee_id_set_at(Employees, 852, STRING_CTE("Peter"));
  map_employee_id_set_at(Employees, 530, STRING_CTE("Amanda"));
-  map_employee_id_set_at(Employees, 4258, STRING_CTE("Elisabeth"));
+
+  // You can also emplace the structure
+  map_employee_id_emplace_val(Employees, 4258, "Elisabeth");

  printf("Number of employees: %zu\n", map_employee_id_size(Employees));

@@ -57,9 +59,12 @@ int main(void)
      }

    // Print
-    printf("\nElisabeth has id = %d\n", *map_employee_name_get(Employees_r, STRING_CTE("Elisabeth")));    
+    printf("\nElisabeth has id = %d\n", *map_employee_name_get(Employees_r, STRING_CTE("Elisabeth")));
+    // Print using emplace (we give a const char [] isntead of a const string_t, avoiding macro STRING_CTE)
+    printf("\nElisabeth has id = %d\n", *map_employee_name_get_emplace(Employees_r, "Elisabeth"));
  } /* Employees_r is cleared beyond this point */

+  // But employee is not since we don't use M_LET
  map_employee_id_clear(Employees);
  return 0;
 }
@@ -0,0 +1,55 @@
+#include <stdlib.h>
+
+#include "m-bptree.h"
+
+BPTREE_MULTI_DEF2(multimap, 5, int, M_BASIC_OPLIST, int, M_BASIC_OPLIST)
+#define M_OPL_map_multimap_t() BPTREE_OPLIST2(multimap, M_BASIC_OPLIST, M_BASIC_OPLIST)
+
+// Fill in with multiple value
+static void
+fill_in(multimap_t map)
+{
+    for(int i = 1 ; i < 100; i++)
+        multimap_set_at(map, i, i);
+    for(int i = 1 ; i < 100; i+=2)
+        multimap_set_at(map, i, i*i);
+    for(int i = 1 ; i < 100; i+=3)
+        multimap_set_at(map, i, i*i*i);
+}
+
+// Count the number of occurence of a key
+static int
+count(multimap_t map, int key)
+{
+    int n = 0;
+    multimap_it_t it;
+    // it_from is O(n*ln n) complexity
+    // it_while_p and next are O(1) complexity
+    for(multimap_it_from(it, map, key); multimap_it_while_p(it, key); multimap_next(it))
+        n++;
+    return n;    
+}
+
+// Print the map in details
+static void
+print(multimap_t map)
+{
+    for(int i = 0; i < 101;i++) {
+        printf("Key=%d Count=%d ", i, count(map, i));
+        multimap_it_t it;
+        for(multimap_it_from(it, map, i); multimap_it_while_p(it, i); multimap_next(it)) {
+            printf("Value=%d ", *multimap_ref(it)->value_ptr );
+        }
+        printf("\n");
+    }
+}
+
+int main(void)
+{
+    multimap_t map;
+    multimap_init(map);
+    fill_in(map);
+    print(map);
+    multimap_clear(map);
+    exit(0);
+}
@@ -1,8 +1,8 @@
 #include <stdio.h>

 #include "m-buffer.h"
-#include "m-shared.h"
-#include "m-mutex.h"
+#include "m-shared-ptr.h"
+#include "m-thread.h"

 /* Global variable to stop scheduling */
 atomic_bool             continue_threading_g;
@@ -99,8 +99,8 @@ SHARED_PTR_DEF(shared_bigdata, bigdata_t)
 * - we change the semantics of _push / _pop into buffer as push a new item and pop it as a move (ideal semantics for shared_ptr interface).
 */
 #define MY_QUEUE_SIZE 10
-BUFFER_DEF(buffer_bigdata, shared_bigdata_t, MY_QUEUE_SIZE,
-           BUFFER_QUEUE|BUFFER_PUSH_INIT_POP_MOVE, SHARED_PTR_OPLIST(shared_bigdata))
+BUFFER_DEF(buffer_bigdata, shared_bigdata_t *, MY_QUEUE_SIZE,
+           BUFFER_QUEUE|BUFFER_PUSH_INIT_POP_MOVE, SHARED_PTR_OPLIST(shared_bigdata, M_OPL_bigdata_t()))

 /* Let's build a Thread synchros tree:
 *
@@ -134,8 +134,7 @@ static void thread1 (void *arg)
 {
  (void) arg;
  while (atomic_load(&continue_threading_g)) {
-    shared_bigdata_t ptr;
-    shared_bigdata_init_new (ptr);
+    shared_bigdata_t *ptr = shared_bigdata_new ();
    perform_acquisition(*shared_bigdata_ref(ptr));
    buffer_bigdata_push(buf_t1tot2, ptr);
    buffer_bigdata_push(buf_t1tot3, ptr);
@@ -146,7 +145,7 @@ static void thread2 (void *arg)
 {
  (void) arg;
  while (atomic_load(&continue_threading_g)) {
-    shared_bigdata_t ptr;
+    shared_bigdata_t *ptr;
    buffer_bigdata_pop(&ptr, buf_t1tot2); // NOTE: Pop has been configured to init ptr
    perform_computation2(*shared_bigdata_ref(ptr));
    shared_bigdata_clear(ptr);
@@ -156,7 +155,7 @@ static void thread3 (void *arg)
 {
  (void) arg;
  while (atomic_load(&continue_threading_g)) {
-    shared_bigdata_t ptr;
+    shared_bigdata_t *ptr;
    buffer_bigdata_pop(&ptr, buf_t1tot3);  // NOTE: Pop has been configured to init ptr
    perform_computation3(*shared_bigdata_ref(ptr));
    buffer_bigdata_push(buf_t3tot4, ptr);
@@ -167,7 +166,7 @@ static void thread4 (void *arg)
 {
  (void) arg;
  while (atomic_load(&continue_threading_g)) {
-    shared_bigdata_t ptr;
+    shared_bigdata_t *ptr;
    buffer_bigdata_pop(&ptr, buf_t3tot4); // NOTE: Pop has been configured to init ptr
    perform_computation4(*shared_bigdata_ref(ptr));
    shared_bigdata_clear(ptr);
@@ -0,0 +1,160 @@
+#if HAVE_CURL
+
+#include <curl/curl.h>
+#include "m-dict.h"
+#include "m-tuple.h"
+#include "m-string.h"
+#include "m-list.h"
+#include "m-serial-json.h"
+
+/////////////////////////////////////////
+
+// Define container types
+// First a generic map string to string
+DICT_DEF2(map_str, string_t, string_t)
+#define M_OPL_map_str_t() DICT_OPLIST(map_str, STRING_OPLIST, STRING_OPLIST)
+  
+// This structure matches the JSON structure returns by the used WEB server
+// for the GET command.
+// It can be whatever you want provided it matches what is expected by the WEB server
+TUPLE_DEF2(web_data,
+           (args, map_str_t),
+           (headers, map_str_t),
+           (origin, string_t),
+           (url, string_t))
+#define M_OPL_web_data_t() TUPLE_OPLIST(web_data, M_OPL_map_str_t(), M_OPL_map_str_t(), STRING_T, STRING_T)
+
+/////////////////////////////////////////
+
+
+static size_t
+write_data(void *buffer, size_t size, size_t nmemb, void *userp)
+{
+  (void) size; // Parameter not used
+  char *src = buffer;
+  string_ptr str = userp;
+  for(size_t i = 0; i < nmemb; i++) {
+    string_push_back(str, src[i]);
+  }
+  return nmemb;
+}
+
+static bool get_data(web_data_t data, const char url[])
+{
+  m_serial_return_code_t r = M_SERIAL_FAIL;
+  CURLcode res;
+  string_t str;
+  CURL *handle = curl_easy_init();
+  if (handle) {
+      string_init(str);
+      // Perform an http GET request and fill in str with the JSON answer
+      curl_easy_setopt(handle, CURLOPT_URL, url);
+      curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, write_data);
+      curl_easy_setopt(handle, CURLOPT_WRITEDATA, str);
+      res = curl_easy_perform(handle);
+      curl_easy_cleanup(handle);
+      if (res == CURLE_OK) {
+        // Parse the string and fill in the object
+        m_serial_str_json_read_t serial;
+        m_serial_str_json_read_init(serial, string_get_cstr(str));
+        r = web_data_in_serial(data, serial);
+        m_serial_str_json_read_clear(serial);
+      }
+      string_clear(str);
+  }
+  return r == M_SERIAL_OK_DONE;
+}
+
+/////////////////////////////////////////
+
+static size_t
+ignore_data(void *buffer, size_t size, size_t nmemb, void *userp)
+{
+  (void) buffer; // Parameter not used
+  (void) size; // Parameter not used
+  (void) userp; // Parameter not used
+  return nmemb;
+}
+
+static bool post_data(web_data_t data, const char url[], bool display_answer)
+{
+  m_serial_return_code_t r = M_SERIAL_FAIL;
+  CURLcode res = 0;
+  string_t str;
+  CURL *handle = curl_easy_init();
+  if (handle) {
+    string_init(str);
+    // Get a JSON string
+    m_serial_str_json_write_t serial;
+    m_serial_str_json_write_init(serial, str);
+    r = web_data_out_serial(serial, data);
+    m_serial_str_json_write_clear(serial);
+    if (r == M_SERIAL_OK_DONE) {
+      // Post JSON string
+       struct curl_slist *headers=NULL;
+       headers = curl_slist_append(headers, "Content-Type: text/json");
+       if (headers != NULL) {
+         curl_easy_setopt(handle, CURLOPT_POSTFIELDS, string_get_cstr(str));
+         curl_easy_setopt(handle, CURLOPT_URL, url);
+         curl_easy_setopt(handle, CURLOPT_HTTPHEADER, headers);
+         if (display_answer == false) {
+           curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION, ignore_data);
+           curl_easy_setopt(handle, CURLOPT_WRITEDATA, NULL);
+         }
+         res = curl_easy_perform(handle);
+         curl_slist_free_all(headers);
+       }
+    }
+    curl_easy_cleanup(handle);
+    string_clear(str);
+  }
+  return (r == M_SERIAL_OK_DONE) && (res == CURLE_OK);
+}
+
+/////////////////////////////////////////
+
+// Remote server URL
+#define URL_GET "https://httpbin.org/get"
+#define URL_POST "https://httpbin.org/post"
+  
+int main(void)
+{
+  CURLcode ret = curl_global_init(CURL_GLOBAL_DEFAULT);
+  if (ret != CURLE_OK) abort();
+
+  web_data_t data;
+  web_data_init(data);
+
+  // Test http GET
+  bool b = get_data(data, URL_GET);
+  if (b) {
+    // We success receiving the JSON object and fill in the C object web_data with it.
+    // Let's display the object content:
+    printf("SUCCESS. Receive data =\n");
+    web_data_out_str(stdout, data);
+    printf("\n");
+  } else {
+    printf("ERROR: Cannot GET data or get data are not in expected format\n");
+  }
+
+  // Test http POST
+  web_data_emplace_origin(data, "This is the origin");
+  web_data_emplace_url(data, "This is the URL");
+  //web_data_set_origin(data, STRING_CTE("This is the origin"));
+  //web_data_set_url(data, STRING_CTE("This is the URL"));
+  b = post_data(data, URL_POST, false);
+  if (b) {
+    printf("SUCCESS: Post\n");
+  } else {
+    printf("ERROR post\n");
+  }
+
+  web_data_clear(data);
+
+  curl_global_cleanup();
+  return 0;
+}
+
+#else
+int main(void) { return 0; }
+#endif
@@ -1,5 +1,10 @@
 #include "m-core.h"

+/* This example show how to use the M_LET_IF macro
+   that enables to construct an object and continue
+   if the construction succeeds.
+*/
+
 // Stubs defined for the example. Real code will use soundio library.
 struct SoundIo { int x; };
 struct SoundIoDevice { int x; };
@@ -4,44 +4,45 @@
 #include "m-dict.h"
 #include "m-string.h"

-// Define a dictionnary of string --> int
+// Define a dictionary of string --> int
 // named 'dict_str'
-DICT_DEF2(dict_str, string_t, STRING_OPLIST, int, M_DEFAULT_OPLIST)
+DICT_DEF2(dict_str, string_t, STRING_OPLIST, int, M_BASIC_OPLIST)

 int main(void)
 {
-  // Declare the dictionnary 'h'
+  // Declare the dictionary 'h'
  dict_str_t h;
  int max = 1;
  // Declare the string 'key'
  string_t key;

-  // Initialize the dictionnary & the string
+  // Initialize the dictionary & the string
  dict_str_init(h);
  string_init (key);
  
  // While there is some data in the stream
-  while (!feof(stdin))
+  while (true)
    {
      // Read a complete line from the stream and fill in the string 'key'
      string_fgets (key, stdin, STRING_READ_PURE_LINE);
-      // If the 'key' exists in the dictionnary
+      if (feof(stdin)) break;
+      // If the 'key' exists in the dictionary
      int *v = dict_str_get (h, key);
      if (v != NULL) {
-        // Increment the counter in the dictionnary
+        // Increment the counter in the dictionary
        (*v)++;
        max = M_MAX(*v, max);
      } else {
-        // Update the dictionnary with h[key] = 1
+        // Update the dictionary with h[key] = 1
        dict_str_set_at(h, key, 1);
      }
    }
-  printf ("Max occurence = %d\n", max);
+  printf ("Max occurrence = %d\n", max);

-  // Iterate on the dictionnary
+  // Iterate on the dictionary
  dict_str_it_t it;
  for(dict_str_it(it, h); !dict_str_end_p(it); dict_str_next(it)) {
-    // Get a constant reference on the pair stored in the dictionnary
+    // Get a constant reference on the pair stored in the dictionary
    const struct dict_str_pair_s *pair = dict_str_cref(it);
    printf ("Key=%s Value=%d\n",
            string_get_cstr(pair->key), pair->value);
@@ -1,10 +1,10 @@
 #include "m-dict.h"

 // Let's define a dictionary of 'unsigned int' --> 'char
-DICT_DEF2(dict_m32, unsigned int, M_DEFAULT_OPLIST, char, M_DEFAULT_OPLIST)
+DICT_DEF2(dict_m32, unsigned int, M_BASIC_OPLIST, char, M_BASIC_OPLIST)

 // Let's create a synonym for its oplist.
-#define M32_OPLIST DICT_OPLIST(dict_m32, M_DEFAULT_OPLIST, M_DEFAULT_OPLIST)
+#define M32_OPLIST DICT_OPLIST(dict_m32, M_BASIC_OPLIST, M_BASIC_OPLIST)

 #if 1 // Non macro version.

@@ -14,7 +14,7 @@ int main(void) {
  dict_m32_set_at (h, 5, 10);               // h[5] = 10
  char *k = dict_m32_get(h, 10);            // No 10 in h, so k == NULL
  int is_missing = (k != NULL);             // true
-  assert (is_missing);
+  assert (is_missing); (void) is_missing;
  dict_m32_erase(h, 5);                    // h is now empty
  dict_m32_it_t it;                         // iterate over all dictionnary
  for (dict_m32_it (it, h) ; !dict_m32_end_p (it); dict_m32_next(it)) {
@@ -0,0 +1,56 @@
+#include <stdio.h>
+#include "m-dict.h"
+
+/*
+ * Provide OOR methods for OA Hashmap.
+ * See documentation for definition of OOR
+ * OOR values are represented as: 
+ * empty (0) is INT_MIN
+ * deleted (1) is INT_MIN + 1
+ * So valid range for integers are [INT_MIN+2, INT_MAX]
+ */
+static inline bool oor_equal_p(int k, char n)
+{
+  return k == INT_MIN + n;
+}
+
+static inline int  oor_set(char n)
+{
+  return INT_MIN + n;
+}
+
+/*
+ * Provide a custom hash function (optional for OA)
+ */
+static inline size_t hash(int n)
+{
+  return (size_t) n; // Identity hash!
+}
+
+/* Define an OA dictionnay which performs a hashmap between an int to an int */
+DICT_OA_DEF2(dict_oa,
+	     int, M_OPEXTEND(M_BASIC_OPLIST, OOR_EQUAL(oor_equal_p), OOR_SET(API_4(oor_set)), HASH(hash)),
+	     int, M_BASIC_OPLIST)
+
+int main(void)
+{
+  dict_oa_t d;
+  dict_oa_init(d);
+
+  for(int i = 0; i < 10; i++) {
+    dict_oa_set_at(d, i*i, 4*i);
+  }
+  dict_oa_set_at(d, 3, -17);
+  
+  printf("DICT[3] = %d\n", *dict_oa_get(d, 3));
+
+  dict_oa_it_t it;
+  printf("DICT=");
+  for(dict_oa_it(it, d); !dict_oa_end_p(it); dict_oa_next(it)) {
+    printf("%d:%d, ", dict_oa_cref(it)->key, dict_oa_cref(it)->value);
+  }
+  printf("\n");
+  
+  dict_oa_clear(d);
+  return 0;
+}
@@ -0,0 +1,64 @@
+#include <stdio.h>
+#include "m-dict.h"
+
+/*
+ * Provide OOR methods for OA Hashmap.
+ * See documentation for definition of OOR
+ * OOR values are represented as: 
+ * empty (0) is "EMPTY"
+ * deleted (1) is "DELETED"
+ */
+static const char empty_str[] = "EMPTY";
+static const char deleted_str[] = "DELETED";
+static const char *const oor_table[] = { empty_str, deleted_str };
+
+static inline bool oor_equal_p(const char *k, int n)
+{
+  return k == oor_table[n];
+}
+
+static inline const char *oor_set(int n)
+{
+  return oor_table[n];
+}
+
+/*
+ * Provide a custom hash function (optional for OA)
+ */
+static inline size_t hash(const char *k)
+{
+  size_t r = 17;
+  while (*k) {
+    r = *k * 33 + r;
+    k++;
+  }
+  return r;
+}
+
+/* Define an OA dictionnay which performs a hashmap between a CSTR to an int */
+DICT_OA_DEF2(dict_oa,
+	     const char *, M_OPEXTEND(M_CSTR_OPLIST, OOR_EQUAL(oor_equal_p), OOR_SET(API_4(oor_set)), HASH(hash)),
+	     int, M_BASIC_OPLIST)
+
+int main(void)
+{
+  dict_oa_t d;
+  dict_oa_init(d);
+
+  dict_oa_set_at(d, "THIS", -17);
+  dict_oa_set_at(d, "IS", -170);
+  dict_oa_set_at(d, "AN", 7);
+  dict_oa_set_at(d, "EXAMPLE", 77);
+  
+  printf("DICT[\"AN\"] = %d\n", *dict_oa_get(d, "AN"));
+
+  dict_oa_it_t it;
+  printf("DICT=");
+  for(dict_oa_it(it, d); !dict_oa_end_p(it); dict_oa_next(it)) {
+    printf("%s:%d, ", dict_oa_cref(it)->key, dict_oa_cref(it)->value);
+  }
+  printf("\n");
+  
+  dict_oa_clear(d);
+  return 0;
+}
@@ -0,0 +1,56 @@
+#include "m-i-list.h"
+
+typedef struct data_s {
+    M_ILIST_INTERFACE(list1, struct data_s);
+    char *ptr;
+    int  n;
+} data_t;
+
+static void
+data_init(data_t *p)
+{
+    M_ILIST_INIT_FIELD(list1, *p);
+    p->ptr = malloc(100);
+    p->n = 100;
+}
+
+static void
+data_clear(data_t *p)
+{
+    free(p->ptr);
+    p->n = 0;
+}
+
+static void
+data_init_set(data_t *p, data_t s)
+{
+    p->ptr = malloc(s.n);
+    p->n = s.n;
+    memcpy(p->ptr, s.ptr, s.n);
+}
+
+#define DATA_OP (INIT(API_2(data_init)), INIT_SET(API_2(data_init_set)), CLEAR(API_2(data_clear)) )
+
+M_ILIST_DEF(list1, data_t, DATA_OP)
+
+data_t pool[100];
+
+int main(void)
+{
+    list1_t l;
+
+    list1_init(l);
+    data_init(&pool[0]);
+    list1_push_back(l, &pool[0]);
+    data_init(&pool[1]);
+    list1_push_back(l, &pool[1]);
+
+    list1_it_t it;
+    list1_it(it, l);
+    data_init(&pool[2]);
+    list1_insert(l, it, &pool[2]);
+
+    list1_clear(l);
+
+    exit(0);
+}
@@ -8,43 +8,54 @@
 #include "m-string.h"
 #include "m-algo.h"

-// Let's create a list of string.
+// Let's create a list of string by using the M*LIB dynamic string 'string_t'
+// The prefix used for generating functions will be 'list_string'
 LIST_DEF(list_string, string_t)

-// Let's register the oplist globally so that other m*lib macros
+// Let's register the oplist globally so that other M*LIB macros
 // can get the oplist without us giving it explictly to them.
+// An oplist is the association of operators to the provided methods
+// so that generic code can use correctly an object of such type.
+// LIST_OPLIST is a macro used to generate the oplist associated to the
+// list itself. It needs the prefix used for generating the list (aka list_string here)
+// and the oplist of the item in the list (aka the string oplist)
 #define M_OPL_list_string_t() LIST_OPLIST(list_string, STRING_OPLIST)

 // Let's define some basic algorithms over this list of string.
-ALGO_DEF(astring, M_OPL_list_string_t())
+// We reuse the prefix of the list to simplify usage, but algorithms can use separate namespace.
+ALGO_DEF(list_string, M_OPL_list_string_t())

 int main(void)
 {
-  // Let's create a variable named 'grow' which is a list of string_t
+  // Let's create a variable named 'list' which is a list of string_t
  // This variable is only defined within the associated '{' '}' block.
  // The constructor/destructor of the variable will be called within this block
  // You can also define the variable (list_string_t) and use explicitly
  // its constructor (list_string_init) / destructor (list_string_clear).
-  M_LET (grow, list_string_t)
+  M_LET (list, list_string_t)
    M_LET (tmpstr, string_t) { // And let's create also a string_t

-    // add string elements to the list
-    list_string_push_back (grow, STRING_CTE("AB"));
+    // add string elements to the list in different ways
+    // First is pushing a const string.
+    // The macro STRING_CTE creates a const string_t based on the given const char * string.
+    list_string_push_back (list, STRING_CTE("AB"));
+    // Second is creating a separate string_t and then pushing it in the list
    string_printf(tmpstr, "%d", 12);
-    list_string_push_back (grow, tmpstr);
-    list_string_push_back (grow, STRING_CTE("CD"));
+    list_string_push_back (list, tmpstr);
+    // Third is to emplace directly in the list by constructing a new string_t based on the given const char * 
+    list_string_emplace_back (list, "CD");

    // Serialize the list of string into a big string.
-    list_string_get_str (tmpstr, grow, false);
+    list_string_get_str (tmpstr, list, false);

-    // print out
-    printf("Number of elements = %zu\n", list_string_size(grow));
+    // print it
+    printf("Number of elements = %zu\n", list_string_size(list));
    printf("Final string = %s\n", string_get_cstr(tmpstr));

    // Let's iterate over each element of the list
    // using the macro for iteration over a container.
-    printf ("Using macro EACH :\n");
-    for M_EACH (item, grow, list_string_t) {
+    printf ("Using macro EACH:\n");
+    for M_EACH (item, list, list_string_t) {
        printf ("Item = ");
        string_fputs (stdout, *item);
        printf ("\n");
@@ -52,34 +63,59 @@ int main(void)

    // You can also use classic iterator:
    list_string_it_t it;
-    printf ("Using iterators :\n");
-    for(list_string_it(it, grow) ; !list_string_end_p(it) ; list_string_next(it)) {
+    printf ("Using iterators:\n");
+    for(list_string_it(it, list) ; !list_string_end_p(it) ; list_string_next(it)) {
      const string_t *item = list_string_cref (it);
      printf ("Item = ");
      string_fputs (stdout, *item);
      printf ("\n");
    }

+#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L)
+    // Another way: we map each element to the M_PRINT function.
+    printf ("Using macro ALGO_FOR_EACH:");
+    ALGO_FOR_EACH(list, list_string_t, M_PRINT, "\nItem = ");
+    printf ("\n");
+#endif
+
    // Get the min and the max of the list
-    string_t *p = astring_min(grow);
+    string_t *p = list_string_min(list);
    printf ("Min string is %s\n", string_get_cstr(*p));
-    p = astring_max(grow);
+    p = list_string_max(list);
    printf ("Max string is %s\n", string_get_cstr(*p));

    // We can even sort the list.
-    astring_sort(grow);
-    for M_EACH (item, grow, list_string_t) {
+    list_string_sort(list);
+    for M_EACH (item, list, list_string_t) {
        printf ("Sort Item = %s\n", string_get_cstr(*item) );
      }
    
    // Split a string into a list.
    string_set_str(tmpstr, "HELLO;JOHN;HOW;ARE;YOU");
-    astring_split(grow, tmpstr, ';');
-    for M_EACH (item, grow, list_string_t) {
+    list_string_split(list, tmpstr, ';');
+    // Iterate over the splitted list
+    for M_EACH (item, list, list_string_t) {
        printf ("Split Item = %s\n", string_get_cstr(*item) );
      }
    
  } // Everything is cleared after this point.
+
+  // Let's create another list of string and init it.
+  list_string_t list;
+  list_string_init(list);
+  // Let's put some elements in it:
+  list_string_emplace_back (list, "A");
+  list_string_emplace_back (list, "B");
+  list_string_emplace_back (list, "C");
+  list_string_emplace_back (list, "D");
+  // Reverse it
+  list_string_reverse(list);
+  // Let's display the string by serializing the elements of the list:
+  printf ("List of string = ");
+  list_string_out_str(stdout, list);
+  printf ("\n");
+  // Don't forget to clear the list before leaving
+  list_string_clear(list);
  
  return 0;
 }
@@ -25,8 +25,8 @@
 /* Define the needed data structure : */

 // Define a dictionnary of constant string --> integer and register it.
-DICT_DEF2(dict_mph, const char *, M_CSTR_OPLIST, uint32_t, M_DEFAULT_OPLIST)
-#define M_OPL_dict_mph_t() DICT_OPLIST(dict_mph, M_CSTR_OPLIST, M_DEFAULT_OPLIST)
+DICT_DEF2(dict_mph, const char *, M_CSTR_OPLIST, uint32_t, M_BASIC_OPLIST)
+#define M_OPL_dict_mph_t() DICT_OPLIST(dict_mph, M_CSTR_OPLIST, M_BASIC_OPLIST)

 // Define an array of integer to store the value and register it.
 ARRAY_DEF(array_value, uint32_t) // Start from 1. 0 is 'None'
@@ -208,11 +208,14 @@ dict_read_from_file(dict_mph_t dict, array_string_t arr, const char filename[])
        // Not clean as items of 'dict' points are linked to items of 'arr'
        // and the containers are not aware of this link.
        array_string_push_back (arr, str);
-        dict_mph_set_at(dict, string_get_cstr(*array_string_back(arr)), line);
-        line++;
      }
    }
  }
+  // Now 'arr' won't change anymore and we can get reliable pointers from it.
+  for M_EACH(item, arr, array_string_t) {
+      dict_mph_set_at(dict, string_get_cstr(*item), line);
+      line++;
+  }
  fclose(f);
 }

@@ -1,70 +0,0 @@
-#if HAVE_GMP
-
-#include <stdio.h>
-#include <gmp.h>
-
-#include "m-variant.h"
-#include "m-string.h"
-#include "m-dict.h"
-#include "m-array.h"
-
-/* Define a variant over two integers named integer_t
-   Notice than mpz_t has special init & clear functions
-   mpz_init & mpz_clear.
-   This is handle by the library.
-*/
-VARIANT_DEF2(my_integer,
-             (n, long long, M_DEFAULT_OPLIST),
-             (z, mpz_t, M_CLASSIC_OPLIST(mpz)))
-/* Define the oplist associated to this variant */
-#define MY_INTEGER_OPLIST VARIANT_OPLIST(my_integer, M_DEFAULT_OPLIST, M_CLASSIC_OPLIST(mpz))
-
-/* Define a dictionary of string --> integer named dict_my_t */
-DICT_DEF2(my_dict,
-          string_t, STRING_OPLIST,
-          my_integer_t, MY_INTEGER_OPLIST)
-/* Define the oplist associated to this dictionary */
-#define MY_DICT_OPLIST DICT_OPLIST(my_dict, STRING_OPLIST, MY_INTEGER_OPLIST)
-
-/* Define an array of such dictionary named array_my_t */
-ARRAY_DEF(my_array, my_dict_t, MY_DICT_OPLIST)
-/* Define the oplist associated to this array of dictionary of variant */
-#define MY_ARRAY_OPLIST ARRAY_OPLIST(my_array, MY_DICT_OPLIST)
-
-int main(void)
-{
-  M_LET(z, MY_INTEGER_OPLIST)         /* Define & init & clear an instance of a variant of integer */
-    M_LET(dict, MY_DICT_OPLIST)       /* Define & init & clear an instance of a dictionary of variant */
-    M_LET(array, MY_ARRAY_OPLIST)     /* Define & init & clear an intance of an array of dictionary of variant */
-    M_LET(gmp, M_CLASSIC_OPLIST(mpz)) /* M_LET allows even with non container type */
-    {
-      my_integer_set_n (z, 17LL);                // Set z as the long long 17
-      my_dict_set_at(dict, STRING_CTE("n1"), z); // Push it in the dictionary
-      mpz_set_str(gmp, "25446846874687468746874687468746874686874", 10); // Set gmp to a very long integer.
-      my_integer_set_z (z, gmp);                 // Set z as the mpz_t variable
-      my_dict_set_at(dict, STRING_CTE("n2"), z); // Push it in the dictionary
-      my_array_push_back (array, dict);          // Push the dictionary in the array
-
-      // Iterate over the array container
-      for M_EACH(item, array, MY_ARRAY_OPLIST) {
-          // Iterate over the dictionary container
-          for M_EACH(p, *item, MY_DICT_OPLIST) {
-              // Dictionary iterator are pair (key,value)
-              if (my_integer_n_p(p->value)) {
-                printf ("It is a long long, value = %lld\n",
-                        *my_integer_cget_n(p->value));
-              }
-              if (my_integer_z_p(p->value)) {
-                printf ("It is a mpz_t, value =");
-                mpz_out_str(stdout, 10, *my_integer_cget_z(p->value));
-                printf("\n");
-              }
-            }
-        }
-    } /* All variables are automatically cleared beyond this point */
-}
-
-#else
-// Nothing to do
-int main(void) { return 0; }
-#endif
@@ -84,8 +84,8 @@ DICT_DEF2(dict_json, string_t, STRING_OPLIST, json_t, JSON_OPLIST)
 ARRAY_DEF(array_json, json_t, JSON_OPLIST)

 VARIANT_DEF2(variant_json,
-             (boolean, bool, M_OPEXTEND(M_DEFAULT_OPLIST, OUT_STR(boolean_out_str), IN_STR(boolean_in_str M_IPTR)) ),
-             (real, float, M_OPEXTEND (M_DEFAULT_OPLIST, OUT_STR(real_out_str), IN_STR(real_in_str M_IPTR))),
+             (boolean, bool, M_OPEXTEND(M_BASIC_OPLIST, OUT_STR(boolean_out_str), IN_STR(boolean_in_str M_IPTR)) ),
+             (real, float, M_OPEXTEND (M_BASIC_OPLIST, OUT_STR(real_out_str), IN_STR(real_in_str M_IPTR))),
             (array, array_json_t, ARRAY_OPLIST(array_json, JSON_OPLIST)), 
             (dict, dict_json_t, DICT_OPLIST(dict_json, STRING_OPLIST, JSON_OPLIST)))

@@ -10,7 +10,7 @@
   order to show/test the good chaining of the structures */

 TUPLE_DEF2(symbol, (type, int), (name, string_t))
-#define M_OPL_symbol_t() TUPLE_OPLIST(symbol, M_DEFAULT_OPLIST, STRING_OPLIST)
+#define M_OPL_symbol_t() TUPLE_OPLIST(symbol, M_BASIC_OPLIST, STRING_OPLIST)

 ARRAY_DEF(symbol_list, symbol_t)
 #define M_OPL_symbol_list_t() ARRAY_OPLIST(symbol_list, M_OPL_symbol_t())
@@ -19,13 +19,13 @@ TUPLE_DEF2(record, (fields, symbol_list_t))
 #define M_OPL_record_t() TUPLE_OPLIST(record, M_OPL_symbol_list_t())

 TUPLE_DEF2(my_tuple, (name, string_t), (value, int))
-#define M_OPL_my_tuple_t() TUPLE_OPLIST(my_tuple)
+#define M_OPL_my_tuple_t() TUPLE_OPLIST(my_tuple, STRING_OPLIST, M_BASIC_OPLIST)

 ARRAY_DEF(my_list_of_tuple, my_tuple_t)
 #define M_OPL_my_list_of_tuple_t() ARRAY_OPLIST(my_list_of_tuple)

 TUPLE_DEF2(my_tuple_of_tuple, (name, string_t), (inner_tuple, my_tuple_t))
-#define M_OPL_my_tuple_of_tuple_t() TUPLE_OPLIST(my_tuple_of_tuple)
+#define M_OPL_my_tuple_of_tuple_t() TUPLE_OPLIST(my_tuple_of_tuple, STRING_OPLIST, M_OPL_my_tuple_t() )

 LIST_DEF(list_of_tuple_of_tuple, my_tuple_of_tuple_t)
 #define M_OPL_list_of_tuple_of_tuple_t() LIST_OPLIST(list_of_tuple_of_tuple, M_OPL_my_tuple_of_tuple_t() )
@@ -37,11 +37,11 @@ BUFFER_DEF(trbuff, my_triple_tuple_t, 100, BUFFER_QUEUE)
 #define M_OPL_trbuff_t() BUFFER_OPLIST(trbuff, M_OPL_my_triple_tuple_t())

 TUPLE_DEF2(my_junction, (active, bool), (buffer, trbuff_t))
-#define M_OPL_my_junction_t() TUPLE_OPLIST(my_junction, M_DEFAULT_OPLIST, M_OPL_trbuff_t())
+#define M_OPL_my_junction_t() TUPLE_OPLIST(my_junction, M_BASIC_OPLIST, M_OPL_trbuff_t())
           
 TUPLE_DEF2(mlib_point, (x, int), (y, int))
 #define M_OPL_mlib_point_t()                                            \
-  TUPLE_OPLIST(mlib_point, M_DEFAULT_OPLIST, M_DEFAULT_OPLIST)
+  TUPLE_OPLIST(mlib_point, M_BASIC_OPLIST, M_BASIC_OPLIST)

 TUPLE_DEF2(mlib_points, (first_ref, mlib_point_ptr, M_PTR_OPLIST),
           (second_ref, mlib_point_ptr, M_PTR_OPLIST),
@@ -3,7 +3,14 @@
 #include "m-array.h"
 #include "m-string.h"

-// Let's create an array of string_t and register it globaly
+/* This example show ARRAY_DEF usage with string,
+   M_LET macro usage with complex initialization condition:
+   how to initialize a dynamic array and initialize it with the given arguments.
+   It show also the M_EACH keywork
+*/
+
+// Let's create a dynamic array of string_t and register it globaly
+// a so called std::vector<std::string> in C++
 ARRAY_DEF(vector_string, string_t)
 #define M_OPL_vector_string_t() ARRAY_OPLIST(vector_string, STRING_OPLIST)

@@ -0,0 +1,16 @@
+/*
+ * Micro example to test if M*LIB supports not using stdio.h
+ */
+#define M_USE_STDIO 0
+#define M_RAISE_FATAL(...) abort()
+#include "m-array.h"
+
+ARRAY_DEF(arr, int)
+
+int main(void) {
+    arr_t a;
+    arr_init(a);
+    arr_push_back(a, 4);
+    arr_clear(a);
+    return 0;
+}
@@ -5,8 +5,7 @@
 #include "m-rbtree.h"

 // Let's define one utility function.
-void *xmalloc(size_t n);
-void *xmalloc(size_t n)
+static void *xmalloc(size_t n)
 {
  void *p = malloc (n);
  if (!p) abort();
@@ -5,7 +5,7 @@

 /* Definition of an associative map string_t --> size_t */
 DICT_DEF2(dict_str, string_t, size_t)
-#define M_OPL_dict_str_t() DICT_OPLIST(dict_str, STRING_OPLIST, M_DEFAULT_OPLIST)
+#define M_OPL_dict_str_t() DICT_OPLIST(dict_str, STRING_OPLIST, M_BASIC_OPLIST)

 /* Definition of an array of string_t */
 ARRAY_DEF(vector_str, string_t)
@@ -26,13 +26,14 @@ int main(void)

        // Count the words.
        M_LET(map, dict_str_t) {
-            // Count the words:
+            // Count the words into the dictionnary 'map'
            for M_EACH(w, words, vector_str_t) {
                (*dict_str_safe_get(map, *w)) ++;
            }

            // Print the count:
            for M_EACH(p, map, dict_str_t) {
+                // In C11 version we can use the M_PRINT macro that simplifies formatting.
 #if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L)            
                M_PRINT(p->value, " occurences of ", p->key, "\n");
 #else
@@ -0,0 +1,39 @@
+#include <stdio.h>
+#include "m-tree.h"
+
+TREE_DEF(tree, int)
+
+// Compute sum of the tree using iterator and a pre-order walk
+static int tree_sum_iter(tree_t t)
+{
+  int s = 0;
+  for(tree_it_t it = tree_it(t); !tree_end_p(it); tree_next(&it)) {
+    s += *tree_cref(it);
+  }
+  return s;
+}
+
+// Compute sum of the tree using recursive call
+static int tree_sum_recur(tree_it_t it)
+{
+  if (tree_end_p(it))
+    return 0;
+  if (tree_leaf_p(it))
+    return *tree_cref(it);
+  assert( tree_degree(it) == 2);
+  return *tree_cref(it) + tree_sum_recur(tree_down(it)) + tree_sum_recur(tree_right(tree_down(it)));
+}
+
+int main(void)
+{
+  tree_t t;
+  tree_init(t);
+  tree_it_t r = tree_set_root(t, 1);
+  tree_it_t l = tree_insert_child(r, 2);
+  tree_insert_child(r, 5);
+  tree_insert_child(l, 3);
+  tree_insert_child(l, 4);
+  printf("sum = %d vs %d\n", tree_sum_iter(t), tree_sum_recur(tree_it(t)));
+  tree_clear(t);
+  return 0;
+}
@@ -0,0 +1,71 @@
+#include "m-try.h"
+#include "m-array.h"
+
+// Define & register an array of int
+ARRAY_DEF(array, int)
+#define M_OPL_array_t() ARRAY_OPLIST(array, M_BASIC_OPLIST)
+
+// This shall be defined once per program to define the global variables needed
+// to handle the exceptions.
+M_TRY_DEF_ONCE()
+
+static void f(void)
+{
+    M_TRY(f_exception) {
+        // Let's define a variable and do stuff:
+        // Using M_LET allows the register of destructors for the exception handler.
+        M_LET(a, array_t) {
+            array_push_back(a, 5);
+            array_push_back(a, 4);
+            array_push_back(a, 3);
+            array_push_back(a, 2);
+            array_push_back(a, 1);
+            // Throw a M_ERROR_MEMORY exception
+            M_THROW(M_ERROR_MEMORY);
+            printf("This should never be printed!\n");
+        }
+    } M_CATCH(f_exception, M_ERROR_MEMORY) {
+        // Exception handler than catches the M_ERROR_MEMORY errors.
+        // Here the destructor of variable a has been called to free memory
+        printf("Memory exception %d received in f function, thrown by %s:%d\n",
+                f_exception->error_code, f_exception->filename, f_exception->line);
+    }
+}
+
+static void g(void)
+{
+    M_TRY(f_exception) {
+        // Let's define a variable and do stuff:
+        // Using M_LET allows the register of destructors for the exception handler.
+        M_LET(a, array_t) {
+            array_push_back(a, 5);
+            array_push_back(a, 4);
+            array_push_back(a, 3);
+            array_push_back(a, 2);
+            array_push_back(a, 1);
+            // Throw an unkown exception
+            M_THROW(42);
+            printf("This should never be printed!\n");
+        }
+    } M_CATCH(f_exception, M_ERROR_MEMORY) {
+        printf("Memory exception %d received in f function, thrown by %s:%d\n",
+                f_exception->error_code, f_exception->filename, f_exception->line);
+        printf("This should never be printed!\n");
+    }
+}
+
+int main(void)
+{
+    // Let's do a global exception handler
+    M_TRY(main_exception) {
+        f();
+        g();
+    } M_CATCH(main_exception, 0) {
+        // Exception handler than catches all errors.
+        // Here the destructor of variable a has been called to free memory
+        printf("Exception %d received in main function, thrown by %s:%d\n",
+                main_exception->error_code, main_exception->filename, main_exception->line);
+    }
+    printf("You should run it under valgrind to check that all memory allocations are freed.\n");
+    exit(0);
+}
@@ -11,7 +11,7 @@ TUPLE_DEF2(employee,
           (age, int),
           (idnum, int))
 /* Register globaly the employee_t oplist */
-#define M_OPL_employee_t() TUPLE_OPLIST(employee, STRING_OPLIST, M_DEFAULT_OPLIST, M_DEFAULT_OPLIST)
+#define M_OPL_employee_t() TUPLE_OPLIST(employee, STRING_OPLIST, M_BASIC_OPLIST, M_BASIC_OPLIST)

 /* Define an array of employee, register the oplist and define further algorithms on it */
 ARRAY_DEF(vector_employee, employee_t)
@@ -0,0 +1,69 @@
+#include <stdio.h>
+#include "m-array.h"
+#include "m-algo.h"
+#include "m-string.h"
+
+ARRAY_DEF(array_int, int)
+#define M_OPL_array_int_t() ARRAY_OPLIST(array_int, M_BASIC_OPLIST)
+ALGO_DEF(array_int, array_int_t)
+
+static bool callback1(int *out, int in, void *data)
+{
+  int *cpt = data;
+  bool ret = true;
+  if (*cpt == -1 && in == 11)
+    *cpt = 0;                               // Start when first reach 11
+  ret &= (*cpt >= 0);                       // Skip initial numbers unequal 11
+  ret &= (in % 2 != 0);                     // Collect odd numbers
+  (*cpt) += ret;
+  ret &= (*cpt <= 5);                      //  Only take five numbers
+  *out = in * in;                           // Square each number
+  return ret;
+}
+
+static void callback_add_int(int *out, int in)
+{
+  *out += in;
+}
+
+static void demo(void)
+{
+  M_LET( (t, M_SEQ(0, 30)), vector, array_int_t) {
+    printf("t=");  array_int_out_str(stdout, t);
+    int b = -1;
+    array_int_transform(vector, t, callback1, &b);
+    printf("\nvector=");  array_int_out_str(stdout, vector); printf("\n");
+    array_int_reduce(&b, vector, callback_add_int);
+    printf("Sum=%d\n", b);
+  }
+}
+
+ARRAY_DEF(array_str, string_t)
+#define M_OPL_array_str_t() ARRAY_OPLIST(array_str, M_STRING_OPLIST)
+ALGO_DEF(array_str, array_str_t)
+
+static bool callback2(string_t *out, const string_t in, void *data)
+{
+  char *cp = data, c = *cp;
+  if (string_search_char(in, c) == M_STRING_FAILURE)
+    return false;
+  string_set(*out, in);
+  return true;
+}
+
+static void demo_split(void)
+{
+  M_LET( (s, ("This is a sentence in C11.")), string_t)
+    M_LET(words, f_words, array_str_t) {
+    array_str_split(words, s, ' ');
+    array_str_transform(f_words, words, callback2, &(char){'i'});
+    printf("f_words="); array_str_out_str(stdout, f_words); printf("\n");
+  }
+}
+
+int main(void)
+{
+  demo();
+  demo_split();
+  return 0;
+}
@@ -0,0 +1,232 @@
+#include <stdio.h>
+#include <dirent.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+#include "m-tuple.h"
+#include "m-tree.h"
+#include "m-worker.h"
+#include "m-string.h"
+#include "m-atomic.h"
+
+
+/* Define the comparison function for atomic_uint type
+   to sort the atomic unsigned int with the biggest value first. */
+static inline int atomic_uint_cmp(const atomic_uint *a, const atomic_uint *b)
+{
+  unsigned ai = atomic_load(a), bi = atomic_load(b);
+  return ai > bi ? -1 : ai < bi;
+}
+
+/* Define the oplist for atomic_uint and register it globally.
+   This oplist extends the basic oplist by:
+   * disabling HASH for atomic as the default hash method won't work.
+   * providing the methods for CMP, INIT_SET and SET operators (with their API adaptator) */
+#define M_OPL_atomic_uint() M_OPEXTEND(M_BASIC_OPLIST, HASH(0), CMP(API_6(atomic_uint_cmp)), INIT_SET(API_2(atomic_store)), SET(API_2(atomic_store)))
+
+
+/* Define a directory as a tree where each node contains:
+   * the number of lines of the files in this directory,
+   * and the name of the directory/
+   Since we want to sort with the number of lines only, we extend the oplist of a string by disabling the compare method.
+   So first, let's define the node as a tuple of such elements:
+*/
+M_TUPLE_DEF2( dir, (nlines, atomic_uint), (name, m_string_t, M_OPEXTEND(M_STRING_OPLIST, CMP(0))))
+/* Register globally the oplist of this tuple */
+#define M_OPL_dir_t() M_TUPLE_OPLIST(dir, M_OPL_atomic_uint(), M_STRING_OPLIST)
+
+/* Define a hierarchical tree of directory.
+   Note that it will use the globally registered oplist associated to dir_t to use it */
+M_TREE_DEF(tree, dir_t)
+
+
+/* Maximum number of characters read by file */
+#define MAX_READ_BUFFER 8192
+
+/* Maximum number of directory to scan */
+#define MAX_DIRECTORY 100000
+
+
+/* Define the pool of worker threads */
+m_worker_t workers;
+
+/* Global synchronous block for all threads */
+m_worker_sync_t workers_block;
+
+/* Add a specialization of the spawn function for the scan_file function.
+   This functions takes as input an iterator of a tree (treated as a POD data),
+   and a file name */
+M_WORKER_SPAWN_DEF2(scan_file, (parent, tree_it_t, M_POD_OPLIST), (filename, m_string_t) )
+
+
+/* Add either the root node or a child to parent in function of the existence of parent */
+static tree_it_t
+add_directory(tree_it_t parent, const m_string_t dirname)
+{
+  if (tree_end_p(parent)) {
+    return tree_emplace_root( tree_tree(parent), 0, dirname);
+  } else {
+    return tree_emplace_child(parent, 0, dirname);
+  }
+}
+
+/* count the number of end of line character in the buffer */
+static unsigned
+count_eol(size_t num, const char buffer[num])
+{
+  unsigned count = 0;
+  for(size_t i = 0; i < num; i++) {
+    count += buffer[i] == '\n';
+  }
+  return count;
+}
+
+/* Test if a filename suffix ends with a C++ or C suffix */
+static bool
+is_a_c_file(const m_string_t filename)
+{
+  return (m_string_end_with_str_p(filename, ".c")
+    || m_string_end_with_str_p(filename, ".h")
+    || m_string_end_with_str_p(filename, ".cpp")
+    || m_string_end_with_str_p(filename, ".hpp"));
+}
+
+/* Scan the file and count its number of lines */
+static void
+scan_file(tree_it_t parent, m_string_t filename)
+{
+  FILE *f = fopen(m_string_get_cstr(filename), "rt");
+  if (f == NULL) {
+    fprintf(stderr, "ERROR: Cannot open %s as a text file.\n", m_string_get_cstr(filename) );
+    exit(1);
+  }
+
+  /* Read the FILE per bulk of MAX_READ_BUFFER */
+  char buffer[MAX_READ_BUFFER];
+  unsigned count = 0;
+  size_t num;
+  do {
+    num = fread (buffer, 1, MAX_READ_BUFFER, f);
+    count += count_eol(num, buffer);
+  } while (num == MAX_READ_BUFFER);
+  fclose(f);
+
+  /* Adding the number of lines to the parent directory */
+  dir_t *d = tree_ref(parent);
+  /* atomic add because the scan of files is done in parallel */
+  atomic_fetch_add( &(*d)->nlines, count );
+}
+
+/* Scan the directories recursively for all files */
+static void
+scan_directories(tree_it_t parent, const m_string_t dirname)
+{
+  tree_it_t it = add_directory(parent, dirname);
+
+  m_string_t filename;
+  m_string_init(filename);
+  DIR *dir = opendir(m_string_get_cstr(dirname));
+  if (dir == NULL) {
+    fprintf(stderr, "ERROR: Cannot open %s as a directory.\n", m_string_get_cstr(dirname) );
+    exit(1);
+  }
+
+  // Scan all entries in the directory
+  struct dirent *entry = readdir(dir);
+  while (entry) {
+    // Ignore hidden entries (including '.' and '..')
+    if (entry->d_name[0] != '.') {
+      // Construct the path to the filename by concatenating dirname, "/" and d_name
+      m_string_sets(filename, dirname, "/", entry->d_name);
+      // Get the property of this filename
+      struct stat buf;
+      int err = stat(m_string_get_cstr(filename), &buf);
+      if (err != 0) {
+        fprintf(stderr, "ERROR: Cannot stat %s\n", m_string_get_cstr(filename));
+        exit(2);
+      }
+      // Further scanning in function of the kind of entry
+      if (S_ISDIR(buf.st_mode)) {
+        scan_directories(it, filename);
+      } else if (is_a_c_file(filename)) {
+        // Spawn a scan of file to available workers or run it ourselves
+        m_worker_spawn_scan_file(workers_block, scan_file, it, filename);
+      }
+    }
+    // Next entry in the directory
+    entry = readdir(dir);
+  }
+  
+  closedir(dir);
+  m_string_clear(filename);
+}
+
+/* Consolidate all lines number to the parent directory */
+static void
+consolidate_directories(tree_t directories)
+{
+  // Scan all entries, first the children, then the parent
+  for(tree_it_t it = tree_it_post(directories) ; !tree_end_p(it) ; tree_next_post(&it) ) {
+    dir_t *parent = tree_up_ref(it);
+    dir_t *myself = tree_ref(it);
+    if (parent != NULL) {
+      // Add the child number of lines to the parent
+      atomic_fetch_add_explicit(&(*parent)->nlines, (*myself)->nlines, memory_order_relaxed);
+    }
+    // Sort the data of the children by the number of lines
+    tree_sort_child(it);
+  }
+}
+
+/* Print the consolidated results on stdout */
+static void
+print_result(tree_t directories)
+{
+  // Scan all entries, first the parent, then the children
+  for(tree_it_t it = tree_it(directories) ; !tree_end_p(it) ; tree_next(&it) ) {
+    int i, depth = tree_depth(it);
+    for(i = 0; i < depth; i++) printf("+");
+    for(     ; i < 8; i++) printf(" ");
+    const dir_t *d = tree_cref(it);
+    printf("%6u %s\n", (unsigned) (*d)->nlines, m_string_get_cstr( (*d)->name ) );
+  }
+}
+
+int main(int argc, const char *argv[])
+{
+  tree_t directories;
+  m_string_t str;
+
+  printf("Count the number of C/C++ lines of code\n");
+  if (argc < 2) {
+    fprintf(stderr, "ERROR. Usage is '%s <directory>'.\n", argv[0]);
+    exit(1);
+  }
+
+  /* Initialize the worker threads */
+  m_worker_init(workers);
+  
+  /* Init the tree, reserve for at least the number of max directory
+    and prevent any further increase of allocation:
+    this is to ensure that other threads can deref a dir safely */
+  tree_init(directories);
+  tree_reserve(directories, MAX_DIRECTORY);
+  tree_lock(directories, true);
+  m_string_init_set_cstr(str, argv[1]);
+  tree_it_t it = tree_it_end(directories);
+
+  /* Main processing */
+  m_worker_start(workers_block, workers);
+  scan_directories(it, str);
+  worker_sync(workers_block);
+  consolidate_directories(directories);
+  print_result(directories);
+
+  /* Clear everything & quit */
+  m_string_clear(str);
+  tree_clear(directories);
+  m_worker_clear(workers);
+
+  exit(0);
+}
@@ -0,0 +1,25 @@
+#include "m-list.h"
+#include "m-generic.h"
+
+LIST_DEF(list_uint, unsigned int)
+// Register for M_LET & M_EACH 
+#define M_OPL_list_uint_t() LIST_OPLIST(list_uint, M_BASIC_OPLIST)
+// Register for Generic:
+#define M_GENERIC_ORG_1() (USER)
+#define M_GENERIC_ORG_USER_COMP_1() (CORE)
+#define M_GENERIC_ORG_USER_COMP_CORE_OPLIST_1() M_OPL_list_uint_t()
+
+int main(void)
+{
+    M_LET(list, list_uint_t) {
+        // We can push in the list. It will call the registered method.
+        push(list, 42);
+        push(list, 17);
+        // We can iterate over the list
+        for each(item, list) {
+            M_PRINT("ITEM=", *item, "\n");
+        }
+        // We can print directly the list. It will use the registered method
+        M_PRINT("List = ", list, "\n");
+    }
+}
@@ -0,0 +1,117 @@
+#if HAVE_GMP
+
+#include <stdio.h>
+#include <gmp.h>
+
+#include "m-array.h"
+#include "m-list.h"
+#include "m-generic.h"
+
+// Register an organization for generic: USER
+// Each index (here '1') shall be unique for the whole program
+#define M_GENERIC_ORG_1() (USER)
+// Register a component for the organization USER: CORE
+// Each index (here '1') shall be unique for the whole organization
+#define M_GENERIC_ORG_USER_COMP_1() (CORE)
+
+// Register the oplist of a mpz_t. It is a classic oplist.
+// Adding support for emplace and initialization
+// Adding the ability to output its value for serialization/printing
+// Adding type information for handling correctly the generic association
+#define M_OPL_mpz_t() M_OPEXTEND(M_CLASSIC_OPLIST(mpz),         \
+        INIT_WITH(mpz_init_set_ui), EMPLACE_TYPE(unsigned int), \
+        OUT_STR( API( mpz_out_str, VOID, ARG1, 10, ARG2)),      \
+        GENTYPE(__mpz_struct *), TYPE(mpz_t) )
+// Register the oplist as a generic type of the component CORE of the organization USER
+// Each index (here '1') shall be unique for the whole component
+#define M_GENERIC_ORG_USER_COMP_CORE_OPLIST_1() M_OPL_mpz_t()
+
+// Define an instance of an array of mpz_t (both type and function)
+ARRAY_DEF(array_mpz, mpz_t)
+// Register the oplist of the created instance of array of mpz_t
+#define M_OPL_array_mpz_t() ARRAY_OPLIST(array_mpz, M_OPL_mpz_t())
+// Register the oplist as a generic type of the component CORE of the organization USER
+// Each index (here '10') shall be unique for the whole component
+#define M_GENERIC_ORG_USER_COMP_CORE_OPLIST_10() M_OPL_array_mpz_t()
+
+// Define an instance of a list of mpz_t (both type and function)
+LIST_DEF(list_mpz, mpz_t)
+// Register the oplist of the created instance of array of mpz_t
+#define M_OPL_list_mpz_t() LIST_OPLIST(list_mpz, M_OPL_mpz_t())
+// Register the oplist as a generic type of the component CORE of the organization USER
+#define M_GENERIC_ORG_USER_COMP_CORE_OPLIST_11() M_OPL_list_mpz_t()
+
+// Define an instance of a list of unsigned int (both type and function)
+LIST_DEF(list_uint, unsigned)
+// Register the oplist of the created instance of list of unsigned
+#define M_OPL_list_uint_t() LIST_OPLIST(list_uint, M_BASIC_OPLIST)
+// Register the oplist as a generic type of the component CORE of the organization USER
+#define M_GENERIC_ORG_USER_COMP_CORE_OPLIST_12() M_OPL_list_uint_t()
+
+// Define an instance of a array of unsigned int (both type and function)
+ARRAY_DEF(array_uint, unsigned)
+// Register the oplist of the created instance of list of unsigned
+#define M_OPL_array_uint_t() ARRAY_OPLIST(array_uint, M_BASIC_OPLIST)
+// Register the oplist as a generic type of the component CORE of the organization USER
+#define M_GENERIC_ORG_USER_COMP_CORE_OPLIST_13() M_OPL_array_uint_t()
+
+int main(void) {
+
+    print("LIST UINT = ");
+    // Initialize list as list_uint_t and push 17 & 42 in it.
+    let( (list, 17, 42), list_uint_t) {
+        push(list, 1742);
+        // Iterate over all elements of the list of unsigned int
+        for each (item, list) {
+            // Print the element
+            print(*item, " ");
+        }
+        // Print the full list too
+        print("\n","List=", list, "\n");
+    }
+    // Now list has been cleared.
+
+    print("Array UINT = ");
+    // Initialize list as array_uint_t and push 17 & 42 in it.
+    let( (list, 17, 42), array_uint_t) {
+        push(list, 1742);
+        // Iterate over all elements of the array of unsigned int
+        for each (item, list) {
+            // Print the element
+            print(*item, " ");
+        }
+        // Print the full array too
+        print("\n","List=", list, "\n");
+    }
+    // Now array has been cleared.
+
+    print("LIST MPZ = ");
+    // Initialize list as array_mpz_t and push_emplace mpz_t from 17 & 42 in it.
+    // The parenthesis around 17 in (17) means to emplace 
+    let( (list, (17), (42)), list_mpz_t) {
+        list_mpz_emplace_back(list, 1742);        // Generic emplace is not supported yet
+        // Iterate over all elements of the array of mpz_t
+        for each (item, list) {
+            // Print the element
+            // Since we registered the out_str of a mpz_t, we can display it directly
+            print(*item, " ");
+        }
+        // Print the full list too
+        print("\n","List=", list, "\n");
+    }
+
+    print("ARRAY MPZ = ");
+    // Same as before but for array
+    let( (list, (17), (42)), array_mpz_t) {
+        array_mpz_emplace_back(list, 1742);
+        for each (item, list) {
+            print(*item, " ");
+        }
+        print("\n","List=", list, "\n");
+    }
+    exit(0);
+}
+
+#else
+int main(void) {}
+#endif
@@ -0,0 +1,82 @@
+// Based on https://github.com/nanopb/nanopb/blob/master/examples/simple/simple.c
+#include <stdio.h>
+
+#include "m-serial-json.h"
+#include "m-tuple.h"
+#include "m-string.h"
+
+// Define a structure with one field
+TUPLE_DEF2(SimpleMessage,
+           (lucky_number, int))
+
+int main(void)
+{
+  string_t buffer;
+  m_serial_return_code_t status;
+
+  /* Let's define a string 'buffer' that will receive the JSON representation of our message*/
+  string_init(buffer);
+
+  /* Encode our message */
+  {
+    SimpleMessage_t message;
+    SimpleMessage_init(message);
+    
+    /* Create a stream that will write to our string buffer. */
+    m_serial_str_json_write_t stream;
+    m_serial_str_json_write_init(stream, buffer);
+        
+    /* Fill in the lucky number */
+    message->lucky_number = 13;
+        
+    /* Now we are ready to encode the message! */
+    status = SimpleMessage_out_serial(stream, message);
+    
+    /* Then just check for any errors.. */
+    if (status != M_SERIAL_OK_DONE)
+      {
+        printf("Encoding failed: %d\n", status);
+        return 1;
+      }
+
+    /* Clear the objets */
+    m_serial_str_json_write_clear(stream);
+    SimpleMessage_clear(message);
+  }
+  
+  /* Now we could transmit the message over network, store it in a file
+   * It is represented in a string 'buffer'
+   * but we are doing it right now.
+   */
+  
+  {
+    /* Allocate another space for the decoded message. */
+    SimpleMessage_t message;
+    SimpleMessage_init(message);
+    
+    /* Create a stream that reads from the buffer. */
+    m_serial_str_json_read_t stream;
+    m_serial_str_json_read_init(stream, string_get_cstr(buffer));
+    
+    /* Now we are ready to decode the message. */
+    status = SimpleMessage_in_serial(message, stream);
+    
+    /* Check for errors... */
+    if (status != M_SERIAL_OK_DONE)
+      {
+        printf("Decoding failed: %d\n", status);
+        return 1;
+      }
+    
+    /* Print the data contained in the message. */
+    printf("Your lucky number was %d!\n", message->lucky_number);
+
+    /* Clear the objets */
+    m_serial_str_json_read_clear(stream);
+    SimpleMessage_clear(message);
+  }
+
+  string_clear(buffer);
+  
+  return 0;
+}
@@ -2,6 +2,8 @@
 #include "m-tuple.h"
 #include "m-array.h"

+/* Basic example to show JSON serialization */
+
 // Let's define a 'person' composed of several fields.
 TUPLE_DEF2(person,
           (surname, string_t),
@@ -9,7 +11,7 @@ TUPLE_DEF2(person,
           (present, bool)
           )
 // Register the oplist of this tuple globaly
-#define M_OPL_person_t() TUPLE_OPLIST(person, M_DEFAULT_OPLIST, STRING_OPLIST, M_DEFAULT_OPLIST )
+#define M_OPL_person_t() TUPLE_OPLIST(person, STRING_OPLIST, M_BASIC_OPLIST, M_BOOL_OPLIST )

 // Let's define an array of person
 ARRAY_DEF(base, person_t)
@@ -48,6 +50,7 @@ int main(void)
  M_LET(base, base_t) {
    // Read the JSON file and fill-in base
    read(base, "ex11-json01.json");
+    base_emplace_back(base, STRING_CTE("John"), 40, false);
    // Print the contents of base:
    printf ("List of presents:\n");
    for M_EACH(el, base, base_t) {