Merge pull request #616 from muflihun/develop

potential wrapper for mutex

Author: abumq

.gitignore

@@ -6,4 +6,4 @@ release.info
 bin/*
 logs/*
 experiments/*
-CMakeLists.txt.user
+CMakeLists.txt.user*

.travis.yml

@@ -1,8 +1,55 @@
 language: cpp
-compiler:
-  - gcc
-os: linux
-dist: trusty
+matrix:
+  include:
+  - os: linux
+    dist: trusty
+    compiler: clang
+  - os: linux
+    dist: trusty
+    compiler: gcc
+    env:
+      - COMPILER=g++-4.8
+    addons:
+      apt:
+        sources: ['ubuntu-toolchain-r-test']
+        packages: [g++-4.8, valgrind]
+  - os: linux
+    dist: trusty
+    compiler: gcc
+    env:
+      - COMPILER=g++-4.9
+    addons:
+      apt:
+        sources: ['ubuntu-toolchain-r-test']
+        packages: [g++-4.9, valgrind]
+  - os: linux
+    dist: trusty
+    compiler: gcc
+    env:
+      - COMPILER=g++-5
+    addons:
+      apt:
+        sources: ['ubuntu-toolchain-r-test']
+        packages: [g++-5, valgrind]
+  - os: linux
+    dist: trusty
+    compiler: gcc
+    env:
+      - COMPILER=g++-6
+    addons:
+      apt:
+        sources: ['ubuntu-toolchain-r-test']
+        packages: [g++-6, valgrind]
+  - os: linux
+    dist: trusty
+    compiler: gcc
+    env:
+      - COMPILER=g++-7
+    addons:
+      apt:
+        sources: ['ubuntu-toolchain-r-test']
+        packages: [g++-7, valgrind]
+
 before_install:
  - sudo apt-get -qq update
  - sudo apt-get install -y libgtest-dev valgrind cmake

README.md

@@ -93,6 +93,7 @@
     <a href="#submitting-patches">Submitting Patches</a>
     <a href="#reporting-a-bug">Reporting a Bug</a>
 <a href="#compatibility">Compatibility</a>
+    <a href="#build-matrix">Build Matrix</a>
 <a href="#licence">Licence</a>
 <a href="#disclaimer">Disclaimer</a>
 </pre>
@@ -1437,6 +1438,23 @@ Easylogging++ has also been tested with following C++ libraries;
 
  [![top] Goto Top](#table-of-contents)
 
+ ## Build Matrix
+ 
+ | Branch | Platform | Build Status |
+ | -------- |:------------:|:------------:|
+ | `develop` | GNU/Linux 4.4 / Ubuntu 4.8.4 64-bit / `clang++` | [![Build Status](https://travis-matrix-badges.herokuapp.com/repos/muflihun/easyloggingpp/branches/develop/1)](https://travis-ci.org/muflihun/easyloggingpp) |
+ | `develop` | GNU/Linux 4.4 / Ubuntu 4.8.4 64-bit / `g++-4.9` | [![Build Status](https://travis-matrix-badges.herokuapp.com/repos/muflihun/easyloggingpp/branches/develop/2)](https://travis-ci.org/muflihun/easyloggingpp) |
+ | `develop` | GNU/Linux 4.4 / Ubuntu 4.8.4 64-bit / `g++-5` | [![Build Status](https://travis-matrix-badges.herokuapp.com/repos/muflihun/easyloggingpp/branches/develop/3)](https://travis-ci.org/muflihun/easyloggingpp) |
+ | `develop` | GNU/Linux 4.4 / Ubuntu 4.8.4 64-bit / `g++-6` | [![Build Status](https://travis-matrix-badges.herokuapp.com/repos/muflihun/easyloggingpp/branches/develop/4)](https://travis-ci.org/muflihun/easyloggingpp) |
+ | `develop` | GNU/Linux 4.4 / Ubuntu 4.8.4 64-bit / `g++-7` | [![Build Status](https://travis-matrix-badges.herokuapp.com/repos/muflihun/easyloggingpp/branches/develop/5)](https://travis-ci.org/muflihun/easyloggingpp) |
+ | `master` | GNU/Linux 4.4 / Ubuntu 4.8.4 64-bit / `clang++` | [![Build Status](https://travis-matrix-badges.herokuapp.com/repos/muflihun/easyloggingpp/branches/master/1)](https://travis-ci.org/muflihun/easyloggingpp) |
+ | `master` | GNU/Linux 4.4 / Ubuntu 4.8.4 64-bit / `g++-4.9` | [![Build Status](https://travis-matrix-badges.herokuapp.com/repos/muflihun/easyloggingpp/branches/master/2)](https://travis-ci.org/muflihun/easyloggingpp) |
+ | `master` | GNU/Linux 4.4 / Ubuntu 4.8.4 64-bit / `g++-5` | [![Build Status](https://travis-matrix-badges.herokuapp.com/repos/muflihun/easyloggingpp/branches/master/3)](https://travis-ci.org/muflihun/easyloggingpp) |
+ | `master` | GNU/Linux 4.4 / Ubuntu 4.8.4 64-bit / `g++-6` | [![Build Status](https://travis-matrix-badges.herokuapp.com/repos/muflihun/easyloggingpp/branches/master/4)](https://travis-ci.org/muflihun/easyloggingpp) |
+ | `master` | GNU/Linux 4.4 / Ubuntu 4.8.4 64-bit / `g++-7` | [![Build Status](https://travis-matrix-badges.herokuapp.com/repos/muflihun/easyloggingpp/branches/master/5)](https://travis-ci.org/muflihun/easyloggingpp) |
+ 
+  [![top] Goto Top](#table-of-contents)
+ 
 # Licence
 ```
 The MIT License (MIT)

samples/STL/multi-loggers-to-same-file.cpp

@@ -10,12 +10,12 @@
 INITIALIZE_EASYLOGGINGPP
 
 void def() {
-    for (int i = 0; i < 10000; ++i)
+    for (int i = 0; i < 1000; ++i)
         CLOG(INFO, "first") << "This is from first " << i;
 }
 
 void second() {
-    for (int i = 0; i < 10000; ++i)
+    for (int i = 0; i < 1000; ++i)
         CLOG(INFO, "second") << "This is from second" << i;
 }
 

src/easylogging++.cc

@@ -2105,7 +2105,7 @@ void LogDispatchCallback::handle(const LogDispatchData* data) {
     std::string filename = data->logMessage()->logger()->typedConfigurations()->filename(data->logMessage()->level());
     auto lock = m_fileLocks.find(filename);
     if (lock == m_fileLocks.end()) {
-        m_fileLocks.emplace(std::make_pair(filename, new base::threading::Mutex));
+        m_fileLocks.emplace(std::make_pair(filename, std::unique_ptr<base::threading::Mutex>(new base::threading::Mutex)));
     }
 #endif
 }