lib/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-07-29 11:21:22 +03:00
Code Activity

fixed linux warnings

Browse Source
This commit is contained in:
Yann Collet
2017-01-02 01:11:55 +01:00
parent 0ec6a95ba1
commit f1cb55192c
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/common/threading.h
View File

@ -80,13 +80,13 @@ int _pthread_join(pthread_t* thread, void** value_ptr);
#else /* ZSTD_PTHREAD not defined */ #else /* ZSTD_PTHREAD not defined */
/* No multithreading support */ /* No multithreading support */
typedef int pthread_mutex_t; #define pthread_mutex_t int /* #define rather than typedef, as sometimes pthread support is implicit, resulting in duplicated symbols */
#define pthread_mutex_init(a,b) #define pthread_mutex_init(a,b)
#define pthread_mutex_destroy(a) #define pthread_mutex_destroy(a)
#define pthread_mutex_lock(a) #define pthread_mutex_lock(a)
#define pthread_mutex_unlock(a) #define pthread_mutex_unlock(a)
typedef int pthread_cond_t; #define pthread_cond_t int
#define pthread_cond_init(a,b) #define pthread_cond_init(a,b)
#define pthread_cond_destroy(a) #define pthread_cond_destroy(a)
#define pthread_cond_wait(a,b) #define pthread_cond_wait(a,b)

18
lib/compress/zstdmt_compress.c
View File

@ -78,18 +78,18 @@ static void ZSTDMT_freeBufferPool(ZSTDMT_bufferPool* bufPool)
static buffer_t ZSTDMT_getBuffer(ZSTDMT_bufferPool* pool, size_t bSize) static buffer_t ZSTDMT_getBuffer(ZSTDMT_bufferPool* pool, size_t bSize)
{ {
if (pool->nbBuffers) { /* try to use an existing buffer */ if (pool->nbBuffers) { /* try to use an existing buffer */
pool->nbBuffers--; buffer_t const buf = pool->bTable[--(pool->nbBuffers)];
buffer_t const buf = pool->bTable[pool->nbBuffers];
size_t const availBufferSize = buf.size; size_t const availBufferSize = buf.size;
if ((availBufferSize >= bSize) & (availBufferSize <= 10*bSize)) /* large enough, but not too much */ if ((availBufferSize >= bSize) & (availBufferSize <= 10*bSize)) /* large enough, but not too much */
return buf; return buf;
free(buf.start); /* size conditions not respected : create a new buffer */ free(buf.start); /* size conditions not respected : create a new buffer */
} }
/* create new buffer */ /* create new buffer */
buffer_t buf; { buffer_t buf;
buf.size = bSize; buf.size = bSize;
buf.start = malloc(bSize); buf.start = malloc(bSize);
return buf; return buf;
}
} }
/* effectively store buffer for later re-use, up to pool capacity */ /* effectively store buffer for later re-use, up to pool capacity */
@ -121,9 +121,8 @@ typedef struct {
/* ZSTDMT_compressFrame() : POOL_function type */ /* ZSTDMT_compressFrame() : POOL_function type */
void ZSTDMT_compressFrame(void* jobDescription) void ZSTDMT_compressFrame(void* jobDescription)
{ {
DEBUGLOG(5, "Entering ZSTDMT_compressFrame() ");
ZSTDMT_jobDescription* const job = (ZSTDMT_jobDescription*)jobDescription; ZSTDMT_jobDescription* const job = (ZSTDMT_jobDescription*)jobDescription;
DEBUGLOG(5, "compressing %u bytes from frame %u with ZSTD_compressCCtx : ", (unsigned)job->srcSize, job->jobCompleted); DEBUGLOG(5, "thread : compressing %u bytes from frame %u with ZSTD_compressCCtx : ", (unsigned)job->srcSize, job->jobCompleted);
job->cSize = ZSTD_compressCCtx(job->cctx, job->dstBuff.start, job->dstBuff.size, job->srcStart, job->srcSize, job->compressionLevel); job->cSize = ZSTD_compressCCtx(job->cctx, job->dstBuff.start, job->dstBuff.size, job->srcStart, job->srcSize, job->compressionLevel);
DEBUGLOG(5, "compressed to %u bytes ", (unsigned)job->cSize); DEBUGLOG(5, "compressed to %u bytes ", (unsigned)job->cSize);
DEBUGLOG(5, "sending jobCompleted signal"); DEBUGLOG(5, "sending jobCompleted signal");
@ -197,8 +196,9 @@ struct ZSTDMT_CCtx_s {
ZSTDMT_CCtx *ZSTDMT_createCCtx(unsigned nbThreads) ZSTDMT_CCtx *ZSTDMT_createCCtx(unsigned nbThreads)
{ {
ZSTDMT_CCtx* cctx;
if ((nbThreads < 1) | (nbThreads > ZSTDMT_NBTHREADS_MAX)) return NULL; if ((nbThreads < 1) | (nbThreads > ZSTDMT_NBTHREADS_MAX)) return NULL;
ZSTDMT_CCtx* const cctx = (ZSTDMT_CCtx*) calloc(1, sizeof(ZSTDMT_CCtx) + nbThreads*sizeof(ZSTDMT_jobDescription)); cctx = (ZSTDMT_CCtx*) calloc(1, sizeof(ZSTDMT_CCtx) + nbThreads*sizeof(ZSTDMT_jobDescription));
if (!cctx) return NULL; if (!cctx) return NULL;
cctx->nbThreads = nbThreads; cctx->nbThreads = nbThreads;
cctx->factory = POOL_create(nbThreads, 1); cctx->factory = POOL_create(nbThreads, 1);

4
programs/bench.c
View File

@ -101,8 +101,8 @@ static clock_us_t BMK_clockMicroSec(void)
static clock_t _ticksPerSecond = 0; static clock_t _ticksPerSecond = 0;
if (_ticksPerSecond <= 0) _ticksPerSecond = sysconf(_SC_CLK_TCK); if (_ticksPerSecond <= 0) _ticksPerSecond = sysconf(_SC_CLK_TCK);
struct tms junk; clock_t newTicks = (clock_t) times(&junk); (void)junk; { struct tms junk; clock_t newTicks = (clock_t) times(&junk); (void)junk;
return ((((clock_us_t)newTicks)*(1000000))/_ticksPerSecond); return ((((clock_us_t)newTicks)*(1000000))/_ticksPerSecond); }
} }