J Reece Wilson
fd0c5b51b2
[+] Begin work on IO futexes for io release on process/thread exit [+] Linux ::readdir iteration [+] AuConsole buffering API [*] Fix sleep as to not get interrupted by signals [*] Switch the type of FS lock used under Linux [*] Linux: Use new IPCHandle encoding scheme [*] Fix undefined behaviour: unintialized timeout values (AuLoop/Linux) [*] Fix undefined behaviour: ConsoleTTY clear line was called of a color of a random value on stack [-] Remainings of std dir iterator [*] Fix pthread_kill (aka send signal to pthread handle) always kills process. This is what you expect bc signal handler inheritance. [*] Reformat the build Aurora.json file [+] Added clang warning ignores to the build file [*] Fix: UNIX need to use STDOUT_FILENO. Was using CRT handle in place of fd by mistake. [+] Linux implementation for IO yield (AuIO::IOYield() - UNIX::LinuxOverlappedYield()) [*] Fix: Linux async end of stream processing. res 0 = zero bytes consumed. <= was detecting this as an error of code 0. Should succeed with zero bytes. [+] Linux LoopQueue missing epilogue hook for the IO processor [*] Various refactors and minor bug fixes [*] Linux fix: Handle pipe EOS as zero [*] Linux fix: thread termination via a user signal of 77. Need a force terminate. [*] IPC handle: fix improper int to bool cast in the header setup within ToString [*] Linux fix: HWInfo CPU topology regression [-] Linux fix: remove SIGABRT handler [*] Missing override in compression, exit, and consoletty headers. [+] Unix Syslog logger backend
118 lines
2.9 KiB
C++
118 lines
2.9 KiB
C++
/***
|
|
Copyright (C) 2022 J Reece Wilson (a/k/a "Reece"). All rights reserved.
|
|
|
|
File: BZip2Decompressor.hpp
|
|
Date: 2022-2-15
|
|
Author: Reece
|
|
***/
|
|
#pragma once
|
|
|
|
#include "bzlib.h"
|
|
|
|
typedef struct
|
|
{
|
|
void * handle;
|
|
char buf[BZ_MAX_UNUSED];
|
|
AuInt32 bufN;
|
|
char writing;
|
|
bz_stream strm;
|
|
AuInt32 lastErr;
|
|
char initialisedOk;
|
|
} bz2_file;
|
|
|
|
static const char *BShitToString(int error)
|
|
{
|
|
int n {};
|
|
bz2_file B;
|
|
B.lastErr = error;
|
|
return BZ2_bzerror((BZFILE *)&B, &n);
|
|
}
|
|
|
|
namespace Aurora::Compression
|
|
{
|
|
struct BZIPInflate : public BaseStream
|
|
{
|
|
DecompressInfo meta;
|
|
|
|
BZIPInflate(const DecompressInfo &meta) : meta(meta), BaseStream(meta.internalStreamSize)
|
|
{}
|
|
|
|
~BZIPInflate()
|
|
{
|
|
if (this->init_)
|
|
{
|
|
BZ2_bzDecompressEnd(&this->ctx_);
|
|
}
|
|
}
|
|
|
|
bool Init(const AuSPtr<IO::IStreamReader> &reader) override
|
|
{
|
|
this->reader_ = reader;
|
|
|
|
auto ret = BZ2_bzDecompressInit(&this->ctx_, 0, 0);
|
|
if (ret < Z_OK)
|
|
{
|
|
SysPushErrorMem("Error: {}", BShitToString(ret));
|
|
return false;
|
|
}
|
|
this->init_ = true;
|
|
|
|
if (!this->_outbuffer)
|
|
{
|
|
SysPushErrorMem();
|
|
return false;
|
|
}
|
|
|
|
this->SetArray(this->din_);
|
|
return true;
|
|
}
|
|
|
|
AuStreamReadWrittenPair_t Ingest_s(AuUInt32 input) override
|
|
{
|
|
AuUInt32 done {}, read {};
|
|
while (read < input)
|
|
{
|
|
read += IngestForInPointer<char, uInt>(this->reader_, this->ctx_.next_in, this->ctx_.avail_in, input - read);
|
|
|
|
if (!this->ctx_.avail_in)
|
|
{
|
|
return {read, done};
|
|
}
|
|
|
|
do
|
|
{
|
|
this->ctx_.avail_out = AuArraySize(this->dout_);
|
|
this->ctx_.next_out = this->dout_;
|
|
|
|
auto ret = BZ2_bzDecompress(&this->ctx_);
|
|
if (ret < Z_OK)
|
|
{
|
|
SysPushErrorIO("Error: {}", BShitToString(ret));
|
|
return AuMakePair(read, 0);
|
|
}
|
|
|
|
auto have = AuArraySize(this->dout_) - this->ctx_.avail_out;
|
|
done += have;
|
|
|
|
if (!Write(reinterpret_cast<const AuUInt8 *>(this->dout_),
|
|
have))
|
|
{
|
|
return AuMakePair(read, 0);
|
|
}
|
|
|
|
}
|
|
while (this->ctx_.avail_out == 0);
|
|
}
|
|
|
|
return AuMakePair(read, done);
|
|
}
|
|
|
|
private:
|
|
AuSPtr<IO::IStreamReader> reader_;
|
|
bz_stream ctx_ {};
|
|
bool init_ {};
|
|
char dout_[kChunkSize];
|
|
bool userBound_ {};
|
|
char din_[kChunkSize];
|
|
};
|
|
} |