Added copyright and license
[libcds.git] / tests / unit / map2 / map_insdel_func.cpp
index aa09a1dd726394b659aec552e16dc84d0899274c..5d627763e5e75ade0423ae8ad14c383dfdd6476c 100644 (file)
-//$$CDS-header$$
-
-#include <functional>
-#include <mutex>    //unique_lock
-#include "map2/map_types.h"
-#include "cppunit/thread.h"
-
-#include <cds/lock/spinlock.h>
-#include <vector>
-#include <algorithm>    // random_shuffle
+/*
+    This file is a part of libcds - Concurrent Data Structures library
+
+    (C) Copyright Maxim Khizhinsky (libcds.dev@gmail.com) 2006-2016
+
+    Source code repo: http://github.com/khizmax/libcds/
+    Download: http://sourceforge.net/projects/libcds/files/
+    
+    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 COPYRIGHT HOLDERS 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 COPYRIGHT HOLDER OR 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 "map2/map_insdel_func.h"
 
 namespace map2 {
+    CPPUNIT_TEST_SUITE_REGISTRATION( Map_InsDel_func );
 
-#   define TEST_MAP(X)          void X() { test<MapTypes<key_type, value_type>::X >()    ; }
-#   define TEST_MAP_EXTRACT(X)  TEST_MAP(X)
-#   define TEST_MAP_NOLF(X)     void X() { test_nolf<MapTypes<key_type, value_type>::X >()    ; }
-#   define TEST_MAP_NOLF_EXTRACT(X) TEST_MAP_NOLF(X)
-
-    namespace {
-        static size_t  c_nMapSize = 1000000    ;  // map size
-        static size_t  c_nInsertThreadCount = 4;  // count of insertion thread
-        static size_t  c_nDeleteThreadCount = 4;  // count of deletion thread
-        static size_t  c_nEnsureThreadCount = 4;  // count of ensure thread
-        static size_t  c_nThreadPassCount = 4  ;  // pass count for each thread
-        static size_t  c_nMaxLoadFactor = 8    ;  // maximum load factor
-        static bool    c_bPrintGCState = true;
-    }
-
-    class Map_InsDel_func: public CppUnitMini::TestCase
+    void Map_InsDel_func::setUpParams( const CppUnitMini::TestCfg& cfg )
     {
-        typedef size_t  key_type;
-        struct value_type {
-            size_t      nKey;
-            size_t      nData;
-            atomics::atomic<size_t> nEnsureCall;
-            atomics::atomic<bool>   bInitialized;
-            cds::OS::ThreadId          threadId     ;   // insert thread id
-
-            typedef cds::lock::Spinlock< cds::backoff::pause >   lock_type;
-            mutable lock_type   m_access;
-
-            value_type()
-                : nKey(0)
-                , nData(0)
-                , nEnsureCall(0)
-                , bInitialized( false )
-                , threadId( cds::OS::get_current_thread_id() )
-            {}
-
-            value_type( value_type const& s )
-                : nKey(s.nKey)
-                , nData(s.nData)
-                , nEnsureCall(s.nEnsureCall.load(atomics::memory_order_relaxed))
-                , bInitialized( s.bInitialized.load(atomics::memory_order_relaxed) )
-                , threadId( cds::OS::get_current_thread_id() )
-            {}
-
-            // boost::container::flat_map requires operator =
-            value_type& operator=( value_type const& v )
-            {
-                nKey = v.nKey;
-                nData = v.nData;
-                nEnsureCall.store( v.nEnsureCall.load(atomics::memory_order_relaxed), atomics::memory_order_relaxed );
-                bInitialized.store(v.bInitialized.load(atomics::memory_order_relaxed), atomics::memory_order_relaxed);
-
-                return *this;
-            }
-        };
-
-        typedef std::vector<key_type>   key_array;
-        key_array                       m_arrValues;
-
-        template <class Map>
-        class Inserter: public CppUnitMini::TestThread
-        {
-            Map&     m_Map;
-            typedef typename Map::value_type pair_type;
-
-            virtual Inserter *    clone()
-            {
-                return new Inserter( *this );
-            }
-
-            struct insert_functor {
-                size_t nTestFunctorRef;
-
-                insert_functor()
-                    : nTestFunctorRef(0)
-                {}
-
-                void operator()( pair_type& val )
-                {
-                    std::unique_lock< typename value_type::lock_type>    ac( val.second.m_access );
-
-                    val.second.nKey  = val.first;
-                    val.second.nData = val.first * 8;
-
-                    ++nTestFunctorRef;
-                    val.second.bInitialized.store( true, atomics::memory_order_relaxed);
-                }
-            };
-
-        public:
-            size_t  m_nInsertSuccess;
-            size_t  m_nInsertFailed;
-
-            size_t  m_nTestFunctorRef;
-
-        public:
-            Inserter( CppUnitMini::ThreadPool& pool, Map& rMap )
-                : CppUnitMini::TestThread( pool )
-                , m_Map( rMap )
-            {}
-            Inserter( Inserter& src )
-                : CppUnitMini::TestThread( src )
-                , m_Map( src.m_Map )
-            {}
-
-            Map_InsDel_func&  getTest()
-            {
-                return reinterpret_cast<Map_InsDel_func&>( m_Pool.m_Test );
-            }
-
-            virtual void init() { cds::threading::Manager::attachThread()   ; }
-            virtual void fini() { cds::threading::Manager::detachThread()   ; }
-
-            virtual void test()
-            {
-                Map& rMap = m_Map;
-
-                m_nInsertSuccess =
-                    m_nInsertFailed =
-                    m_nTestFunctorRef = 0;
-
-                // func is passed by reference
-                insert_functor  func;
-                key_array const& arr = getTest().m_arrValues;
-
-                if ( m_nThreadNo & 1 ) {
-                    for ( size_t nPass = 0; nPass < c_nThreadPassCount; ++nPass ) {
-                        for ( key_array::const_iterator it = arr.begin(), itEnd = arr.end(); it != itEnd; ++it ) {
-                            if ( rMap.insert_with( *it, std::ref(func) ) )
-                                ++m_nInsertSuccess;
-                            else
-                                ++m_nInsertFailed;
-                        }
-                    }
-                }
-                else {
-                    for ( size_t nPass = 0; nPass < c_nThreadPassCount; ++nPass ) {
-                        for ( key_array::const_reverse_iterator it = arr.rbegin(), itEnd = arr.rend(); it != itEnd; ++it ) {
-                            if ( rMap.insert_with( *it, std::ref(func) ) )
-                                ++m_nInsertSuccess;
-                            else
-                                ++m_nInsertFailed;
-                        }
-                    }
-                }
-
-                m_nTestFunctorRef = func.nTestFunctorRef;
-            }
-        };
-
-        template <class Map>
-        class Ensurer: public CppUnitMini::TestThread
-        {
-            Map&     m_Map;
-            typedef typename Map::value_type pair_type;
-
-            virtual Ensurer *    clone()
-            {
-                return new Ensurer( *this );
-            }
-
-            struct ensure_functor {
-                size_t  nCreated;
-                size_t  nModified;
-
-                ensure_functor()
-                    : nCreated(0)
-                    , nModified(0)
-                {}
-
-                void operator()( bool bNew, pair_type& val )
-                {
-                    std::unique_lock<typename value_type::lock_type>    ac( val.second.m_access );
-                    if ( bNew ) {
-                        ++nCreated;
-                        val.second.nKey = val.first;
-                        val.second.nData = val.first * 8;
-                        val.second.bInitialized.store( true, atomics::memory_order_relaxed);
-                    }
-                    else {
-                        val.second.nEnsureCall.fetch_add( 1, atomics::memory_order_relaxed );
-                        ++nModified;
-                    }
-                }
-            private:
-                ensure_functor(const ensure_functor& );
-            };
-
-        public:
-            size_t  m_nEnsureFailed;
-            size_t  m_nEnsureCreated;
-            size_t  m_nEnsureExisted;
-            size_t  m_nFunctorCreated;
-            size_t  m_nFunctorModified;
-
-        public:
-            Ensurer( CppUnitMini::ThreadPool& pool, Map& rMap )
-                : CppUnitMini::TestThread( pool )
-                , m_Map( rMap )
-            {}
-            Ensurer( Ensurer& src )
-                : CppUnitMini::TestThread( src )
-                , m_Map( src.m_Map )
-            {}
-
-            Map_InsDel_func&  getTest()
-            {
-                return reinterpret_cast<Map_InsDel_func&>( m_Pool.m_Test );
-            }
-
-            virtual void init() { cds::threading::Manager::attachThread()   ; }
-            virtual void fini() { cds::threading::Manager::detachThread()   ; }
-
-            virtual void test()
-            {
-                Map& rMap = m_Map;
-
-                m_nEnsureCreated =
-                    m_nEnsureExisted =
-                    m_nEnsureFailed = 0;
-
-                ensure_functor func;
-
-                key_array const& arr = getTest().m_arrValues;
+        c_nInsertThreadCount = cfg.getULong("InsertThreadCount", static_cast<unsigned long>(c_nInsertThreadCount));
+        c_nDeleteThreadCount = cfg.getULong("DeleteThreadCount", static_cast<unsigned long>(c_nDeleteThreadCount));
+        c_nUpdateThreadCount = cfg.getULong("UpdateThreadCount", static_cast<unsigned long>(c_nUpdateThreadCount));
+        c_nThreadPassCount = cfg.getULong("ThreadPassCount", static_cast<unsigned long>(c_nThreadPassCount));
+        c_nMapSize = cfg.getULong("MapSize", static_cast<unsigned long>(c_nMapSize));
+        c_nMaxLoadFactor = cfg.getULong("MaxLoadFactor", static_cast<unsigned long>(c_nMaxLoadFactor));
+        c_bPrintGCState = cfg.getBool("PrintGCStateFlag", true );
 
-                if ( m_nThreadNo & 1 ) {
-                    for ( size_t nPass = 0; nPass < c_nThreadPassCount; ++nPass ) {
-                        for ( key_array::const_iterator it = arr.begin(), itEnd = arr.end(); it != itEnd; ++it ) {
-                        //for ( size_t nItem = 0; nItem < c_nMapSize; ++nItem ) {
-                            std::pair<bool, bool> ret = rMap.ensure( *it, std::ref( func ) );
-                            if ( ret.first  ) {
-                                if ( ret.second )
-                                    ++m_nEnsureCreated;
-                                else
-                                    ++m_nEnsureExisted;
-                            }
-                            else
-                                ++m_nEnsureFailed;
-                        }
-                    }
-                }
-                else {
-                    for ( size_t nPass = 0; nPass < c_nThreadPassCount; ++nPass ) {
-                        for ( key_array::const_reverse_iterator it = arr.rbegin(), itEnd = arr.rend(); it != itEnd; ++it ) {
-                        //for ( size_t nItem = c_nMapSize; nItem > 0; --nItem ) {
-                            std::pair<bool, bool> ret = rMap.ensure( *it, std::ref( func ) );
-                            if ( ret.first  ) {
-                                if ( ret.second )
-                                    ++m_nEnsureCreated;
-                                else
-                                    ++m_nEnsureExisted;
-                            }
-                            else
-                                ++m_nEnsureFailed;
-                        }
-                    }
-                }
+        c_nCuckooInitialSize = cfg.getULong("CuckooInitialSize", static_cast<unsigned long>(c_nCuckooInitialSize) );
+        c_nCuckooProbesetSize = cfg.getULong("CuckooProbesetSize", static_cast<unsigned long>(c_nCuckooProbesetSize) );
+        c_nCuckooProbesetThreshold = cfg.getULong("CuckooProbesetThreshold", static_cast<unsigned long>(c_nCuckooProbesetThreshold) );
 
-                m_nFunctorCreated = func.nCreated;
-                m_nFunctorModified = func.nModified;
-            }
-        };
+        c_nFeldmanMap_HeadBits = cfg.getULong("FeldmanMapHeadBits", static_cast<unsigned long>(c_nFeldmanMap_HeadBits) );
+        c_nFeldmanMap_ArrayBits = cfg.getULong("FeldmanMapArrayBits", static_cast<unsigned long>(c_nFeldmanMap_ArrayBits) );
 
-        template <class Map>
-        class Deleter: public CppUnitMini::TestThread
-        {
-            Map&     m_Map;
-            typedef typename Map::mapped_type value_type;
-            typedef typename Map::value_type pair_type;
-
-            virtual Deleter *    clone()
-            {
-                return new Deleter( *this );
-            }
-
-            struct value_container
-            {
-                size_t      nKeyExpected;
-
-                size_t      nSuccessItem;
-                size_t      nFailedItem;
-
-                value_container()
-                    : nSuccessItem(0)
-                    , nFailedItem(0)
-                {}
-            };
-
-            struct erase_functor {
-                value_container     m_cnt;
-
-                void operator ()( pair_type& item )
-                {
-                    while ( true ) {
-                        if ( item.second.bInitialized.load( atomics::memory_order_relaxed )) {
-                            std::unique_lock< typename value_type::lock_type>    ac( item.second.m_access );
-
-                            if ( m_cnt.nKeyExpected == item.second.nKey && m_cnt.nKeyExpected * 8 == item.second.nData )
-                                ++m_cnt.nSuccessItem;
-                            else
-                                ++m_cnt.nFailedItem;
-                            item.second.nData++;
-                            item.second.nKey = 0;
-                            break;
-                        }
-                        else
-                            cds::backoff::yield()();
-                    }
-                }
-            };
-
-        public:
-            size_t  m_nDeleteSuccess;
-            size_t  m_nDeleteFailed;
-
-            size_t  m_nValueSuccess;
-            size_t  m_nValueFailed;
-
-        public:
-            Deleter( CppUnitMini::ThreadPool& pool, Map& rMap )
-                : CppUnitMini::TestThread( pool )
-                , m_Map( rMap )
-            {}
-            Deleter( Deleter& src )
-                : CppUnitMini::TestThread( src )
-                , m_Map( src.m_Map )
-            {}
-
-            Map_InsDel_func&  getTest()
-            {
-                return reinterpret_cast<Map_InsDel_func&>( m_Pool.m_Test );
-            }
-
-            virtual void init() { cds::threading::Manager::attachThread()   ; }
-            virtual void fini() { cds::threading::Manager::detachThread()   ; }
-
-            virtual void test()
-            {
-                Map& rMap = m_Map;
-
-                m_nDeleteSuccess =
-                    m_nDeleteFailed = 0;
-
-                erase_functor   func;
-                key_array const& arr = getTest().m_arrValues;
-
-                if ( m_nThreadNo & 1 ) {
-                    for ( size_t nPass = 0; nPass < c_nThreadPassCount; ++nPass ) {
-                        for ( key_array::const_iterator it = arr.begin(), itEnd = arr.end(); it != itEnd; ++it ) {
-                            func.m_cnt.nKeyExpected = *it;
-                            if ( rMap.erase( *it, std::ref(func) ))
-                                ++m_nDeleteSuccess;
-                            else
-                                ++m_nDeleteFailed;
-                        }
-                    }
-                }
-                else {
-                    for ( size_t nPass = 0; nPass < c_nThreadPassCount; ++nPass ) {
-                        for ( key_array::const_reverse_iterator it = arr.rbegin(), itEnd = arr.rend(); it != itEnd; ++it ) {
-                            func.m_cnt.nKeyExpected = *it;
-                            if ( rMap.erase( *it, std::ref(func) ))
-                                ++m_nDeleteSuccess;
-                            else
-                                ++m_nDeleteFailed;
-                        }
-                    }
-                }
-
-                m_nValueSuccess = func.m_cnt.nSuccessItem;
-                m_nValueFailed = func.m_cnt.nFailedItem;
-            }
-        };
-
-    protected:
-
-        template <class Map>
-        void do_test( Map& testMap )
-        {
-            typedef Inserter<Map>       InserterThread;
-            typedef Deleter<Map>        DeleterThread;
-            typedef Ensurer<Map>        EnsurerThread;
-            cds::OS::Timer    timer;
-
-            m_arrValues.clear();
-            m_arrValues.reserve( c_nMapSize );
-            for ( size_t i = 0; i < c_nMapSize; ++i )
-                m_arrValues.push_back( i );
-            std::random_shuffle( m_arrValues.begin(), m_arrValues.end() );
-
-            CppUnitMini::ThreadPool pool( *this );
-            pool.add( new InserterThread( pool, testMap ), c_nInsertThreadCount );
-            pool.add( new DeleterThread( pool, testMap ), c_nDeleteThreadCount );
-            pool.add( new EnsurerThread( pool, testMap ), c_nEnsureThreadCount );
-            pool.run();
-            CPPUNIT_MSG( "   Duration=" << pool.avgDuration() );
-
-            size_t nInsertSuccess = 0;
-            size_t nInsertFailed = 0;
-            size_t nDeleteSuccess = 0;
-            size_t nDeleteFailed = 0;
-            size_t nDelValueSuccess = 0;
-            size_t nDelValueFailed = 0;
-            size_t nEnsureFailed = 0;
-            size_t nEnsureCreated = 0;
-            size_t nEnsureModified = 0;
-            size_t nEnsFuncCreated = 0;
-            size_t nEnsFuncModified = 0;
-            size_t nTestFunctorRef = 0;
-
-            for ( CppUnitMini::ThreadPool::iterator it = pool.begin(); it != pool.end(); ++it ) {
-                InserterThread * pThread = dynamic_cast<InserterThread *>( *it );
-                if ( pThread ) {
-                    nInsertSuccess += pThread->m_nInsertSuccess;
-                    nInsertFailed += pThread->m_nInsertFailed;
-                    nTestFunctorRef += pThread->m_nTestFunctorRef;
-                }
-                else {
-                    DeleterThread * p = dynamic_cast<DeleterThread *>( *it );
-                    if ( p ) {
-                        nDeleteSuccess += p->m_nDeleteSuccess;
-                        nDeleteFailed += p->m_nDeleteFailed;
-                        nDelValueSuccess += p->m_nValueSuccess;
-                        nDelValueFailed += p->m_nValueFailed;
-                    }
-                    else {
-                        EnsurerThread * pEns = static_cast<EnsurerThread *>( *it );
-                        nEnsureCreated += pEns->m_nEnsureCreated;
-                        nEnsureModified += pEns->m_nEnsureExisted;
-                        nEnsureFailed += pEns->m_nEnsureFailed;
-                        nEnsFuncCreated += pEns->m_nFunctorCreated;
-                        nEnsFuncModified += pEns->m_nFunctorModified;
-                    }
-                }
-            }
-
-            CPPUNIT_MSG( "    Totals: Ins succ=" << nInsertSuccess
-                << " Del succ=" << nDeleteSuccess << "\n"
-                << "          : Ins fail=" << nInsertFailed
-                << " Del fail=" << nDeleteFailed << "\n"
-                << "          : Ensure succ=" << (nEnsureCreated + nEnsureModified) << " fail=" << nEnsureFailed
-                << " create=" << nEnsureCreated << " modify=" << nEnsureModified << "\n"
-                << "          Map size=" << testMap.size()
-                );
-
-            CPPUNIT_CHECK_EX( nDelValueFailed == 0, "Functor del failed=" << nDelValueFailed );
-            CPPUNIT_CHECK_EX( nDelValueSuccess == nDeleteSuccess,  "Delete success=" << nDeleteSuccess << " functor=" << nDelValueSuccess );
-
-            CPPUNIT_CHECK( nEnsureFailed == 0 );
-
-            CPPUNIT_CHECK_EX( nEnsureCreated == nEnsFuncCreated, "Ensure created=" << nEnsureCreated << " functor=" << nEnsFuncCreated );
-            CPPUNIT_CHECK_EX( nEnsureModified == nEnsFuncModified, "Ensure modified=" << nEnsureModified << " functor=" << nEnsFuncModified );
-
-            // nTestFunctorRef is call count of insert functor
-            CPPUNIT_CHECK_EX( nTestFunctorRef == nInsertSuccess, "nInsertSuccess=" << nInsertSuccess << " functor nTestFunctorRef=" << nTestFunctorRef );
-
-            CPPUNIT_MSG( "  Clear map (single-threaded)..." );
-            timer.reset();
-            for ( size_t nItem = 0; nItem < c_nMapSize; ++nItem ) {
-                testMap.erase( nItem );
-            }
-            CPPUNIT_MSG( "   Duration=" << timer.duration() );
-            CPPUNIT_CHECK( testMap.empty() );
-
-            additional_check( testMap );
-            print_stat( testMap );
-            additional_cleanup( testMap );
-        }
-
-        template <class Map>
-        void test()
-        {
-            CPPUNIT_MSG( "Thread count: insert=" << c_nInsertThreadCount
-                << " delete=" << c_nDeleteThreadCount
-                << " ensure=" << c_nEnsureThreadCount
-                << " pass count=" << c_nThreadPassCount
-                << " map size=" << c_nMapSize
-                );
-
-            for ( size_t nLoadFactor = 1; nLoadFactor <= c_nMaxLoadFactor; nLoadFactor *= 2 ) {
-                CPPUNIT_MSG( "Load factor=" << nLoadFactor );
-                Map  testMap( c_nMapSize, nLoadFactor );
-                do_test( testMap );
-                if ( c_bPrintGCState )
-                    print_gc_state();
-            }
-
-        }
-
-        template <class Map>
-        void test_nolf()
-        {
-            CPPUNIT_MSG( "Thread count: insert=" << c_nInsertThreadCount
-                << " delete=" << c_nDeleteThreadCount
-                << " ensure=" << c_nEnsureThreadCount
-                << " pass count=" << c_nThreadPassCount
-                << " map size=" << c_nMapSize
-                );
-
-            Map testMap;
-            do_test( testMap );
-            if ( c_bPrintGCState )
-                print_gc_state();
-        }
-
-        void setUpParams( const CppUnitMini::TestCfg& cfg ) {
-            c_nInsertThreadCount = cfg.getULong("InsertThreadCount", 4 );
-            c_nDeleteThreadCount = cfg.getULong("DeleteThreadCount", 4 );
-            c_nEnsureThreadCount = cfg.getULong("EnsureThreadCount", 4 );
-            c_nThreadPassCount = cfg.getULong("ThreadPassCount", 4 );
-            c_nMapSize = cfg.getULong("MapSize", 1000000 );
-            c_nMaxLoadFactor = cfg.getULong("MaxLoadFactor", 8 );
-            c_bPrintGCState = cfg.getBool("PrintGCStateFlag", true );
-        }
-
-#   include "map2/map_defs.h"
-    CDSUNIT_DECLARE_MichaelMap
-    CDSUNIT_DECLARE_SplitList
-    CDSUNIT_DECLARE_SkipListMap
-    CDSUNIT_DECLARE_EllenBinTreeMap
-    CDSUNIT_DECLARE_StripedMap
-    CDSUNIT_DECLARE_RefinableMap
-    CDSUNIT_DECLARE_CuckooMap
-
-    CPPUNIT_TEST_SUITE( Map_InsDel_func )
-        CDSUNIT_TEST_MichaelMap
-        CDSUNIT_TEST_SplitList
-        CDSUNIT_TEST_SkipListMap
-        CDSUNIT_TEST_EllenBinTreeMap
-        CDSUNIT_TEST_StripedMap
-        CDSUNIT_TEST_RefinableMap
-        CDSUNIT_TEST_CuckooMap
-    CPPUNIT_TEST_SUITE_END()
-
-    };
-
-    CPPUNIT_TEST_SUITE_REGISTRATION( Map_InsDel_func );
+    }
 } // namespace map2