From: Yann Collet <cyan@fb.com>
Date: Wed, 27 Sep 2017 23:39:40 +0000 (-0700)
Subject: Merge branch 'dev' into newFormats
X-Git-Tag: v1.3.2~3^2~23^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=54a827fff04743af7608de40403a129c43e8ebaf;p=thirdparty%2Fzstd.git

Merge branch 'dev' into newFormats

Fixed conflicts in zstdmt_compress.c
---

54a827fff04743af7608de40403a129c43e8ebaf
diff --cc lib/compress/zstdmt_compress.c
index 6c91d482e,3bdb98e2e..b15bf05af
--- a/lib/compress/zstdmt_compress.c
+++ b/lib/compress/zstdmt_compress.c
@@@ -53,19 -53,17 +53,19 @@@ static unsigned long long GetCurrentClo
  }
  
  #define MUTEX_WAIT_TIME_DLEVEL 6
- #define PTHREAD_MUTEX_LOCK(mutex) {               \
 -#define ZSTD_PTHREAD_MUTEX_LOCK(mutex) {               \
 -    if (ZSTD_DEBUG>=MUTEX_WAIT_TIME_DLEVEL) {   \
++#define ZSTD_PTHREAD_MUTEX_LOCK(mutex) {          \
 +    if (ZSTD_DEBUG >= MUTEX_WAIT_TIME_DLEVEL) {   \
          unsigned long long const beforeTime = GetCurrentClockTimeMicroseconds(); \
-         pthread_mutex_lock(mutex);                \
 -        ZSTD_pthread_mutex_lock(mutex);                \
++        ZSTD_pthread_mutex_lock(mutex);           \
          {   unsigned long long const afterTime = GetCurrentClockTimeMicroseconds(); \
              unsigned long long const elapsedTime = (afterTime-beforeTime); \
              if (elapsedTime > 1000) {  /* or whatever threshold you like; I'm using 1 millisecond here */ \
                  DEBUGLOG(MUTEX_WAIT_TIME_DLEVEL, "Thread took %llu microseconds to acquire mutex %s \n", \
                     elapsedTime, #mutex);          \
          }   }                                     \
 -    } else ZSTD_pthread_mutex_lock(mutex);             \
 +    } else {                                      \
-         pthread_mutex_lock(mutex);                \
++        ZSTD_pthread_mutex_lock(mutex);           \
 +    }                                             \
  }
  
  #else