LEMON/LEMON-official Changeset - r1131:43a91b33f374

Repositories » LEMON » LEMON-official

Summary
Changelog
Files
Switch To
- loading...
Options
- Lightweight changelog
- Search
Pull Requests

Changeset - r1131:43a91b33f374

« 1130:eb252f

1132:48e173 »

r1131:43a91b33f374

Sun, 29 Jan 2012 11:28:41

[Not Reviewed]

0 comments (0 inline)

deba@inf.elte.hu
deba@inf.elte.hu

Thread safe map construction and destruction (#223) It currently support pthread and windows threads.

0 7 1

default

8 files changed with 124 insertions and 1 deletions:

lemon/bits/lock.h

CMakeLists.txt

lemon/Makefile.am

lemon/bits/alteration_notifier.h

lemon/bits/windows.cc

lemon/bits/windows.h

lemon/config.h.cmake

lemon/config.h.in

↑ Collapse diff ↑

lemon/bits/lock.h

Show inline comments

 		/* -*- mode: C++; indent-tabs-mode: nil; -*-
+		 *
 		 * This file is a part of LEMON, a generic C++ optimization library.
+		 *
 		 * Copyright (C) 2003-2012
 		 * Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
 		 * (Egervary Research Group on Combinatorial Optimization, EGRES).
+		 *
 		 * Permission to use, modify and distribute this software is granted
 		 * provided that this copyright notice appears in all copies. For
 		 * precise terms see the accompanying LICENSE file.
+		 *
 		 * This software is provided "AS IS" with no warranty of any kind,
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		#ifndef LEMON_BITS_LOCK_H
 		#define LEMON_BITS_LOCK_H
 		#include <lemon/config.h>
 		#if defined(LEMON_USE_PTHREAD)
 		#include <pthread.h>
 		#elif defined(LEMON_USE_WIN32_THREADS)
 		#include <lemon/bits/windows.h>
 		#endif
 		namespace lemon {
 		  namespace bits {
 		#if defined(LEMON_USE_PTHREAD)
 		    class Lock {
 		    public:
 		      Lock() {
 			pthread_mutex_init(&_lock, 0);
+		      }
 		      ~Lock() {
 			pthread_mutex_destroy(&_lock);
+		      }
 		      void lock() {
 			pthread_mutex_lock(&_lock);
+		      }
 		      void unlock() {
 			pthread_mutex_unlock(&_lock);
+		      }
 		    private:
 		      pthread_mutex_t _lock;
 		    };
 		#elif defined(LEMON_USE_WIN32_THREADS)
 		    class Lock : public WinLock {};
 		#else
 		    class Lock {
 		    public:
 		      Lock() {}
 		      ~Lock() {}
 		      void lock() {}
 		      void unlock() {}
 		    };
 		#endif
+		  }
+		}
 		#endif

CMakeLists.txt

Show inline comments

@@ -105,24 +105,28 @@
 		  SET(CMAKE_BUILD_TYPE "Release")
 		ENDIF()
 		SET( CMAKE_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
 		    "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel Maintainer."
 		    FORCE )
 		INCLUDE(CheckTypeSize)
 		CHECK_TYPE_SIZE("long long" LONG_LONG)
 		SET(LEMON_HAVE_LONG_LONG ${HAVE_LONG_LONG})
 		INCLUDE(FindThreads)
 		SET(LEMON_USE_PTHREAD ${CMAKE_USE_PTHREADS_INIT})
 		SET(LEMON_USE_WIN32_THREADS ${CMAKE_USE_WIN32_THREADS_INIT})
 		ENABLE_TESTING()
 		IF(${CMAKE_BUILD_TYPE} STREQUAL "Maintainer")
 		  ADD_CUSTOM_TARGET(check ALL COMMAND ${CMAKE_CTEST_COMMAND})
 		ELSE()
 		  ADD_CUSTOM_TARGET(check COMMAND ${CMAKE_CTEST_COMMAND})
 		ENDIF()
 		ADD_SUBDIRECTORY(lemon)
 		IF(${CMAKE_SOURCE_DIR} STREQUAL ${PROJECT_SOURCE_DIR})
 		  ADD_SUBDIRECTORY(contrib)
 		  ADD_SUBDIRECTORY(demo)

lemon/Makefile.am

Show inline comments

@@ -129,24 +129,25 @@
 			lemon/unionfind.h \
 			lemon/bits/windows.h
 		bits_HEADERS += \
 			lemon/bits/alteration_notifier.h \
 			lemon/bits/array_map.h \
 			lemon/bits/bezier.h \
 			lemon/bits/default_map.h \
 			lemon/bits/edge_set_extender.h \
 			lemon/bits/enable_if.h \
 			lemon/bits/graph_adaptor_extender.h \
 			lemon/bits/graph_extender.h \
 			lemon/bits/lock.h \
 			lemon/bits/map_extender.h \
 			lemon/bits/path_dump.h \
 			lemon/bits/solver_bits.h \
 			lemon/bits/traits.h \
 			lemon/bits/variant.h \
 			lemon/bits/vector_map.h
 		concept_HEADERS += \
 			lemon/concepts/digraph.h \
 			lemon/concepts/graph.h \
 			lemon/concepts/graph_components.h \
 			lemon/concepts/heap.h \

lemon/bits/alteration_notifier.h

Show inline comments

@@ -14,24 +14,25 @@
 		 * express or implied, and with no claim as to its suitability for any
 		 * purpose.
+		 *
 		 */
 		#ifndef LEMON_BITS_ALTERATION_NOTIFIER_H
 		#define LEMON_BITS_ALTERATION_NOTIFIER_H
 		#include <vector>
 		#include <list>
 		#include <lemon/core.h>
 		#include <lemon/bits/lock.h>
 		//\ingroup graphbits
 		//\file
 		//\brief Observer notifier for graph alteration observers.
 		namespace lemon {
 		  // \ingroup graphbits
 		  //
 		  // \brief Notifier class to notify observes about alterations in
 		  // a container.
 		  //
@@ -242,25 +243,25 @@
 		      // items are erased from the container. It have to be overrided in
 		      // the subclasses.
 		      virtual void clear() = 0;
 		    };
 		  protected:
 		    const Container* container;
 		    typedef std::list<ObserverBase*> Observers;
 		    Observers _observers;
+		    lemon::bits::Lock _lock;
 		  public:
 		    // \brief Default constructor.
 		    //
 		    // The default constructor of the AlterationNotifier.
 		    // It creates an empty notifier.
 		    AlterationNotifier()
 		      : container(0) {}
 		    // \brief Constructor.
 		    //
@@ -323,32 +324,36 @@
+		    }
 		    // \brief Returns the maximum id of the container.
 		    //
 		    // Returns the maximum id of the container.
 		    int maxId() const {
 		      return container->maxId(Item());
+		    }
 		  protected:
 		    void attach(ObserverBase& observer) {
 		      _lock.lock();
 		      observer._index = _observers.insert(_observers.begin(), &observer);
 		      observer._notifier = this;
 		      _lock.unlock();
+		    }
 		    void detach(ObserverBase& observer) {
 		      _lock.lock();
 		      _observers.erase(observer._index);
 		      observer._index = _observers.end();
 		      observer._notifier = 0;
 		      _lock.unlock();
+		    }
 		  public:
 		    // \brief Notifies all the registed observers about an item added to
 		    // the container.
 		    //
 		    // It notifies all the registed observers about an item added to
 		    // the container.
 		    void add(const Item& item) {
 		      typename Observers::reverse_iterator it;
 		      try {

lemon/bits/windows.cc

Show inline comments

@@ -121,14 +121,44 @@
 		    int getWinRndSeed()
+		    {
 		#ifdef WIN32
 		      FILETIME time;
 		      GetSystemTimeAsFileTime(&time);
 		      return GetCurrentProcessId() + time.dwHighDateTime + time.dwLowDateTime;
 		#else
 		      timeval tv;
 		      gettimeofday(&tv, 0);
 		      return getpid() + tv.tv_sec + tv.tv_usec;
 		#endif
+		    }
 		    WinLock::WinLock() {
 		#ifdef WIN32
 		      CRITICAL_SECTION *lock = new CRITICAL_SECTION;
 		      InitializeCriticalSection(lock);
 		      _repr = lock;
 		#endif
+		  }
 		    WinLock::~WinLock() {
 		#ifdef WIN32
 		      CRITICAL_SECTION *lock = static_cast<CRITICAL_SECTION*>(_repr);
 		      DeleteCriticalSection(lock);
 		      delete lock;
 		#endif
+		}
 		    void WinLock::lock() {
 		#ifdef WIN32
 		      CRITICAL_SECTION *lock = static_cast<CRITICAL_SECTION*>(_repr);
 		      EnterCriticalSection(lock);
 		#endif
+		    }
 		    void WinLock::unlock() {
 		#ifdef WIN32
 		      CRITICAL_SECTION *lock = static_cast<CRITICAL_SECTION*>(_repr);
 		      LeaveCriticalSection(lock);
 		#endif
+		    }
+		  }
+		}

