aboutsummaryrefslogtreecommitdiff
path: root/src/liblzma/common
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2008-12-31 00:30:49 +0200
committerLasse Collin <lasse.collin@tukaani.org>2008-12-31 00:30:49 +0200
commit7ed9d943b31d3ee9c5fb2387e84a241ba33afe90 (patch)
tree5f9107c718aa996be6850b431ba319584064c9d7 /src/liblzma/common
parentUse 28 MiB as memory usage limit for encoding in test_compress.sh. (diff)
downloadxz-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 'src/liblzma/common')
-rw-r--r--src/liblzma/common/Makefile.am3
-rw-r--r--src/liblzma/common/common.h1
-rw-r--r--src/liblzma/common/init.c39
-rw-r--r--src/liblzma/common/init_decoder.c31
-rw-r--r--src/liblzma/common/init_encoder.c40
5 files changed, 1 insertions, 113 deletions
diff --git a/src/liblzma/common/Makefile.am b/src/liblzma/common/Makefile.am
index 20f3f93b..f64abdf5 100644
--- a/src/liblzma/common/Makefile.am
+++ b/src/liblzma/common/Makefile.am
@@ -32,7 +32,6 @@ libcommon_la_SOURCES = \
filter_common.h \
index.c \
index.h \
- init.c \
stream_flags_common.c \
stream_flags_common.h \
vli_size.c
@@ -49,7 +48,6 @@ libcommon_la_SOURCES += \
filter_flags_encoder.c \
index_encoder.c \
index_encoder.h \
- init_encoder.c \
stream_encoder.c \
stream_encoder.h \
stream_flags_encoder.c \
@@ -69,7 +67,6 @@ libcommon_la_SOURCES += \
filter_flags_decoder.c \
index_decoder.c \
index_hash.c \
- init_decoder.c \
stream_decoder.c \
stream_decoder.h \
stream_flags_decoder.c \
diff --git a/src/liblzma/common/common.h b/src/liblzma/common/common.h
index ef8d0cbf..44117c9a 100644
--- a/src/liblzma/common/common.h
+++ b/src/liblzma/common/common.h
@@ -21,6 +21,7 @@
#define LZMA_COMMON_H
#include "../../common/sysdefs.h"
+#include "../../common/mythread.h"
#include "../../common/integer.h"
// Don't use ifdef...
diff --git a/src/liblzma/common/init.c b/src/liblzma/common/init.c
deleted file mode 100644
index fb377f5a..00000000
--- a/src/liblzma/common/init.c
+++ /dev/null
@@ -1,39 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file init.c
-/// \brief Static internal initializations
-///
-/// The initializations have been splitted to so many small files to prevent
-/// an application needing only decoder functions from statically linking
-/// also the encoder functions.
-//
-// Copyright (C) 2007 Lasse Collin
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "common.h"
-
-
-extern LZMA_API void
-lzma_init(void)
-{
-#ifdef HAVE_ENCODER
- lzma_init_encoder();
-#endif
-
-#ifdef HAVE_DECODER
- lzma_init_decoder();
-#endif
-
- return;
-}
diff --git a/src/liblzma/common/init_decoder.c b/src/liblzma/common/init_decoder.c
deleted file mode 100644
index e319b2f8..00000000
--- a/src/liblzma/common/init_decoder.c
+++ /dev/null
@@ -1,31 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file init_decoder.c
-/// \brief Static internal initializations
-//
-// Copyright (C) 2007 Lasse Collin
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "common.h"
-
-
-extern LZMA_API void
-lzma_init_decoder(void)
-{
- // So far there's no decoder-specific stuff to initialize.
-
- lzma_init_check();
-
- return;
-}
diff --git a/src/liblzma/common/init_encoder.c b/src/liblzma/common/init_encoder.c
deleted file mode 100644
index 1130e6b8..00000000
--- a/src/liblzma/common/init_encoder.c
+++ /dev/null
@@ -1,40 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-/// \file init_encoder.c
-/// \brief Static internal initializations
-//
-// Copyright (C) 2007 Lasse Collin
-//
-// This library is free software; you can redistribute it and/or
-// modify it under the terms of the GNU Lesser General Public
-// License as published by the Free Software Foundation; either
-// version 2.1 of the License, or (at your option) any later version.
-//
-// This library is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// Lesser General Public License for more details.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-#include "common.h"
-#include "range_encoder.h"
-#include "lzma_encoder.h"
-
-
-extern LZMA_API void
-lzma_init_encoder(void)
-{
- static bool already_initialized = false;
- if (already_initialized)
- return;
-
- lzma_init_check();
-
-#if defined(HAVE_SMALL) && defined(HAVE_ENCODER_LZMA1)
- lzma_rc_init();
-#endif
-
- already_initialized = true;
- return;
-}