From: Paul Cruz <paulcruz74@fb.com>
Date: Thu, 6 Jul 2017 00:44:36 +0000 (-0700)
Subject: small changes
X-Git-Tag: v1.3.1^2~13^2^2~113
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=79d4657ce5232cf7900407087962bb4ca978572e;p=thirdparty%2Fzstd.git

small changes
---

diff --git a/contrib/adaptive-compression/multi.c b/contrib/adaptive-compression/multi.c
index fd04a53b8..208a0a790 100644
--- a/contrib/adaptive-compression/multi.c
+++ b/contrib/adaptive-compression/multi.c
@@ -148,6 +148,7 @@ static void* compressionThread(void* arg)
         // DEBUGLOG(2, "compressionThread(): waiting on job ready\n");
         pthread_mutex_lock(&ctx->jobReady_mutex);
         while(currJob + 1 > ctx->jobReadyID) {
+            DEBUGLOG(2, "waiting on job ready, nextJob: %u\n", currJob);
             pthread_cond_wait(&ctx->jobReady_cond, &ctx->jobReady_mutex);
         }
         pthread_mutex_unlock(&ctx->jobReady_mutex);
@@ -185,14 +186,14 @@ static void* outputThread(void* arg)
     for ( ; ; ) {
         unsigned const currJobIndex = currJob % ctx->numJobs;
         jobDescription* job = &ctx->jobs[currJobIndex];
-        DEBUGLOG(2, "outputThread(): waiting on job completed\n");
+        // DEBUGLOG(2, "outputThread(): waiting on job completed\n");
         pthread_mutex_lock(&ctx->jobCompleted_mutex);
         while (currJob + 1 > ctx->jobCompletedID) {
-            DEBUGLOG(2, "inside job completed wait loop waiting on %u\n", currJob);
+            DEBUGLOG(2, "waiting on job ready, nextJob: %u\n", currJob);
             pthread_cond_wait(&ctx->jobCompleted_cond, &ctx->jobCompleted_mutex);
         }
         pthread_mutex_unlock(&ctx->jobCompleted_mutex);
-        DEBUGLOG(2, "outputThread(): continuing after job completed\n");
+        // DEBUGLOG(2, "outputThread(): continuing after job completed\n");
         {
             size_t const compressedSize = job->compressedSize;
             if (ZSTD_isError(compressedSize)) {
@@ -236,7 +237,9 @@ static int createCompressionJob(adaptCCtx* ctx, BYTE* data, size_t srcSize)
     jobDescription* job = &ctx->jobs[nextJobIndex];
     // DEBUGLOG(2, "createCompressionJob(): wait for job write\n");
     pthread_mutex_lock(&ctx->jobWrite_mutex);
+    DISPLAY("Creating new compression job -- nextJob: %u, jobWrittenID: %u, numJObs: %u\n", nextJob, ctx->jobWrittenID, ctx->numJobs);
     while (nextJob - ctx->jobWrittenID >= ctx->numJobs) {
+        DEBUGLOG(2, "waiting on job writtten, nextJob: %u\n", nextJob);
         pthread_cond_wait(&ctx->jobWrite_cond, &ctx->jobWrite_mutex);
     }
     pthread_mutex_unlock(&ctx->jobWrite_mutex);
diff --git a/contrib/adaptive-compression/pipetests.sh b/contrib/adaptive-compression/pipetests.sh
index 2924cd5ad..743ce381c 100755
--- a/contrib/adaptive-compression/pipetests.sh
+++ b/contrib/adaptive-compression/pipetests.sh
@@ -1,2 +1,2 @@
 make clean multi
-pv -q -L 50m tests/test2048.pdf | ./multi -v -otmp.zst
+pv -q -L 500m tests/test2048.pdf | ./multi -v -otmp.zst