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

datagen uses mem.h

Browse Source
This commit is contained in:
Yann Collet
2016-05-09 12:20:50 +02:00
parent 59b6ba7677
commit ceca200c77
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
programs/datagen.c
View File

@ -29,6 +29,9 @@
#include <stdlib.h> /* malloc */ #include <stdlib.h> /* malloc */
#include <stdio.h> /* FILE, fwrite */ #include <stdio.h> /* FILE, fwrite */
#include <string.h> /* memcpy */ #include <string.h> /* memcpy */
<<<<<<< HEAD
#include "mem.h"
=======
/*-************************************ /*-************************************
@ -48,6 +51,7 @@
typedef signed int S32; typedef signed int S32;
typedef unsigned long long U64; typedef unsigned long long U64;
#endif #endif
>>>>>>> 59b6ba767710823fa688ff1f4b7ea443567f0b27
/*-************************************ /*-************************************
@ -63,7 +67,7 @@
/*-************************************ /*-************************************
* Constants * Macros
**************************************/ **************************************/
#define KB *(1 <<10) #define KB *(1 <<10)
@ -98,15 +102,10 @@ static unsigned int RDG_rand(U32* src)
static void RDG_fillLiteralDistrib(litDistribTable lt, double ld) static void RDG_fillLiteralDistrib(litDistribTable lt, double ld)
{ {
U32 i = 0; U32 i = 0;
BYTE character = '0'; BYTE character = (ld<=0.0) ? 0 : '0';
BYTE firstChar = '('; BYTE const firstChar = (ld<=0.0) ? 0 : '(';
BYTE lastChar = '}'; BYTE const lastChar = (ld<=0.0) ?255: '}';
if (ld<=0.0) {
character = 0;
firstChar = 0;
lastChar =255;
}
while (i<LTSIZE) { while (i<LTSIZE) {
U32 weight = (U32)((double)(LTSIZE - i) * ld) + 1; U32 weight = (U32)((double)(LTSIZE - i) * ld) + 1;
U32 end; U32 end;
@ -161,7 +160,7 @@ void RDG_genBlock(void* buffer, size_t buffSize, size_t prefixSize, double match
/* Copy (within 32K) */ /* Copy (within 32K) */
size_t match; size_t match;
size_t d; size_t d;
int length = RDG_RANDLENGTH + 4; size_t const length = RDG_RANDLENGTH + 4;
U32 offset = RDG_RAND15BITS + 1; U32 offset = RDG_RAND15BITS + 1;
U32 repeatOffset = (RDG_rand(seed) & 15) == 2; U32 repeatOffset = (RDG_rand(seed) & 15) == 2;
if (repeatOffset) offset = prevOffset; if (repeatOffset) offset = prevOffset;
@ -173,9 +172,8 @@ void RDG_genBlock(void* buffer, size_t buffSize, size_t prefixSize, double match
while (pos < d) buffPtr[pos++] = buffPtr[match++]; /* correctly manages overlaps */ while (pos < d) buffPtr[pos++] = buffPtr[match++]; /* correctly manages overlaps */
} else { } else {
/* Literal (noise) */ /* Literal (noise) */
size_t d; size_t const length = RDG_RANDLENGTH;
size_t length = RDG_RANDLENGTH; size_t d = pos + length;
d = pos + length;
if (d > buffSize) d = buffSize; if (d > buffSize) d = buffSize;
while (pos < d) buffPtr[pos++] = RDG_genChar(seed, lt); while (pos < d) buffPtr[pos++] = RDG_genChar(seed, lt);
} } } }