lemon/bits/windows.h

Show inline comments

@@ -19,16 +19,26 @@
 		#ifndef LEMON_BITS_WINDOWS_H
 		#define LEMON_BITS_WINDOWS_H
 		#include <string>
 		namespace lemon {
 		  namespace bits {
 		    void getWinProcTimes(double &rtime,
 		                         double &utime, double &stime,
 		                         double &cutime, double &cstime);
 		    std::string getWinFormattedDate();
 		    int getWinRndSeed();
 		    class WinLock {
 		    public:
 		      WinLock();
 		      ~WinLock();
 		      void lock();
 		      void unlock();
 		    private:
 		      void *_repr;
 		    };
+		  }
+		}
 		#endif

lemon/config.h.cmake

Show inline comments

 		#define LEMON_VERSION "@PROJECT_VERSION@"
 		#cmakedefine LEMON_HAVE_LONG_LONG 1
 		#cmakedefine LEMON_HAVE_LP 1
 		#cmakedefine LEMON_HAVE_MIP 1
 		#cmakedefine LEMON_HAVE_GLPK 1
 		#cmakedefine LEMON_HAVE_CPLEX 1
 		#cmakedefine LEMON_HAVE_CLP 1
 		#cmakedefine LEMON_HAVE_CBC 1
 		#cmakedefine LEMON_USE_PTHREAD 1
 		#cmakedefine LEMON_USE_WIN32_THREADS 1

lemon/config.h.in

Show inline comments

@@ -15,12 +15,18 @@
 		/* Define to 1 if you have GLPK. */
 		#undef LEMON_HAVE_GLPK
 		/* Define to 1 if you have SOPLEX */
 		#undef LEMON_HAVE_SOPLEX
 		/* Define to 1 if you have CLP */
 		#undef LEMON_HAVE_CLP
 		/* Define to 1 if you have CBC */
 		#undef LEMON_HAVE_CBC
 		/* Define to 1 if you have pthread */
 		#undef LEMON_USE_PTHREAD
 		/* Define to 1 if you have win32 threads */
 		#undef LEMON_USE_WIN32_THREADS

0 comments (0 inline)

RhodeCode

Login to your account