third_party/exiv2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1178 from Exiv2/0.27_fileio_performance

Browse Source 
Reduce system calls in FileIo::eof() (master -> 0.27)
This commit is contained in:
Robin Mills 2020-04-24 10:37:03 +01:00 committed by GitHub
commit adef1fbd33
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 159 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
samples/largeiptc-test.cpp
View File

@ -3,70 +3,73 @@
#include <exiv2/exiv2.hpp>
#include <iostream>
#include <cassert>
#include <iostream>
int main(int argc, char* const argv[])
try {
Exiv2::XmpParser::initialize();
::atexit(Exiv2::XmpParser::terminate);
{
try {
Exiv2::XmpParser::initialize();
::atexit(Exiv2::XmpParser::terminate);
if (argc != 3) {
std::cout << "Usage: " << argv[0] << " image datafile\n";
return 1;
if (argc != 3) {
std::cout << "Usage: " << argv[0] << " image datafile\n";
return 1;
}
std::string file(argv[1]);
std::string data(argv[2]);
// Read data file into data buffer
Exiv2::FileIo io(data);
if (io.open() != 0) {
throw Exiv2::Error(Exiv2::kerDataSourceOpenFailed, io.path(), Exiv2::strError());
}
Exiv2::DataBuf buf(static_cast<long>(io.size()));
std::cout << "Reading " << buf.size_ << " bytes from " << data << "\n";
long readBytes = io.read(buf.pData_, buf.size_);
if (readBytes != buf.size_ || io.error() || io.eof()) {
throw Exiv2::Error(Exiv2::kerFailedToReadImageData);
}
// Read metadata from file
Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(file);
assert(image.get() != 0);
image->readMetadata();
// Set Preview field to the content of the data file
Exiv2::DataValue value;
value.read(buf.pData_, buf.size_);
Exiv2::IptcData& iptcData = image->iptcData();
std::cout << "IPTC fields: " << iptcData.size() << "\n";
iptcData["Iptc.Application2.Preview"] = value;
std::cout << "IPTC fields: " << iptcData.size() << "\n";
// Set IRB, compare with IPTC raw data
Exiv2::DataBuf irb = Exiv2::Photoshop::setIptcIrb(0, 0, iptcData);
std::cout << "IRB buffer : " << irb.size_ << "\n";
const Exiv2::byte* record;
uint32_t sizeHdr;
uint32_t sizeData;
Exiv2::Photoshop::locateIptcIrb(irb.pData_, irb.size_, &record, &sizeHdr, &sizeData);
Exiv2::DataBuf rawIptc = Exiv2::IptcParser::encode(iptcData);
std::cout << "Comparing IPTC and IRB size... ";
if (static_cast<uint32_t>(rawIptc.size_) != sizeData) {
std::cout << "not ";
}
std::cout << "ok\n";
std::cout << "Comparing IPTC and IRB data... ";
if (0 != memcmp(rawIptc.pData_, record + sizeHdr, sizeData)) {
std::cout << "not ";
}
std::cout << "ok\n";
// Set Iptc data and write it to the file
image->writeMetadata();
return 0;
} catch (Exiv2::AnyError& e) {
std::cout << "Caught Exiv2 exception '" << e << "'\n";
return -1;
}
std::string file(argv[1]);
std::string data(argv[2]);
// Read data file into data buffer
Exiv2::FileIo io(data);
if (io.open() != 0) {
throw Exiv2::Error(Exiv2::kerDataSourceOpenFailed, io.path(), Exiv2::strError());
}
Exiv2::DataBuf buf((long)io.size());
std::cout << "Reading " << buf.size_ << " bytes from " << data << "\n";
io.read(buf.pData_, buf.size_);
if (io.error() || !io.eof()) throw Exiv2::Error(Exiv2::kerFailedToReadImageData);
// Read metadata from file
Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(file);
assert(image.get() != 0);
image->readMetadata();
// Set Preview field to the content of the data file
Exiv2::DataValue value;
value.read(buf.pData_, buf.size_);
Exiv2::IptcData& iptcData = image->iptcData();
std::cout << "IPTC fields: " << iptcData.size() << "\n";
iptcData["Iptc.Application2.Preview"] = value;
std::cout << "IPTC fields: " << iptcData.size() << "\n";
// Set IRB, compare with IPTC raw data
Exiv2::DataBuf irb = Exiv2::Photoshop::setIptcIrb(0, 0, iptcData);
std::cout << "IRB buffer : " << irb.size_ << "\n";
const Exiv2::byte* record;
uint32_t sizeHdr;
uint32_t sizeData;
Exiv2::Photoshop::locateIptcIrb(irb.pData_, irb.size_, &record, &sizeHdr, &sizeData);
Exiv2::DataBuf rawIptc = Exiv2::IptcParser::encode(iptcData);
std::cout << "Comparing IPTC and IRB size... ";
if (static_cast<uint32_t>(rawIptc.size_) != sizeData) {
std::cout << "not ";
}
std::cout << "ok\n";
std::cout << "Comparing IPTC and IRB data... ";
if (0 != memcmp(rawIptc.pData_, record + sizeHdr, sizeData)) {
std::cout << "not ";
}
std::cout << "ok\n";
// Set Iptc data and write it to the file
image->writeMetadata();
return 0;
}
catch (Exiv2::AnyError& e) {
std::cout << "Caught Exiv2 exception '" << e << "'\n";
return -1;
}

3
src/basicio.cpp
View File

@ -1022,8 +1022,7 @@ namespace Exiv2 {
bool FileIo::eof() const
{
assert(p_->fp_ != 0);
return feof(p_->fp_) != 0 || tell() >= (long) size() ;
return std::feof(p_->fp_) != 0;
}
std::string FileIo::path() const

7
tests/bugfixes/github/test_issue_428.py
View File

@ -13,19 +13,22 @@ class PngReadRawProfile(metaclass=system_tests.CaseMeta):
filenames = [
system_tests.path("$data_path/issue_428_poc1.png"),
system_tests.path("$data_path/issue_428_poc2.png"),
system_tests.path("$data_path/issue_428_poc3.png"),
system_tests.path("$data_path/issue_428_poc4.png"),
system_tests.path("$data_path/issue_428_poc5.png"),
system_tests.path("$data_path/issue_428_poc8.png"),
system_tests.path("$data_path/issue_428_poc2.png"),
system_tests.path("$data_path/issue_428_poc6.png"),
system_tests.path("$data_path/issue_428_poc7.png"),
]
commands = ["$exiv2 " + fname for fname in filenames]
stdout = [""] * len(filenames)
stderr = [ stderr_exception(fname) for fname in filenames[0:6] ]
stderr = [ stderr_exception(fname) for fname in filenames[0:5] ]
stderr.append("""$exiv2_exception_message """ + filenames[5] + """:
$kerInputDataReadFailed
""")
stderr.append("""Error: XMP Toolkit error 201: XML parsing failure
Warning: Failed to decode XMP metadata.
""" + stderr_exception(filenames[6]))

1
tests/suite.conf
View File

@ -22,6 +22,7 @@ taglist: ${ENV:exiv2_path}/taglist${ENV:binary_extension}
[variables]
kerOffsetOutOfRange: Offset out of range
kerFailedToReadImageData: Failed to read image data
kerInputDataReadFailed: Failed to read input data
kerCorruptedMetadata: corrupted image metadata
kerInvalidMalloc: invalid memory allocation request
kerInvalidTypeValue: invalid type in tiff structure

23
unitTests/CMakeLists.txt
View File

@ -19,23 +19,28 @@ endforeach()
add_executable(unit_tests mainTestRunner.cpp
gtestwrapper.h
test_basicio.cpp
test_types.cpp
test_tiffheader.cpp
test_futils.cpp
test_enforce.cpp
test_safe_op.cpp
test_XmpKey.cpp
test_DateValue.cpp
test_TimeValue.cpp
test_XmpKey.cpp
test_basicio.cpp
test_cr2header_int.cpp
test_enforce.cpp
test_FileIo.cpp
test_futils.cpp
test_helper_functions.cpp
test_slice.cpp
test_image_int.cpp
test_safe_op.cpp
test_slice.cpp
test_tiffheader.cpp
test_types.cpp
${unit_tests_exiv2lib_SOURCES}
)
target_compile_definitions(unit_tests PRIVATE exiv2lib_STATIC)
target_compile_definitions(unit_tests
PRIVATE
exiv2lib_STATIC
TESTDATA_PATH="${PROJECT_SOURCE_DIR}/test/data"
)
if (exiv2lib_COMPILE_DEFINITIONS)
target_compile_definitions(unit_tests PRIVATE ${exiv2lib_COMPILE_DEFINITIONS})

74
unitTests/test_FileIo.cpp Normal file
View File

@ -0,0 +1,74 @@
#include "basicio.hpp"
#include <gtest/gtest.h>
using namespace Exiv2;
namespace
{
const std::string testData(TESTDATA_PATH);
const std::string imagePath(testData + "/DSC_3079.jpg");
} // namespace
TEST(AFileIO, canBeInstantiatedWithFilePath)
{
ASSERT_NO_THROW(FileIo file(imagePath));
}
TEST(AFileIO, canBeOpenInReadBinaryMode)
{
FileIo file(imagePath);
ASSERT_EQ(0, file.open());
}
TEST(AFileIO, isOpenDoItsJob)
{
FileIo file(imagePath);
ASSERT_FALSE(file.isopen());
file.open();
ASSERT_TRUE(file.isopen());
}
TEST(AFileIO, returnsFileSizeIfItsOpened)
{
FileIo file(imagePath);
file.open();
ASSERT_EQ(118685ul, file.size());
}
TEST(AFileIO, returnsFileSizeEvenWhenFileItIsNotOpened)
{
FileIo file(imagePath);
ASSERT_EQ(118685ul, file.size());
}
TEST(AFileIO, isOpenedAtPosition0)
{
FileIo file(imagePath);
file.open();
ASSERT_EQ(0, file.tell());
}
TEST(AFileIO, canSeekToExistingPositions)
{
FileIo file(imagePath);
file.open();
ASSERT_EQ(0, file.seek(100, BasicIo::beg));
ASSERT_EQ(0, file.seek(-50, BasicIo::cur));
ASSERT_EQ(0, file.seek(-50, BasicIo::end));
ASSERT_FALSE(file.error());
ASSERT_FALSE(file.eof());
}
TEST(AFileIO, canSeekBeyondEOF)
{
FileIo file(imagePath);
file.open();
// POSIX allows seeking beyond the existing end of file.
ASSERT_EQ(0, file.seek(200000, BasicIo::beg));
ASSERT_FALSE(file.error());
ASSERT_FALSE(file.eof());
}