diff options
| author | Lasse Collin <lasse.collin@tukaani.org> | 2008-12-31 00:30:49 +0200 |
|---|---|---|
| committer | Lasse Collin <lasse.collin@tukaani.org> | 2008-12-31 00:30:49 +0200 |
| commit | 7ed9d943b31d3ee9c5fb2387e84a241ba33afe90 (patch) | |
| tree | 5f9107c718aa996be6850b431ba319584064c9d7 /src/liblzma/rangecoder/price.h | |
| parent | Use 28 MiB as memory usage limit for encoding in test_compress.sh. (diff) | |
| download | xz-7ed9d943b31d3ee9c5fb2387e84a241ba33afe90.tar.xz | |
Remove lzma_init() and other init functions from liblzma API.
Half of developers were already forgetting to use these
functions, which could have caused total breakage in some future
liblzma version or even now if --enable-small was used. Now
liblzma uses pthread_once() to do the initializations unless
it has been built with --disable-threads which make these
initializations thread-unsafe.
When --enable-small isn't used, liblzma currently gets needlessly
linked against libpthread (on systems that have it). While it is
stupid for now, liblzma will need threads in future anyway, so
this stupidity will be temporary only.
When --enable-small is used, different code CRC32 and CRC64 is
now used than without --enable-small. This made the resulting
binary slightly smaller, but the main reason was to clean it up
and to handle the lack of lzma_init_check().
The pkg-config file lzma.pc was renamed to liblzma.pc. I'm not
sure if it works correctly and portably for static linking
(Libs.private includes -pthread or other operating system
specific flags). Hopefully someone complains if it is bad.
lzma_rc_prices[] is now included as a precomputed array even
with --enable-small. It's just 128 bytes now that it uses uint8_t
instead of uint32_t. Smaller array seemed to be at least as fast
as the more bloated uint32_t array on x86; hopefully it's not bad
on other architectures.
Diffstat (limited to '')
| -rw-r--r-- | src/liblzma/rangecoder/price.h | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/src/liblzma/rangecoder/price.h b/src/liblzma/rangecoder/price.h index 001f753d..e336885c 100644 --- a/src/liblzma/rangecoder/price.h +++ b/src/liblzma/rangecoder/price.h @@ -28,20 +28,8 @@ #define RC_INFINITY_PRICE (UINT32_C(1) << 30) -#if !defined(LZMA_RANGE_ENCODER_H) || defined(HAVE_SMALL) -/// Probability prices used by *_get_price() macros. This is initialized -/// by lzma_rc_init() and is not modified later. -extern uint32_t lzma_rc_prices[RC_PRICE_TABLE_SIZE]; - -/// Initializes lzma_rc_prices[]. This needs to be called only once. -extern void lzma_rc_init(void); - -#else -// Not building a size optimized version, so we use a precomputed -// constant table. -extern const uint32_t lzma_rc_prices[RC_PRICE_TABLE_SIZE]; - -#endif +/// Lookup table for the inline functions defined in this file. +extern const uint8_t lzma_rc_prices[RC_PRICE_TABLE_SIZE]; static inline uint32_t |