sketch

diff --git a/devel/devel.ma/CMakeLists.txt b/devel/devel.ma/CMakeLists.txt
index f42a127..cc6b3ed 100644 (file)
--- a/devel/devel.ma/CMakeLists.txt
+++ b/devel/devel.ma/CMakeLists.txt
@@ -15,7 +15,7 @@ ELSE ( NOT QT_FOUND )
   #)
 ENDIF( NOT QT_FOUND )
 
-SET(THREAD_LIBRARY boost_thread-mt)
+SET(THREAD_LIBRARY boost_thread)
 
 ## ############################################################
 
@@ -35,7 +35,7 @@ FOREACH( loop_var ${APLLPROG} )
    TARGET_LINK_LIBRARIES( ${loop_var}
     boost_signals
     zypp
-    #{THREAD_LIBRARY}
+    ${THREAD_LIBRARY}
    )
 ENDFOREACH( loop_var )
 

diff --git a/devel/devel.ma/MT.cc b/devel/devel.ma/MT.cc
new file mode 100644 (file)
index 0000000..c1adcbf
--- /dev/null
+++ b/devel/devel.ma/MT.cc
@@ -0,0 +1,96 @@
+//#include <thread>
+#include <vector>
+#include <boost/thread.hpp>
+#include <zypp/base/Functional.h>
+
+#include <zypp/base/Easy.h>
+#include <zypp/base/Measure.h>
+#include <zypp/base/Exception.h>
+#include <zypp/base/String.h>
+
+#include <zypp/base/LogTools.h>
+#include <zypp/base/LogControl.h>
+
+#include "zypp/ExternalProgram.h"
+
+using std::endl;
+using zypp::debug::Measure;
+
+///////////////////////////////////////////////////////////////////
+namespace zypp
+{
+  /** Run a number of tasks using \c threadCount threads.
+   *
+   * \code
+   * std::vector<function<void()>> tasks;
+   * for ( int i = 0; i < 100; ++i )
+   * {
+   *   tasks.push_back( [i]()
+   *   {
+   *     MIL << '[' << i << "]" << endl;
+   *   });
+   * }
+   * runTasks( tasks, 10 );
+   * \endcode
+   */
+  template <class _Function>
+  void runTasks( const std::vector<_Function>& tasks, size_t threadCount = 1 )
+  {
+    if ( threadCount )
+    {
+      boost::thread_group group;
+      const size_t taskCount = (tasks.size() / threadCount) + 1;
+      for ( size_t start = 0; start < tasks.size(); start += taskCount )
+      {
+       group.create_thread( [&tasks, start, taskCount]()
+       {
+         const size_t end = std::min( tasks.size(), start + taskCount );
+         for ( size_t i = start; i < end; ++i )
+           tasks[i]();
+       });
+      }
+      group.join_all();
+    }
+    else
+    {
+      for_( f, tasks.begin(), tasks.end() )
+       (*f)();
+    }
+  }
+}
+///////////////////////////////////////////////////////////////////
+using namespace zypp;
+int main( int argc, char * argv[] )
+try {
+  --argc;
+  ++argv;
+  zypp::base::LogControl::instance().logToStdErr();
+  INT << "===[START]==========================================" << endl;
+  ///////////////////////////////////////////////////////////////////
+
+  std::vector<function<void()>> tasks;
+  for ( int i = 0; i < 100; ++i )
+  {
+    tasks.push_back( [i]()
+    {
+      MIL << '[' << i << "]" << endl;
+    });
+  }
+  {
+    Measure x( "THREAD" );
+    runTasks( tasks, 100 );
+  }
+
+
+  ///////////////////////////////////////////////////////////////////
+  INT << "===[END]============================================" << endl << endl;
+  zypp::base::LogControl::instance().logNothing();
+  return 0;
+}
+catch ( const zypp::Exception & exp )
+{
+  INT << exp << endl << exp.historyAsString();
+}
+catch (...)
+{}
+

diff --git a/doc/autoinclude/Threads.doc b/doc/autoinclude/Threads.doc
new file mode 100644 (file)
index 0000000..b2a9c61
--- /dev/null
+++ b/doc/autoinclude/Threads.doc
@@ -0,0 +1,26 @@
+/**
+
+\page thread Libzypp and threads
+
+\author Michael Andres <ma@suse.de>
+
+\section thread_intro Libzypp and threads
+
+Libzypp is \b not thread safe.
+
+Before we can think about using threads in libzypp, or even libzypp in threads, a bunch of components have to be fixed.
+
+\li \c Logging as one one of the core components has to become threadsafe.
+
+\li \c SmartPointer as one of the core patterns implementing resource control need to become threadsafe
+
+\li \c ...more
+
+
+\subsection thread_loggin Logging in threads
+
+\see http://accu.org/index.php/journals/1539, http://www.pantheios.org/
+
+Need to estimate performance impact when making the current zypp::log implementation threadsafe. Current implementation is based on STL streams with a custom linebuffer.
+
+*/
\ No newline at end of file

diff --git a/zypp/base/LogControl.cc b/zypp/base/LogControl.cc
index 7732634..4c9628a 100644 (file)
--- a/zypp/base/LogControl.cc
+++ b/zypp/base/LogControl.cc
@@ -145,6 +145,8 @@ namespace zypp
         /** */
         virtual int writeout( const char* s, std::streamsize n )
         {
+         //logger::putStream( _group, _level, _file, _func, _line, _buffer );
+         //return n;
           if ( s && n )
             {
               const char * c = s;