diff options
| -rw-r--r-- | includes/ZHandle.h | 3 | ||||
| -rw-r--r-- | src/ZHandle.cc | 17 |
2 files changed, 12 insertions, 8 deletions
diff --git a/includes/ZHandle.h b/includes/ZHandle.h index 8164853..f30da83 100644 --- a/includes/ZHandle.h +++ b/includes/ZHandle.h @@ -42,6 +42,9 @@ class ZStream : public Handle { COMPRESSING_IDLE, DECOMPRESSING, DECOMPRESSING_IDLE, + WRITING_FINISH, + COMPRESSING_FINISH, + COMPRESSING_FINISH_IDLE, CLOSING, } m_phase = IDLE; size_t m_total, m_count, m_compressed; diff --git a/src/ZHandle.cc b/src/ZHandle.cc index ec08990..05a6405 100644 --- a/src/ZHandle.cc +++ b/src/ZHandle.cc @@ -26,8 +26,9 @@ Balau::ZStream::ZStream(const IO<Handle> & h, int level, header_t header) : m_h( void Balau::ZStream::close() throw (GeneralException) { switch (m_phase) { case IDLE: - case WRITING: - case COMPRESSING: + case WRITING_FINISH: + case COMPRESSING_FINISH: + case COMPRESSING_FINISH_IDLE: if (m_h->canWrite()) finish(); inflateEnd(&m_zin); @@ -254,25 +255,25 @@ void Balau::ZStream::doFlush(bool finish) { m_zout.next_out = (Bytef *) m_buf; m_zout.avail_out = block_size; if (m_useAsyncOp) { - m_phase = DECOMPRESSING; + m_phase = COMPRESSING_FINISH; createAsyncOp(m_op = async = new AsyncOpZlib(&m_zout, true, finish ? Z_FINISH : Z_SYNC_FLUSH)); async->yield(); - case DECOMPRESSING: + case COMPRESSING_FINISH: m_status = async->getR(); delete async; m_op = async = NULL; } else { m_status = deflate(&m_zout, finish ? Z_FINISH : Z_SYNC_FLUSH); - m_phase = DECOMPRESSING_IDLE; + m_phase = COMPRESSING_FINISH_IDLE; Task::operationYield(NULL, Task::INTERRUPTIBLE); } - case DECOMPRESSING_IDLE: + case COMPRESSING_FINISH_IDLE: EAssert((m_status == Z_OK) || ((m_status == Z_STREAM_END) && finish), "deflate() didn't return Z_OK or Z_STREAM_END, but %zi (finish = %s)", m_status, finish ? "true" : "false"); m_compressed = block_size - m_zout.avail_out; - m_phase = WRITING; + m_phase = WRITING_FINISH; m_wptr = m_buf; while (m_compressed) { - case WRITING: + case WRITING_FINISH: w = m_h->write(m_wptr, m_compressed); if (w <= 0) { m_phase = IDLE; |